From ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 12 Mar 2018 18:20:24 -0400 Subject: Start using Scintilla's LongTerm3, which now includes Scintillua and Scinterm. Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required. Since C++11 includes regex capability, drop TRE dependency. --- src/scintilla_backports/6095_ae52e0c68190.patch | 43 - src/scintilla_backports/6097_7f22895eaddb.patch | 34 - src/scintilla_backports/6099_809112c81196.patch | 45 - src/scintilla_backports/6101_b82fe8d33961.patch | 94 - src/scintilla_backports/6102_e12538e52567.patch | 61 - src/scintilla_backports/6108_b833c0659497.patch | 74 - src/scintilla_backports/6111_225f39cfd931.patch | 101 - src/scintilla_backports/6116_6c62b379a52e.patch | 59 - src/scintilla_backports/6117_23546875480b.patch | 313 - src/scintilla_backports/6118_559dea66606f.patch | 20 - src/scintilla_backports/6119_71bee2f06619.patch | 24 - src/scintilla_backports/6120_8e0cb37c4972.patch | 71 - src/scintilla_backports/6124_4527b3c217a4.patch | 43 - src/scintilla_backports/6131_a78e38849624.patch | 56 - src/scintilla_backports/6132_6cf19f2bf214.patch | 19 - src/scintilla_backports/6133_30f1573f17ac.patch | 19 - src/scintilla_backports/6134_0253f113f223.patch | 36 - src/scintilla_backports/6135_34665edc7efd.patch | 20 - src/scintilla_backports/6136_2b25287311d0.patch | 43 - src/scintilla_backports/6137_c3bba4a9193e.patch | 20 - src/scintilla_backports/6138_55368b05bb72.patch | 40 - src/scintilla_backports/6145_b3eaa82b3750.patch | 1426 ----- src/scintilla_backports/6153_a0f26eaf474d.patch | 7832 ----------------------- src/scintilla_backports/6154_284cc3b0e754.patch | 18 - src/scintilla_backports/6155_c105254dae66.patch | 95 - src/scintilla_backports/6156_152e56f0b392.patch | 239 - src/scintilla_backports/6157_35d652a3344b.patch | 881 --- src/scintilla_backports/6158_47fa874827a5.patch | 280 - src/scintilla_backports/6159_67865d8e5a37.patch | 31 - src/scintilla_backports/6160_a1a9cde51997.patch | 142 - src/scintilla_backports/6161_e7ca78c6f29c.patch | 27 - src/scintilla_backports/6167_797ed6c538fd.patch | 296 - src/scintilla_backports/6168_d046ce80d590.patch | 2631 -------- src/scintilla_backports/6170_df221375187c.patch | 25 - src/scintilla_backports/6171_99e46ea84433.patch | 25 - src/scintilla_backports/6172_84161436cfbc.patch | 491 -- src/scintilla_backports/6173_c9dcde8a91d3.patch | 23 - src/scintilla_backports/6174_150bdfbe2b5a.patch | 28 - src/scintilla_backports/6175_d742ec177a7e.patch | 167 - src/scintilla_backports/6176_20120f9d1698.patch | 19 - src/scintilla_backports/6182_7c132e9340ce.patch | 43 - src/scintilla_backports/6183_3e2dd5970075.patch | 18 - src/scintilla_backports/6184_692a54eaa604.patch | 92 - src/scintilla_backports/6185_b8379bec8e70.patch | 35 - src/scintilla_backports/6186_044d2d030263.patch | 218 - src/scintilla_backports/6187_a80a6876c301.patch | 91 - src/scintilla_backports/6196_e4f249dbdc30.patch | 28 - src/scintilla_backports/6215_1f02cb4a5b26.patch | 33 - src/scintilla_backports/6222_45f968a6735a.patch | 222 - src/scintilla_backports/6231_61adfbe4fa64.patch | 44 - src/scintilla_backports/6301_4bf96081f6e6.patch | 214 - src/scintilla_backports/6305_90741c1cb988.patch | 188 - src/scintilla_backports/6310_7e28cdba6d61.patch | 695 -- src/scintilla_backports/6311_7030530a9a0f.patch | 1480 ----- src/scintilla_backports/6314_af83baede430.patch | 535 -- src/scintilla_backports/6317_82cb780a04d1.patch | 53 - src/scintilla_backports/6323_8d56eaef4f0a.patch | 69 - src/scintilla_backports/6327_95346e626cf8.patch | 1794 ------ src/scintilla_backports/6339_79f86be9e988.patch | 51 - src/scintilla_backports/6340_ebec660dcf48.patch | 35 - src/scintilla_backports/6342_52f12c3eebcd.patch | 69 - src/scintilla_backports/6379_b44bb3627bbd.patch | 131 - src/scintilla_backports/6388_96506cab38bd.patch | 33 - src/scintilla_backports/6397_2db0528f34b5.patch | 33 - src/scintilla_backports/6418_85205da6ec1b.patch | 79 - src/scintilla_backports/6419_8760026bba6a.patch | 142 - src/scintilla_backports/6421_fd2f856b8d58.patch | 68 - src/scintilla_backports/6425_73343682cbda.patch | 170 - src/scintilla_backports/6434_ed27432729c3.patch | 50 - src/scintilla_backports/6441_92c8f0f1b3e6.patch | 157 - src/scintilla_backports/6442_3e3bfe29a819.patch | 319 - src/scintilla_backports/6444_1bd57324aa36.patch | 279 - src/scintilla_backports/6445_89d992f380a1.patch | 418 -- src/scintilla_backports/6448_431b814a54a6.patch | 307 - src/scintilla_backports/6449_1280ef150bbb.patch | 42 - src/scintilla_backports/6456_eaa6c7fa1a81.patch | 56 - src/scintilla_backports/6458_0a8a766722c0.patch | 297 - src/scintilla_backports/revs | 77 - 78 files changed, 24576 deletions(-) delete mode 100644 src/scintilla_backports/6095_ae52e0c68190.patch delete mode 100644 src/scintilla_backports/6097_7f22895eaddb.patch delete mode 100644 src/scintilla_backports/6099_809112c81196.patch delete mode 100644 src/scintilla_backports/6101_b82fe8d33961.patch delete mode 100644 src/scintilla_backports/6102_e12538e52567.patch delete mode 100644 src/scintilla_backports/6108_b833c0659497.patch delete mode 100644 src/scintilla_backports/6111_225f39cfd931.patch delete mode 100644 src/scintilla_backports/6116_6c62b379a52e.patch delete mode 100644 src/scintilla_backports/6117_23546875480b.patch delete mode 100644 src/scintilla_backports/6118_559dea66606f.patch delete mode 100644 src/scintilla_backports/6119_71bee2f06619.patch delete mode 100644 src/scintilla_backports/6120_8e0cb37c4972.patch delete mode 100644 src/scintilla_backports/6124_4527b3c217a4.patch delete mode 100644 src/scintilla_backports/6131_a78e38849624.patch delete mode 100644 src/scintilla_backports/6132_6cf19f2bf214.patch delete mode 100644 src/scintilla_backports/6133_30f1573f17ac.patch delete mode 100644 src/scintilla_backports/6134_0253f113f223.patch delete mode 100644 src/scintilla_backports/6135_34665edc7efd.patch delete mode 100644 src/scintilla_backports/6136_2b25287311d0.patch delete mode 100644 src/scintilla_backports/6137_c3bba4a9193e.patch delete mode 100644 src/scintilla_backports/6138_55368b05bb72.patch delete mode 100644 src/scintilla_backports/6145_b3eaa82b3750.patch delete mode 100644 src/scintilla_backports/6153_a0f26eaf474d.patch delete mode 100644 src/scintilla_backports/6154_284cc3b0e754.patch delete mode 100644 src/scintilla_backports/6155_c105254dae66.patch delete mode 100644 src/scintilla_backports/6156_152e56f0b392.patch delete mode 100644 src/scintilla_backports/6157_35d652a3344b.patch delete mode 100644 src/scintilla_backports/6158_47fa874827a5.patch delete mode 100644 src/scintilla_backports/6159_67865d8e5a37.patch delete mode 100644 src/scintilla_backports/6160_a1a9cde51997.patch delete mode 100644 src/scintilla_backports/6161_e7ca78c6f29c.patch delete mode 100644 src/scintilla_backports/6167_797ed6c538fd.patch delete mode 100644 src/scintilla_backports/6168_d046ce80d590.patch delete mode 100644 src/scintilla_backports/6170_df221375187c.patch delete mode 100644 src/scintilla_backports/6171_99e46ea84433.patch delete mode 100644 src/scintilla_backports/6172_84161436cfbc.patch delete mode 100644 src/scintilla_backports/6173_c9dcde8a91d3.patch delete mode 100644 src/scintilla_backports/6174_150bdfbe2b5a.patch delete mode 100644 src/scintilla_backports/6175_d742ec177a7e.patch delete mode 100644 src/scintilla_backports/6176_20120f9d1698.patch delete mode 100644 src/scintilla_backports/6182_7c132e9340ce.patch delete mode 100644 src/scintilla_backports/6183_3e2dd5970075.patch delete mode 100644 src/scintilla_backports/6184_692a54eaa604.patch delete mode 100644 src/scintilla_backports/6185_b8379bec8e70.patch delete mode 100644 src/scintilla_backports/6186_044d2d030263.patch delete mode 100644 src/scintilla_backports/6187_a80a6876c301.patch delete mode 100644 src/scintilla_backports/6196_e4f249dbdc30.patch delete mode 100644 src/scintilla_backports/6215_1f02cb4a5b26.patch delete mode 100644 src/scintilla_backports/6222_45f968a6735a.patch delete mode 100644 src/scintilla_backports/6231_61adfbe4fa64.patch delete mode 100644 src/scintilla_backports/6301_4bf96081f6e6.patch delete mode 100644 src/scintilla_backports/6305_90741c1cb988.patch delete mode 100644 src/scintilla_backports/6310_7e28cdba6d61.patch delete mode 100644 src/scintilla_backports/6311_7030530a9a0f.patch delete mode 100644 src/scintilla_backports/6314_af83baede430.patch delete mode 100644 src/scintilla_backports/6317_82cb780a04d1.patch delete mode 100644 src/scintilla_backports/6323_8d56eaef4f0a.patch delete mode 100644 src/scintilla_backports/6327_95346e626cf8.patch delete mode 100644 src/scintilla_backports/6339_79f86be9e988.patch delete mode 100644 src/scintilla_backports/6340_ebec660dcf48.patch delete mode 100644 src/scintilla_backports/6342_52f12c3eebcd.patch delete mode 100644 src/scintilla_backports/6379_b44bb3627bbd.patch delete mode 100644 src/scintilla_backports/6388_96506cab38bd.patch delete mode 100644 src/scintilla_backports/6397_2db0528f34b5.patch delete mode 100644 src/scintilla_backports/6418_85205da6ec1b.patch delete mode 100644 src/scintilla_backports/6419_8760026bba6a.patch delete mode 100644 src/scintilla_backports/6421_fd2f856b8d58.patch delete mode 100644 src/scintilla_backports/6425_73343682cbda.patch delete mode 100644 src/scintilla_backports/6434_ed27432729c3.patch delete mode 100644 src/scintilla_backports/6441_92c8f0f1b3e6.patch delete mode 100644 src/scintilla_backports/6442_3e3bfe29a819.patch delete mode 100644 src/scintilla_backports/6444_1bd57324aa36.patch delete mode 100644 src/scintilla_backports/6445_89d992f380a1.patch delete mode 100644 src/scintilla_backports/6448_431b814a54a6.patch delete mode 100644 src/scintilla_backports/6449_1280ef150bbb.patch delete mode 100644 src/scintilla_backports/6456_eaa6c7fa1a81.patch delete mode 100644 src/scintilla_backports/6458_0a8a766722c0.patch delete mode 100644 src/scintilla_backports/revs (limited to 'src/scintilla_backports') diff --git a/src/scintilla_backports/6095_ae52e0c68190.patch b/src/scintilla_backports/6095_ae52e0c68190.patch deleted file mode 100644 index f30f40dc..00000000 --- a/src/scintilla_backports/6095_ae52e0c68190.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# User Colomban Wendling -# Date 1487714930 -3600 -# Node ID ae52e0c68190d423505624ae1d26e442e015d48f -# Parent 966f25e2241058f45500025b0a8e8ed4cae10ee7 -Bug [#1901]. GTK: Fix double scrolling under X11 - -Really restrict smooth scrolling handling to Wayland. - -diff -r 966f25e22410 -r ae52e0c68190 doc/ScintillaHistory.html ---- a/doc/ScintillaHistory.html Sun Feb 19 14:13:46 2017 +1100 -+++ b/doc/ScintillaHistory.html Tue Feb 21 23:08:50 2017 +0100 -@@ -520,6 +520,18 @@ - - -

-+ Release 3.7.4 -+

-+ -+

- Release 3.7.3 -

- -+

-+ Release 3.7.4 -+

-+ -

- Release 4.0.0 -diff -r d62863ae40a3 -r 96506cab38bd src/Editor.cxx ---- a/src/Editor.cxx Mon Sep 11 09:05:35 2017 +1000 -+++ b/src/Editor.cxx Wed Sep 13 11:27:44 2017 +1000 -@@ -4320,6 +4320,8 @@ - PRectangle rcSelMargin = GetClientRectangle(); - rcSelMargin.right = static_cast(vs.textStart - vs.leftMarginWidth); - rcSelMargin.left = static_cast(vs.textStart - vs.fixedColumnWidth); -+ const Point ptOrigin = GetVisibleOriginInMain(); -+ rcSelMargin.Move(0, -ptOrigin.y); - return rcSelMargin.ContainsWholePixel(pt); - } else { - return false; diff --git a/src/scintilla_backports/6397_2db0528f34b5.patch b/src/scintilla_backports/6397_2db0528f34b5.patch deleted file mode 100644 index 098c700e..00000000 --- a/src/scintilla_backports/6397_2db0528f34b5.patch +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Zufu Liu -# Date 1508018757 -39600 -# Node ID 2db0528f34b5b79890fd6c04897091474c18839a -# Parent 85f99a613e89325580b2202031b99f88e1c73bb1 -Bug [#1978]. Minor undefined behaviour fixed. - -diff -r 85f99a613e89 -r 2db0528f34b5 doc/ScintillaHistory.html ---- a/doc/ScintillaHistory.html Sun Oct 15 08:57:00 2017 +1100 -+++ b/doc/ScintillaHistory.html Sun Oct 15 09:05:57 2017 +1100 -@@ -557,6 +557,10 @@ - Bug #1968. - -
  • -+ Minor undefined behaviour fixed. -+ Bug #1978. -+
    • -+
  • - On Cocoa, improve scrolling on macOS 10.12. - Bug #1885. -
    • -diff -r 85f99a613e89 -r 2db0528f34b5 src/ViewStyle.cxx ---- a/src/ViewStyle.cxx Sun Oct 15 08:57:00 2017 +1100 -+++ b/src/ViewStyle.cxx Sun Oct 15 09:05:57 2017 +1100 -@@ -192,7 +192,7 @@ - } - maskDrawInText = 0; - for (int markBit = 0; markBit < 32; markBit++) { -- const int maskBit = 1 << markBit; -+ const int maskBit = 1U << markBit; - switch (markers[markBit].markType) { - case SC_MARK_EMPTY: - maskInLine &= ~maskBit; diff --git a/src/scintilla_backports/6418_85205da6ec1b.patch b/src/scintilla_backports/6418_85205da6ec1b.patch deleted file mode 100644 index 19db1d1f..00000000 --- a/src/scintilla_backports/6418_85205da6ec1b.patch +++ /dev/null @@ -1,79 +0,0 @@ -# HG changeset patch -# User Mitchell -# Date 1511141091 -39600 -# Node ID 85205da6ec1b8eeb14c3edc94064fb0d8f685377 -# Parent f78045efae202c3da36b6f347cc695da44a1d522 -Add SCI_GETMOVEEXTENDSSELECTION. - -diff -r f78045efae20 -r 85205da6ec1b doc/ScintillaDoc.html ---- a/doc/ScintillaDoc.html Mon Nov 20 11:48:00 2017 +1100 -+++ b/doc/ScintillaDoc.html Mon Nov 20 12:24:51 2017 +1100 -@@ -1222,6 +1222,7 @@ - SCI_SELECTIONISRECTANGLE → bool
    - SCI_SETSELECTIONMODE(int selectionMode)
    - SCI_GETSELECTIONMODE → int
    -+ SCI_GETMOVEEXTENDSSELECTION → bool
    - SCI_GETLINESELSTARTPOSITION(int line) → position
    - SCI_GETLINESELENDPOSITION(int line) → position
    - SCI_MOVECARETINSIDEVIEW
    -@@ -1425,6 +1426,10 @@ - SC_SEL_THIN is the mode after a rectangular selection has been typed into and ensures - that no characters are selected.

    - -+

    SCI_GETMOVEEXTENDSSELECTION → bool
    -+ This returns 1 if regular caret moves will extend or reduce the selection, 0 if not. -+ SCI_SETSELECTIONMODE toggles this setting between on and off.

    -+ -

    SCI_GETLINESELSTARTPOSITION(int line) → position
    - SCI_GETLINESELENDPOSITION(int line) → position
    - Retrieve the position of the start and end of the selection at the given line with -diff -r f78045efae20 -r 85205da6ec1b doc/ScintillaHistory.html ---- a/doc/ScintillaHistory.html Mon Nov 20 11:48:00 2017 +1100 -+++ b/doc/ScintillaHistory.html Mon Nov 20 12:24:51 2017 +1100 -@@ -534,6 +534,10 @@ - Released 26 October 2017. - -

  • -+ Add SCI_GETMOVEEXTENDSSELECTION to allow applications to add more -+ complex selection commands. -+
    • -+
  • - Improve VHDL lexer's handling of character literals and escape characters in strings. -
    • -
  • -diff -r f78045efae20 -r 85205da6ec1b include/Scintilla.h ---- a/include/Scintilla.h Mon Nov 20 11:48:00 2017 +1100 -+++ b/include/Scintilla.h Mon Nov 20 12:24:51 2017 +1100 -@@ -758,6 +758,7 @@ - #define SC_SEL_THIN 3 - #define SCI_SETSELECTIONMODE 2422 - #define SCI_GETSELECTIONMODE 2423 -+#define SCI_GETMOVEEXTENDSSELECTION 2706 - #define SCI_GETLINESELSTARTPOSITION 2424 - #define SCI_GETLINESELENDPOSITION 2425 - #define SCI_LINEDOWNRECTEXTEND 2426 -diff -r f78045efae20 -r 85205da6ec1b include/Scintilla.iface ---- a/include/Scintilla.iface Mon Nov 20 11:48:00 2017 +1100 -+++ b/include/Scintilla.iface Mon Nov 20 12:24:51 2017 +1100 -@@ -1964,6 +1964,9 @@ - # Get the mode of the current selection. - get int GetSelectionMode=2423(,) - -+# Get whether or not regular caret moves will extend or reduce the selection. -+get bool GetMoveExtendsSelection=2706(,) -+ - # Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line). - fun position GetLineSelStartPosition=2424(int line,) - -diff -r f78045efae20 -r 85205da6ec1b src/Editor.cxx ---- a/src/Editor.cxx Mon Nov 20 11:48:00 2017 +1100 -+++ b/src/Editor.cxx Mon Nov 20 12:24:51 2017 +1100 -@@ -7625,6 +7625,8 @@ - default: // ?! - return SC_SEL_STREAM; - } -+ case SCI_GETMOVEEXTENDSSELECTION: -+ return sel.MoveExtends(); - case SCI_GETLINESELSTARTPOSITION: - case SCI_GETLINESELENDPOSITION: { - SelectionSegment segmentLine( diff --git a/src/scintilla_backports/6419_8760026bba6a.patch b/src/scintilla_backports/6419_8760026bba6a.patch deleted file mode 100644 index a477a80e..00000000 --- a/src/scintilla_backports/6419_8760026bba6a.patch +++ /dev/null @@ -1,142 +0,0 @@ -# HG changeset patch -# User Neil Hodgson -# Date 1511240678 -39600 -# Node ID 8760026bba6ab6a5c6ee3d2d7bd7a291ecb74574 -# Parent 85205da6ec1b8eeb14c3edc94064fb0d8f685377 -Update marshalling of signals from Scintilla, changing deprecated NONE to VOID. -Has no effect on clients as NONE was an alias for VOID. - -diff -r 85205da6ec1b -r 8760026bba6a gtk/scintilla-marshal.c ---- a/gtk/scintilla-marshal.c Mon Nov 20 12:24:51 2017 +1100 -+++ b/gtk/scintilla-marshal.c Tue Nov 21 16:04:38 2017 +1100 -@@ -1,6 +1,4 @@ -- --#include -- -+#include - - #ifdef G_ENABLE_DEBUG - #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -@@ -48,8 +46,7 @@ - #define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer - #endif /* !G_ENABLE_DEBUG */ - -- --/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ -+/* VOID:INT,OBJECT (scintilla-marshal.list:1) */ - void - scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, -@@ -58,13 +55,13 @@ - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { -- typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1, -- gint arg_1, -- gpointer arg_2, -- gpointer data2); -+ typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1, -+ gint arg1, -+ gpointer arg2, -+ gpointer data2); -+ GCClosure *cc = (GCClosure *) closure; -+ gpointer data1, data2; - GMarshalFunc_VOID__INT_OBJECT callback; -- GCClosure *cc = (GCClosure*) closure; -- gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - -@@ -86,7 +83,7 @@ - data2); - } - --/* NONE:INT,BOXED (scintilla-marshal.list:2) */ -+/* VOID:INT,BOXED (scintilla-marshal.list:2) */ - void - scintilla_marshal_VOID__INT_BOXED (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, -@@ -95,13 +92,13 @@ - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { -- typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, -- gint arg_1, -- gpointer arg_2, -- gpointer data2); -+ typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, -+ gint arg1, -+ gpointer arg2, -+ gpointer data2); -+ GCClosure *cc = (GCClosure *) closure; -+ gpointer data1, data2; - GMarshalFunc_VOID__INT_BOXED callback; -- GCClosure *cc = (GCClosure*) closure; -- gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - -diff -r 85205da6ec1b -r 8760026bba6a gtk/scintilla-marshal.h ---- a/gtk/scintilla-marshal.h Mon Nov 20 12:24:51 2017 +1100 -+++ b/gtk/scintilla-marshal.h Tue Nov 21 16:04:38 2017 +1100 -@@ -1,30 +1,30 @@ -+/* This file is generated, all changes will be lost */ -+#ifndef __SCINTILLA_MARSHAL_MARSHAL_H__ -+#define __SCINTILLA_MARSHAL_MARSHAL_H__ - --#ifndef __scintilla_marshal_MARSHAL_H__ --#define __scintilla_marshal_MARSHAL_H__ -- --#include -+#include - - G_BEGIN_DECLS - --/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ --extern void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, -- GValue *return_value, -- guint n_param_values, -- const GValue *param_values, -- gpointer invocation_hint, -- gpointer marshal_data); --#define scintilla_marshal_NONE__INT_OBJECT scintilla_marshal_VOID__INT_OBJECT -+/* VOID:INT,OBJECT (scintilla-marshal.list:1) */ -+extern -+void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data); - --/* NONE:INT,BOXED (scintilla-marshal.list:2) */ --extern void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, -- GValue *return_value, -- guint n_param_values, -- const GValue *param_values, -- gpointer invocation_hint, -- gpointer marshal_data); --#define scintilla_marshal_NONE__INT_BOXED scintilla_marshal_VOID__INT_BOXED -+/* VOID:INT,BOXED (scintilla-marshal.list:2) */ -+extern -+void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, -+ GValue *return_value, -+ guint n_param_values, -+ const GValue *param_values, -+ gpointer invocation_hint, -+ gpointer marshal_data); -+ - - G_END_DECLS - --#endif /* __scintilla_marshal_MARSHAL_H__ */ -- -+#endif /* __SCINTILLA_MARSHAL_MARSHAL_H__ */ -diff -r 85205da6ec1b -r 8760026bba6a gtk/scintilla-marshal.list ---- a/gtk/scintilla-marshal.list Mon Nov 20 12:24:51 2017 +1100 -+++ b/gtk/scintilla-marshal.list Tue Nov 21 16:04:38 2017 +1100 -@@ -1,2 +1,2 @@ --NONE:INT,OBJECT --NONE:INT,BOXED -+VOID:INT,OBJECT -+VOID:INT,BOXED diff --git a/src/scintilla_backports/6421_fd2f856b8d58.patch b/src/scintilla_backports/6421_fd2f856b8d58.patch deleted file mode 100644 index 9e354864..00000000 --- a/src/scintilla_backports/6421_fd2f856b8d58.patch +++ /dev/null @@ -1,68 +0,0 @@ -# HG changeset patch -# User Greg Smith -# Date 1513111541 -39600 -# Node ID fd2f856b8d582df2e3e60073721a84b9f464a72b -# Parent 2286dd5fa6259c67cc8ce0d4c39b1c2e6f85ff1f -Use explicit typedefs instead of deprecated derivation from std::iterator. -This fixes a C4996 / STL4015 warning from Visual C++ 2017.5 that the -std::iterator class template is deprecated in C++17. - -diff -r 2286dd5fa625 -r fd2f856b8d58 src/Document.cxx ---- a/src/Document.cxx Tue Nov 21 16:16:25 2017 +1100 -+++ b/src/Document.cxx Wed Dec 13 07:45:41 2017 +1100 -@@ -2600,8 +2600,14 @@ - - #ifndef NO_CXX11_REGEX - --class ByteIterator : public std::iterator { -+class ByteIterator { - public: -+ typedef std::bidirectional_iterator_tag iterator_category; -+ typedef char value_type; -+ typedef ptrdiff_t difference_type; -+ typedef char* pointer; -+ typedef char& reference; -+ - const Document *doc; - Sci::Position position; - ByteIterator(const Document *doc_ = 0, Sci::Position position_ = 0) : doc(doc_), position(position_) { -@@ -2663,7 +2669,7 @@ - - // On Windows, report non-BMP characters as 2 separate surrogates as that - // matches wregex since it is based on wchar_t. --class UTF8Iterator : public std::iterator { -+class UTF8Iterator { - // These 3 fields determine the iterator position and are used for comparisons - const Document *doc; - Sci::Position position; -@@ -2673,6 +2679,12 @@ - size_t lenCharacters; - wchar_t buffered[2]; - public: -+ typedef std::bidirectional_iterator_tag iterator_category; -+ typedef wchar_t value_type; -+ typedef ptrdiff_t difference_type; -+ typedef wchar_t* pointer; -+ typedef wchar_t& reference; -+ - UTF8Iterator(const Document *doc_ = 0, Sci::Position position_ = 0) : - doc(doc_), position(position_), characterIndex(0), lenBytes(0), lenCharacters(0) { - buffered[0] = 0; -@@ -2775,10 +2787,16 @@ - - // On Unix, report non-BMP characters as single characters - --class UTF8Iterator : public std::iterator { -+class UTF8Iterator { - const Document *doc; - Sci::Position position; - public: -+ typedef std::bidirectional_iterator_tag iterator_category; -+ typedef wchar_t value_type; -+ typedef ptrdiff_t difference_type; -+ typedef wchar_t* pointer; -+ typedef wchar_t& reference; -+ - UTF8Iterator(const Document *doc_=0, Sci::Position position_=0) : doc(doc_), position(position_) { - } - UTF8Iterator(const UTF8Iterator &other) NOEXCEPT { diff --git a/src/scintilla_backports/6425_73343682cbda.patch b/src/scintilla_backports/6425_73343682cbda.patch deleted file mode 100644 index 0126d946..00000000 --- a/src/scintilla_backports/6425_73343682cbda.patch +++ /dev/null @@ -1,170 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1513656040 -39600 -# Node ID 73343682cbda0937c5427ee45ea6c9104d97ac1e -# Parent 5246ca55cf2443dbd6d37bc6dfede6d5f3a14a36 -Start of bidirectional code - implement SCI_SETBIDIRECTIONAL. - -diff -r 5246ca55cf24 -r 73343682cbda doc/ScintillaDoc.html ---- a/doc/ScintillaDoc.html Wed Jan 10 10:04:03 2018 +1100 -+++ b/doc/ScintillaDoc.html Tue Dec 19 15:00:40 2017 +1100 -@@ -119,7 +119,7 @@ - -

    Scintilla Documentation

    - --

    Last edited 11 August 2017 NH

    -+

    Last edited 10 January 2018 NH

    - -

    There is an overview of the internal design of - Scintilla.
    -@@ -3594,6 +3594,10 @@ - SCI_GETCODEPAGE → int
    - SCI_SETIMEINTERACTION(int imeInteraction)
    - SCI_GETIMEINTERACTION → int
    -+

    -+ SCI_SETBIDIRECTIONAL(int bidirectional)
    -+ SCI_GETBIDIRECTIONAL → int
    -+
    - SCI_GRABFOCUS
    - SCI_SETFOCUS(bool focus)
    - SCI_GETFOCUS → bool
    -@@ -3718,6 +3722,27 @@ - and the inline behaviour with SCI_SETIMEINTERACTION(SC_IME_INLINE). - Scintilla may ignore this call in some cases. For example, the inline behaviour might only be supported for some languages.

    - -+
    -+ These bidirectional features are not yet implemented and the API is provisional
    -+

    SCI_SETBIDIRECTIONAL(int bidirectional)
    -+ SCI_GETBIDIRECTIONAL → int
    -+ Some languages, like Arabic and Hebrew, are written from right to left instead of from left to right as English is. -+ Documents that use multiple languages may contain both directions and this is termed "bidirectional". -+ The default text direction may be right to left or left to right. -+ Scintilla only correctly displays bidirectional text on some platforms and there can be additional processing and storage -+ costs to this. -+ Currently, bidirectional text only works on Win32 using DirectWrite. -+ As some applications may not want to pay the costs, bidirectional support must be explicitly enabled by calling -+ SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_L2R) (1) which chooses left to right as the default direction or -+ SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_R2L) (2) for default right to left. -+ This should be done after setting the technology to SC_TECHNOLOGY_DIRECTWRITE, -+ SC_TECHNOLOGY_DIRECTWRITERETAIN, or -+ SC_TECHNOLOGY_DIRECTWRITEDC.

    -+

    If the call succeeded SCI_GETBIDIRECTIONAL will return the same value otherwise -+ SC_BIDIRECTIONAL_DISABLED (0) is returned. -+

    -+
    -+ -

    SCI_GRABFOCUS
    - SCI_SETFOCUS(bool focus)
    - SCI_GETFOCUS → bool
    -@@ -8073,8 +8098,6 @@ - -

    Provisional features are displayed in this document with a distinctive background colour.

    - --

    There are currently no provisional messages or values.

    -- -

    Some developers may want to only use features that are stable and have graduated from - provisional status. To avoid using provisional messages compile with the symbol - SCI_DISABLE_PROVISIONAL defined.

    -diff -r 5246ca55cf24 -r 73343682cbda include/Scintilla.h ---- a/include/Scintilla.h Wed Jan 10 10:04:03 2018 +1100 -+++ b/include/Scintilla.h Tue Dec 19 15:00:40 2017 +1100 -@@ -1103,6 +1103,13 @@ - #define SCN_AUTOCCOMPLETED 2030 - #define SCN_MARGINRIGHTCLICK 2031 - #define SCN_AUTOCSELECTIONCHANGE 2032 -+#ifndef SCI_DISABLE_PROVISIONAL -+#define SC_BIDIRECTIONAL_DISABLED 0 -+#define SC_BIDIRECTIONAL_L2R 1 -+#define SC_BIDIRECTIONAL_R2L 2 -+#define SCI_GETBIDIRECTIONAL 2708 -+#define SCI_SETBIDIRECTIONAL 2709 -+#endif - /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ - - /* These structures are defined to be exactly the same shape as the Win32 -diff -r 5246ca55cf24 -r 73343682cbda include/Scintilla.iface ---- a/include/Scintilla.iface Wed Jan 10 10:04:03 2018 +1100 -+++ b/include/Scintilla.iface Tue Dec 19 15:00:40 2017 +1100 -@@ -4861,10 +4861,19 @@ - evt void MarginRightClick=2031(int modifiers, int position, int margin) - evt void AutoCSelectionChange=2032(int listType, string text, int position) - --# There are no provisional APIs currently, but some arguments to SCI_SETTECHNOLOGY are provisional. -- - cat Provisional - -+enu Bidirectional=SC_BIDIRECTIONAL_ -+val SC_BIDIRECTIONAL_DISABLED=0 -+val SC_BIDIRECTIONAL_L2R=1 -+val SC_BIDIRECTIONAL_R2L=2 -+ -+# Retrieve bidirectional text display state. -+get int GetBidirectional=2708(,) -+ -+# Set bidirectional text display state. -+set void SetBidirectional=2709(int bidirectional,) -+ - cat Deprecated - - # Divide each styling byte into lexical class bits (default: 5) and indicator -diff -r 5246ca55cf24 -r 73343682cbda src/EditModel.cxx ---- a/src/EditModel.cxx Wed Jan 10 10:04:03 2018 +1100 -+++ b/src/EditModel.cxx Tue Dec 19 15:00:40 2017 +1100 -@@ -63,6 +63,7 @@ - highlightGuideColumn = 0; - primarySelection = true; - imeInteraction = imeWindowed; -+ bidirectional = bidiDisabled; - foldFlags = 0; - foldDisplayTextStyle = SC_FOLDDISPLAYTEXT_HIDDEN; - hotspot = Range(Sci::invalidPosition); -diff -r 5246ca55cf24 -r 73343682cbda src/EditModel.h ---- a/src/EditModel.h Wed Jan 10 10:04:03 2018 +1100 -+++ b/src/EditModel.h Tue Dec 19 15:00:40 2017 +1100 -@@ -38,6 +38,8 @@ - - enum IMEInteraction { imeWindowed, imeInline } imeInteraction; - -+ enum Bidirectional { bidiDisabled, bidiL2R, bidiR2L } bidirectional; -+ - int foldFlags; - int foldDisplayTextStyle; - ContractionState cs; -diff -r 5246ca55cf24 -r 73343682cbda src/Editor.cxx ---- a/src/Editor.cxx Wed Jan 10 10:04:03 2018 +1100 -+++ b/src/Editor.cxx Tue Dec 19 15:00:40 2017 +1100 -@@ -6736,6 +6736,13 @@ - case SCI_GETIMEINTERACTION: - return imeInteraction; - -+ case SCI_SETBIDIRECTIONAL: -+ // SCI_SETBIDIRECTIONAL is implemented on platform subclasses if they support bidirectional text. -+ break; -+ -+ case SCI_GETBIDIRECTIONAL: -+ return static_cast(bidirectional); -+ - // Marker definition and setting - case SCI_MARKERDEFINE: - if (wParam <= MARKER_MAX) { -diff -r 5246ca55cf24 -r 73343682cbda win32/ScintillaWin.cxx ---- a/win32/ScintillaWin.cxx Wed Jan 10 10:04:03 2018 +1100 -+++ b/win32/ScintillaWin.cxx Tue Dec 19 15:00:40 2017 +1100 -@@ -1744,6 +1744,17 @@ - } - break; - -+ case SCI_SETBIDIRECTIONAL: -+ if (technology == SC_TECHNOLOGY_DEFAULT) { -+ bidirectional = EditModel::Bidirectional::bidiDisabled; -+ } else if ((wParam >= SC_BIDIRECTIONAL_DISABLED) && (wParam <= SC_BIDIRECTIONAL_R2L)) { -+ bidirectional = static_cast(wParam); -+ } -+ // Invalidate all cached information including layout. -+ DropGraphics(true); -+ InvalidateStyleRedraw(); -+ break; -+ - #ifdef SCI_LEXER - case SCI_LOADLEXERLIBRARY: - LexerManager::GetInstance()->Load(reinterpret_cast(lParam)); diff --git a/src/scintilla_backports/6434_ed27432729c3.patch b/src/scintilla_backports/6434_ed27432729c3.patch deleted file mode 100644 index fafca810..00000000 --- a/src/scintilla_backports/6434_ed27432729c3.patch +++ /dev/null @@ -1,50 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1517090168 -39600 -# Node ID ed27432729c386c48ef4f11459aeb2ed1f0856c8 -# Parent 231ac99e1fdc2b0fa62668cf5495b2f7df3f4d82 -Use std::abs in preference to abs as std::abs is generic and abs casts to int -which may drop information. - -diff -r 231ac99e1fdc -r ed27432729c3 src/Document.cxx ---- a/src/Document.cxx Sun Jan 28 08:32:17 2018 +1100 -+++ b/src/Document.cxx Sun Jan 28 08:56:08 2018 +1100 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -877,7 +878,7 @@ - const Sci::Position posNext = NextPosition(pos, increment); - if (posNext == pos) - return INVALID_POSITION; -- if (abs(pos-posNext) > 3) // 4 byte character = 2*UTF16. -+ if (std::abs(pos-posNext) > 3) // 4 byte character = 2*UTF16. - characterOffset -= increment; - pos = posNext; - characterOffset -= increment; -diff -r 231ac99e1fdc -r ed27432729c3 src/Editor.cxx ---- a/src/Editor.cxx Sun Jan 28 08:32:17 2018 +1100 -+++ b/src/Editor.cxx Sun Jan 28 08:56:08 2018 +1100 -@@ -11,8 +11,8 @@ - #include - #include - #include -- - #include -+ - #include - #include - #include -@@ -934,7 +934,7 @@ - // Try to optimise small scrolls - #ifndef UNDER_CE - const Sci::Line linesToMove = topLine - topLineNew; -- const bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting); -+ const bool performBlit = (std::abs(linesToMove) <= 10) && (paintState == notPainting); - willRedrawAll = !performBlit; - #endif - SetTopLine(topLineNew); diff --git a/src/scintilla_backports/6441_92c8f0f1b3e6.patch b/src/scintilla_backports/6441_92c8f0f1b3e6.patch deleted file mode 100644 index edcc6338..00000000 --- a/src/scintilla_backports/6441_92c8f0f1b3e6.patch +++ /dev/null @@ -1,157 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1516925530 -39600 -# Node ID 92c8f0f1b3e64900cbb868a56936898693b9cfcc -# Parent a1731ae83d2ac87c29f6b502efc5c4a747e0b704 -Add documentOption argument to SCI_CREATELOADER. - -diff -r a1731ae83d2a -r 92c8f0f1b3e6 doc/ScintillaDoc.html ---- a/doc/ScintillaDoc.html Tue Jan 30 12:40:53 2018 +1100 -+++ b/doc/ScintillaDoc.html Fri Jan 26 11:12:10 2018 +1100 -@@ -119,7 +119,7 @@ - -

    Scintilla Documentation

    - --

    Last edited 10 January 2018 NH

    -+

    Last edited 31 January 2018 NH

    - -

    There is an overview of the internal design of - Scintilla.
    -@@ -5711,7 +5711,7 @@ - SCI_GETDOCPOINTER → document *
    - SCI_SETDOCPOINTER(<unused>, document - *doc)
    -- SCI_CREATEDOCUMENT → document *
    -+ SCI_CREATEDOCUMENT(int bytes, int documentOption) → document *
    - SCI_ADDREFDOCUMENT(<unused>, document - *doc)
    - SCI_RELEASEDOCUMENT(<unused>, document -@@ -5732,13 +5732,20 @@ - window.
    - 6. If doc was not 0, its reference count is increased by 1.

    - --

    SCI_CREATEDOCUMENT → document *
    -+

    SCI_CREATEDOCUMENT(int bytes, int documentOption) → document *
    - This message creates a new, empty document and returns a pointer to it. This document is not -- selected into the editor and starts with a reference count of 1. This means that you have -- ownership of it and must either reduce its reference count by 1 after using -+ selected into the editor and starts with a reference count of 1. This means that you have -+ ownership of it and must either reduce its reference count by 1 after using - SCI_SETDOCPOINTER so that the Scintilla window owns it or you must make sure that -- you reduce the reference count by 1 with SCI_RELEASEDOCUMENT before you close the -- application to avoid memory leaks.

    -+ you reduce the reference count by 1 with SCI_RELEASEDOCUMENT before you close the -+ application to avoid memory leaks. The bytes argument determines -+ the initial memory allocation for the document as it is more efficient -+ to allocate once rather than rely on the buffer growing as data is added. -+ If SCI_CREATEDOCUMENT fails then 0 is returned.

    -+ -+

    The documentOption argument may be used in future versions -+ to choose between different document capabilities which affect memory allocation and performance. -+ The only valid value for now is SC_DOCUMENTOPTION_DEFAULT (0).

    - -

    SCI_ADDREFDOCUMENT(<unused>, document *doc)
    - This increases the reference count of a document by 1. If you want to replace the current -@@ -5765,7 +5772,7 @@ - -

    Loading in the background

    - --     SCI_CREATELOADER(int bytes) → int
    -+ SCI_CREATELOADER(int bytes, int documentOption) → int
    -     - -

    An application can load all of a file into a buffer it allocates on a background thread and then add the data in that buffer -@@ -5774,13 +5781,17 @@ - -

    To avoid these issues, a loader object may be created and used to load the file. The loader object supports the ILoader interface.

    - --

    SCI_CREATELOADER(int bytes) → int
    -+

    SCI_CREATELOADER(int bytes, int documentOption) → int
    - Create an object that supports the ILoader interface which can be used to load data and then - be turned into a Scintilla document object for attachment to a view object. - The bytes argument determines the initial memory allocation for the document as it is more efficient - to allocate once rather than rely on the buffer growing as data is added. - If SCI_CREATELOADER fails then 0 is returned.

    - -+

    The documentOption argument may be used in future versions -+ to choose between different document capabilities which affect memory allocation and performance. -+ The only valid value for now is SC_DOCUMENTOPTION_DEFAULT (0).

    -+ -

    ILoader

    - -
    -@@ -6573,7 +6584,7 @@ - On GTK+, there are storage and performance costs to accessibility, so it can be disabled - by calling SCI_SETACCESSIBILITY. -

    -- -+ - - - -@@ -6603,7 +6614,7 @@ - - -
    -- -+ -

    Lexer

    - -

    If you define the symbol SCI_LEXER when building Scintilla, (this is sometimes -@@ -6894,7 +6905,7 @@ -

    - Methods that return strings as const char * are not required to maintain separate allocations indefinitely: - lexer implementations may own a single buffer that is reused for each call. --Callers should make an immediate copy of returned strings. -+Callers should make an immediate copy of returned strings. -

    - -

    -diff -r a1731ae83d2a -r 92c8f0f1b3e6 include/Scintilla.h ---- a/include/Scintilla.h Tue Jan 30 12:40:53 2018 +1100 -+++ b/include/Scintilla.h Fri Jan 26 11:12:10 2018 +1100 -@@ -689,6 +689,7 @@ - #define SCI_SELECTIONISRECTANGLE 2372 - #define SCI_SETZOOM 2373 - #define SCI_GETZOOM 2374 -+#define SC_DOCUMENTOPTION_DEFAULT 0 - #define SCI_CREATEDOCUMENT 2375 - #define SCI_ADDREFDOCUMENT 2376 - #define SCI_RELEASEDOCUMENT 2377 -diff -r a1731ae83d2a -r 92c8f0f1b3e6 include/Scintilla.iface ---- a/include/Scintilla.iface Tue Jan 30 12:40:53 2018 +1100 -+++ b/include/Scintilla.iface Fri Jan 26 11:12:10 2018 +1100 -@@ -1771,9 +1771,12 @@ - # Retrieve the zoom level. - get int GetZoom=2374(,) - -+enu DocumentOption=SC_DOCUMENTOPTION_ -+val SC_DOCUMENTOPTION_DEFAULT=0 -+ - # Create a new document object. - # Starts with reference count of 1 and not selected into editor. --fun int CreateDocument=2375(,) -+fun int CreateDocument=2375(int bytes, int documentOption) - # Extend life of document. - fun void AddRefDocument=2376(, int doc) - # Release a reference to the document, deleting document if it fades to black. -@@ -2540,7 +2543,7 @@ - get int GetTechnology=2631(,) - - # Create an ILoader*. --fun int CreateLoader=2632(int bytes,) -+fun int CreateLoader=2632(int bytes, int documentOption) - - # On OS X, show a find indicator. - fun void FindIndicatorShow=2640(position start, position end) -diff -r a1731ae83d2a -r 92c8f0f1b3e6 src/Editor.cxx ---- a/src/Editor.cxx Tue Jan 30 12:40:53 2018 +1100 -+++ b/src/Editor.cxx Fri Jan 26 11:12:10 2018 +1100 -@@ -7556,6 +7556,7 @@ - case SCI_CREATEDOCUMENT: { - Document *doc = new Document(); - doc->AddRef(); -+ doc->Allocate(static_cast(wParam)); - return reinterpret_cast(doc); - } - diff --git a/src/scintilla_backports/6442_3e3bfe29a819.patch b/src/scintilla_backports/6442_3e3bfe29a819.patch deleted file mode 100644 index acc6dbae..00000000 --- a/src/scintilla_backports/6442_3e3bfe29a819.patch +++ /dev/null @@ -1,319 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1516950278 -39600 -# Node ID 3e3bfe29a819c1f7a1761096ec54e9b6ee446a68 -# Parent 92c8f0f1b3e64900cbb868a56936898693b9cfcc -Extend SplitVector to allow more than 2 billion elements on 64-bit systems. - -diff -r 92c8f0f1b3e6 -r 3e3bfe29a819 src/CellBuffer.cxx ---- a/src/CellBuffer.cxx Fri Jan 26 11:12:10 2018 +1100 -+++ b/src/CellBuffer.cxx Fri Jan 26 18:04:38 2018 +1100 -@@ -394,7 +394,7 @@ - } - - Sci::Position CellBuffer::GapPosition() const { -- return substance.GapPosition(); -+ return static_cast(substance.GapPosition()); - } - - // The char* returned is to an allocation owned by the undo history -@@ -457,7 +457,7 @@ - } - - Sci::Position CellBuffer::Length() const { -- return substance.Length(); -+ return static_cast(substance.Length()); - } - - void CellBuffer::Allocate(Sci::Position newSize) { -diff -r 92c8f0f1b3e6 -r 3e3bfe29a819 src/Partitioning.h ---- a/src/Partitioning.h Fri Jan 26 11:12:10 2018 +1100 -+++ b/src/Partitioning.h Fri Jan 26 18:04:38 2018 +1100 -@@ -16,7 +16,7 @@ - - class SplitVectorWithRangeAdd : public SplitVector { - public: -- explicit SplitVectorWithRangeAdd(int growSize_) { -+ explicit SplitVectorWithRangeAdd(ptrdiff_t growSize_) { - SetGrowSize(growSize_); - ReAllocate(growSize_); - } -@@ -25,12 +25,12 @@ - void operator=(const SplitVectorWithRangeAdd &) = delete; - ~SplitVectorWithRangeAdd() { - } -- void RangeAddDelta(int start, int end, int delta) { -+ void RangeAddDelta(ptrdiff_t start, ptrdiff_t end, int delta) { - // end is 1 past end, so end-start is number of elements to change -- int i = 0; -- const int rangeLength = end - start; -- int range1Length = rangeLength; -- const int part1Left = part1Length - start; -+ ptrdiff_t i = 0; -+ const ptrdiff_t rangeLength = end - start; -+ ptrdiff_t range1Length = rangeLength; -+ const ptrdiff_t part1Left = part1Length - start; - if (range1Length > part1Left) - range1Length = part1Left; - while (i < range1Length) { -@@ -67,7 +67,7 @@ - } - stepPartition = partitionUpTo; - if (stepPartition >= body->Length()-1) { -- stepPartition = body->Length()-1; -+ stepPartition = Partitions(); - stepLength = 0; - } - } -@@ -80,7 +80,7 @@ - stepPartition = partitionDownTo; - } - -- void Allocate(int growSize) { -+ void Allocate(ptrdiff_t growSize) { - body = new SplitVectorWithRangeAdd(growSize); - stepPartition = 0; - stepLength = 0; -@@ -101,7 +101,7 @@ - } - - int Partitions() const { -- return body->Length()-1; -+ return static_cast(body->Length()-1); - } - - void InsertPartition(int partition, int pos) { -@@ -132,7 +132,7 @@ - BackStep(partitionInsert); - stepLength += delta; - } else { -- ApplyStep(body->Length()-1); -+ ApplyStep(Partitions()); - stepPartition = partitionInsert; - stepLength = delta; - } -@@ -168,10 +168,10 @@ - int PartitionFromPosition(int pos) const { - if (body->Length() <= 1) - return 0; -- if (pos >= (PositionFromPartition(body->Length()-1))) -- return body->Length() - 1 - 1; -+ if (pos >= (PositionFromPartition(Partitions()))) -+ return Partitions() - 1; - int lower = 0; -- int upper = body->Length()-1; -+ int upper = Partitions(); - do { - const int middle = (upper + lower + 1) / 2; // Round high - int posMiddle = body->ValueAt(middle); -diff -r 92c8f0f1b3e6 -r 3e3bfe29a819 src/PerLine.cxx ---- a/src/PerLine.cxx Fri Jan 26 11:12:10 2018 +1100 -+++ b/src/PerLine.cxx Fri Jan 26 18:04:38 2018 +1100 -@@ -135,7 +135,7 @@ - Sci::Line LineMarkers::MarkerNext(Sci::Line lineStart, int mask) const { - if (lineStart < 0) - lineStart = 0; -- const Sci::Line length = markers.Length(); -+ const Sci::Line length = static_cast(markers.Length()); - for (Sci::Line iLine = lineStart; iLine < length; iLine++) { - const MarkerHandleSet *onLine = markers[iLine].get(); - if (onLine && ((onLine->MarkValue() & mask) != 0)) -@@ -281,7 +281,7 @@ - } - - Sci::Line LineState::GetMaxLineState() const { -- return lineStates.Length(); -+ return static_cast(lineStates.Length()); - } - - static int NumberLines(const char *text) { -diff -r 92c8f0f1b3e6 -r 3e3bfe29a819 src/SplitVector.h ---- a/src/SplitVector.h Fri Jan 26 11:12:10 2018 +1100 -+++ b/src/SplitVector.h Fri Jan 26 18:04:38 2018 +1100 -@@ -16,15 +16,15 @@ - protected: - T *body; -- int size; -- int lengthBody; -- int part1Length; -- int gapLength; /// invariant: gapLength == size - lengthBody -- int growSize; -+ ptrdiff_t size; -+ ptrdiff_t lengthBody; -+ ptrdiff_t part1Length; -+ ptrdiff_t gapLength; /// invariant: gapLength == size - lengthBody -+ ptrdiff_t growSize; - - /// Move the gap to a particular position so that insertion and - /// deletion at that point will not require much copying and - /// hence be fast. -- void GapTo(int position) { -+ void GapTo(ptrdiff_t position) { - if (position != part1Length) { - if (position < part1Length) { - // Moving the gap towards start so moving elements towards end -@@ -45,11 +45,11 @@ - - /// Check that there is room in the buffer for an insertion, - /// reallocating if more space needed. -- void RoomFor(int insertionLength) { -+ void RoomFor(ptrdiff_t insertionLength) { - if (gapLength <= insertionLength) { - while (growSize < size / 6) - growSize *= 2; - ReAllocate(size + insertionLength + growSize); - } - } - -@@ -75,18 +75,18 @@ - ~SplitVector() { - } - -- int GetGrowSize() const { -+ ptrdiff_t GetGrowSize() const { - return growSize; - } -- -- void SetGrowSize(int growSize_) { -+ -+ void SetGrowSize(ptrdiff_t growSize_) { - growSize = growSize_; - } - - /// Reallocate the storage for the buffer to be newSize and - /// copy exisiting contents to the new buffer. - /// Must not be used to decrease the size of the buffer. -- void ReAllocate(int newSize) { -+ void ReAllocate(ptrdiff_t newSize) { - if (newSize < 0) - throw std::runtime_error("SplitVector::ReAllocate: negative size."); - -@@ -104,9 +104,9 @@ - - /// Retrieve the character at a particular position. - /// Retrieving positions outside the range of the buffer returns 0. - /// The assertions here are disabled since calling code can be - /// simpler if out of range access works and returns 0. -- T ValueAt(int position) const { -+ T ValueAt(ptrdiff_t position) const { - if (position < part1Length) { - //PLATFORM_ASSERT(position >= 0); - if (position < 0) { -@@ -124,7 +124,7 @@ - } - } - -- void SetValueAt(int position, T v) { -+ void SetValueAt(ptrdiff_t position, T v) { - if (position < part1Length) { - PLATFORM_ASSERT(position >= 0); - if (position < 0) { -@@ -144,7 +144,7 @@ - } - } - -- T &operator[](int position) const { -+ T &operator[](ptrdiff_t position) const { - PLATFORM_ASSERT(position >= 0 && position < lengthBody); - if (position < part1Length) { - return body[position]; -@@ -166,13 +166,13 @@ - } - - /// Retrieve the length of the buffer. -- int Length() const { -+ ptrdiff_t Length() const { - return lengthBody; - } - - /// Insert a single value into the buffer. - /// Inserting at positions outside the current range fails. -- void Insert(int position, T v) { -+ void Insert(ptrdiff_t position, T v) { - PLATFORM_ASSERT((position >= 0) && (position <= lengthBody)); - if ((position < 0) || (position > lengthBody)) { - return; -@@ -187,7 +187,7 @@ - - /// Insert a number of elements into the buffer setting their value. - /// Inserting at positions outside the current range fails. -- void InsertValue(int position, int insertLength, T v) { -+ void InsertValue(ptrdiff_t position, ptrdiff_t insertLength, T v) { - PLATFORM_ASSERT((position >= 0) && (position <= lengthBody)); - if (insertLength > 0) { - if ((position < 0) || (position > lengthBody)) { -@@ -225,14 +225,14 @@ - - /// Ensure at least length elements allocated, - /// appending zero valued elements if needed. -- void EnsureLength(int wantedLength) { -+ void EnsureLength(ptrdiff_t wantedLength) { - if (Length() < wantedLength) { - InsertValue(Length(), wantedLength - Length(), 0); - } - } - - /// Insert text into the buffer from an array. -- void InsertFromArray(int positionToInsert, const T s[], int positionFrom, int insertLength) { -+ void InsertFromArray(ptrdiff_t positionToInsert, const T s[], ptrdiff_t positionFrom, ptrdiff_t insertLength) { - PLATFORM_ASSERT((positionToInsert >= 0) && (positionToInsert <= lengthBody)); - if (insertLength > 0) { - if ((positionToInsert < 0) || (positionToInsert > lengthBody)) { -@@ -248,7 +248,7 @@ - } - - /// Delete one element from the buffer. -- void Delete(int position) { -+ void Delete(ptrdiff_t position) { - PLATFORM_ASSERT((position >= 0) && (position < lengthBody)); - if ((position < 0) || (position >= lengthBody)) { - return; -@@ -258,7 +258,7 @@ - - /// Delete a range from the buffer. - /// Deleting positions outside the current range fails. -- void DeleteRange(int position, int deleteLength) { -+ void DeleteRange(ptrdiff_t position, ptrdiff_t deleteLength) { - PLATFORM_ASSERT((position >= 0) && (position + deleteLength <= lengthBody)); - if ((position < 0) || ((position + deleteLength) > lengthBody)) { - return; -@@ -277,17 +277,17 @@ - // Retrieve a range of elements into an array -- void GetRange(T *buffer, int position, int retrieveLength) const { -+ void GetRange(T *buffer, ptrdiff_t position, ptrdiff_t retrieveLength) const { - // Split into up to 2 ranges, before and after the split then use memcpy on each. -- int range1Length = 0; -+ ptrdiff_t range1Length = 0; - if (position < part1Length) { -- const int part1AfterPosition = part1Length - position; -+ const ptrdiff_t part1AfterPosition = part1Length - position; - range1Length = retrieveLength; - if (range1Length > part1AfterPosition) - range1Length = part1AfterPosition; - } - std::copy(body + position, body + position + range1Length, buffer); - buffer += range1Length; - position = position + range1Length + gapLength; -- int range2Length = retrieveLength - range1Length; -+ ptrdiff_t range2Length = retrieveLength - range1Length; - std::copy(body + position, body + position + range2Length, buffer); - } - -@@ -308,7 +308,7 @@ - return body; - } - -- T *RangePointer(int position, int rangeLength) { -+ T *RangePointer(ptrdiff_t position, ptrdiff_t rangeLength) { - if (position < part1Length) { - if ((position + rangeLength) > part1Length) { - // Range overlaps gap, so move gap to start of range. -@@ -323,7 +323,7 @@ - } - } - -- int GapPosition() const { -+ ptrdiff_t GapPosition() const { - return part1Length; - } - }; diff --git a/src/scintilla_backports/6444_1bd57324aa36.patch b/src/scintilla_backports/6444_1bd57324aa36.patch deleted file mode 100644 index 93552ba4..00000000 --- a/src/scintilla_backports/6444_1bd57324aa36.patch +++ /dev/null @@ -1,279 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1517436441 -39600 -# Node ID 1bd57324aa36e3fce1ed8a2371001b062322884b -# Parent ab4efcbfdae68d1ec053db212edb1440326a7f1c -Templatize Partitioning so it can hold different types. - -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/CellBuffer.h ---- a/src/CellBuffer.h Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/CellBuffer.h Thu Feb 01 09:07:21 2018 +1100 -@@ -24,7 +24,7 @@ - */ - class LineVector { - -- Partitioning starts; -+ Partitioning starts; - PerLine *perLine; - - public: -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/ContractionState.cxx ---- a/src/ContractionState.cxx Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/ContractionState.cxx Thu Feb 01 09:07:21 2018 +1100 -@@ -39,7 +39,7 @@ - expanded = new RunStyles(); - heights = new RunStyles(); - foldDisplayTexts = new SparseVector(); -- displayLines = new Partitioning(4); -+ displayLines = new Partitioning(4); - InsertLines(0, linesInDocument); - } - } -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/ContractionState.h ---- a/src/ContractionState.h Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/ContractionState.h Thu Feb 01 09:07:21 2018 +1100 -@@ -21,7 +21,7 @@ - RunStyles *expanded; - RunStyles *heights; - SparseVector *foldDisplayTexts; -- Partitioning *displayLines; -+ Partitioning *displayLines; - Sci::Line linesInDocument; - - void EnsureData(); -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/Partitioning.h ---- a/src/Partitioning.h Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/Partitioning.h Thu Feb 01 09:07:21 2018 +1100 -@@ -14,29 +14,30 @@ - /// in a range. - /// Used by the Partitioning class. - --class SplitVectorWithRangeAdd : public SplitVector { -+template -+class SplitVectorWithRangeAdd : public SplitVector { - public: - explicit SplitVectorWithRangeAdd(ptrdiff_t growSize_) { -- SetGrowSize(growSize_); -- ReAllocate(growSize_); -+ this->SetGrowSize(growSize_); -+ this->ReAllocate(growSize_); - } - ~SplitVectorWithRangeAdd() { - } -- void RangeAddDelta(ptrdiff_t start, ptrdiff_t end, int delta) { -+ void RangeAddDelta(ptrdiff_t start, ptrdiff_t end, T delta) { - // end is 1 past end, so end-start is number of elements to change - ptrdiff_t i = 0; - const ptrdiff_t rangeLength = end - start; - ptrdiff_t range1Length = rangeLength; -- const ptrdiff_t part1Left = part1Length - start; -+ const ptrdiff_t part1Left = this->part1Length - start; - if (range1Length > part1Left) - range1Length = part1Left; - while (i < range1Length) { -- body[start++] += delta; -+ this->body[start++] += delta; - i++; - } -- start += gapLength; -+ start += this->gapLength; - while (i < rangeLength) { -- body[start++] += delta; -+ this->body[start++] += delta; - i++; - } - } -@@ -52,16 +53,17 @@ - /// When needed, positions after the interval are considered part of the last partition - /// but the end of the last partition can be found with PositionFromPartition(last+1). - -+template - class Partitioning { - private: - // To avoid calculating all the partition positions whenever any text is inserted - // there may be a step somewhere in the list. -- int stepPartition; -- int stepLength; -- SplitVectorWithRangeAdd *body; -+ T stepPartition; -+ T stepLength; -+ SplitVectorWithRangeAdd *body; - - // Move step forward -- void ApplyStep(int partitionUpTo) { -+ void ApplyStep(T partitionUpTo) { - if (stepLength != 0) { - body->RangeAddDelta(stepPartition+1, partitionUpTo + 1, stepLength); - } -@@ -73,7 +75,7 @@ - } - - // Move step backward -- void BackStep(int partitionDownTo) { -+ void BackStep(T partitionDownTo) { - if (stepLength != 0) { - body->RangeAddDelta(partitionDownTo+1, stepPartition+1, -stepLength); - } -@@ -81,7 +83,7 @@ - } - - void Allocate(ptrdiff_t growSize) { -- body = new SplitVectorWithRangeAdd(growSize); -+ body = new SplitVectorWithRangeAdd(growSize); - stepPartition = 0; - stepLength = 0; - body->Insert(0, 0); // This value stays 0 for ever -@@ -100,11 +102,11 @@ - ~Partitioning() { - } - -- int Partitions() const { -- return static_cast(body->Length()-1); -+ T Partitions() const { -+ return static_cast(body->Length())-1; - } - -- void InsertPartition(int partition, int pos) { -+ void InsertPartition(T partition, T pos) { - if (stepPartition < partition) { - ApplyStep(partition); - } -@@ -112,7 +114,7 @@ - stepPartition++; - } - -- void SetPartitionStartPosition(int partition, int pos) { -+ void SetPartitionStartPosition(T partition, T pos) { - ApplyStep(partition+1); - if ((partition < 0) || (partition > body->Length())) { - return; -@@ -120,7 +122,7 @@ - body->SetValueAt(partition, pos); - } - -- void InsertText(int partitionInsert, int delta) { -+ void InsertText(T partitionInsert, T delta) { - // Point all the partitions after the insertion point further along in the buffer - if (stepLength != 0) { - if (partitionInsert >= stepPartition) { -@@ -142,7 +144,7 @@ - } - } - -- void RemovePartition(int partition) { -+ void RemovePartition(T partition) { - if (partition > stepPartition) { - ApplyStep(partition); - stepPartition--; -@@ -152,29 +154,29 @@ - body->Delete(partition); - } - -- int PositionFromPartition(int partition) const { -+ T PositionFromPartition(T partition) const { - PLATFORM_ASSERT(partition >= 0); - PLATFORM_ASSERT(partition < body->Length()); - if ((partition < 0) || (partition >= body->Length())) { - return 0; - } -- int pos = body->ValueAt(partition); -+ T pos = body->ValueAt(partition); - if (partition > stepPartition) - pos += stepLength; - return pos; - } - - /// Return value in range [0 .. Partitions() - 1] even for arguments outside interval -- int PartitionFromPosition(int pos) const { -+ T PartitionFromPosition(T pos) const { - if (body->Length() <= 1) - return 0; - if (pos >= (PositionFromPartition(Partitions()))) - return Partitions() - 1; -- int lower = 0; -- int upper = Partitions(); -+ T lower = 0; -+ T upper = Partitions(); - do { -- const int middle = (upper + lower + 1) / 2; // Round high -- int posMiddle = body->ValueAt(middle); -+ const T middle = (upper + lower + 1) / 2; // Round high -+ T posMiddle = body->ValueAt(middle); - if (middle > stepPartition) - posMiddle += stepLength; - if (pos < posMiddle) { -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/RunStyles.cxx ---- a/src/RunStyles.cxx Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/RunStyles.cxx Thu Feb 01 09:07:21 2018 +1100 -@@ -70,7 +70,7 @@ - } - - RunStyles::RunStyles() { -- starts = new Partitioning(8); -+ starts = new Partitioning(8); - styles = new SplitVector(); - styles->InsertValue(0, 2, 0); - } -@@ -204,7 +204,7 @@ - starts = NULL; - delete styles; - styles = NULL; -- starts = new Partitioning(8); -+ starts = new Partitioning(8); - styles = new SplitVector(); - styles->InsertValue(0, 2, 0); - } -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/RunStyles.h ---- a/src/RunStyles.h Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/RunStyles.h Thu Feb 01 09:07:21 2018 +1100 -@@ -14,7 +14,7 @@ - - class RunStyles { - private: -- Partitioning *starts; -+ Partitioning *starts; - SplitVector *styles; - int RunFromPosition(int position) const; - int SplitRun(int position); -diff -r ab4efcbfdae6 -r 1bd57324aa36 src/SparseVector.h ---- a/src/SparseVector.h Wed Jan 31 17:08:48 2018 +1100 -+++ b/src/SparseVector.h Thu Feb 01 09:07:21 2018 +1100 -@@ -15,7 +15,7 @@ - template - class SparseVector { - private: -- Partitioning *starts; -+ Partitioning *starts; - SplitVector *values; - // Private so SparseVector objects can not be copied - SparseVector(const SparseVector &); -@@ -26,7 +26,7 @@ - } - public: - SparseVector() { -- starts = new Partitioning(8); -+ starts = new Partitioning(8); - values = new SplitVector(); - values->InsertValue(0, 2, T()); - } -diff -r ab4efcbfdae6 -r 1bd57324aa36 test/unit/testPartitioning.cxx ---- a/test/unit/testPartitioning.cxx Wed Jan 31 17:08:48 2018 +1100 -+++ b/test/unit/testPartitioning.cxx Thu Feb 01 09:07:21 2018 +1100 -@@ -26,7 +26,7 @@ - - TEST_CASE("SplitVectorWithRangeAdd") { - -- SplitVectorWithRangeAdd svwra(growSize); -+ SplitVectorWithRangeAdd svwra(growSize); - - SECTION("IsEmptyInitially") { - REQUIRE(0 == svwra.Length()); -@@ -49,7 +49,7 @@ - - TEST_CASE("Partitioning") { - -- Partitioning part(growSize); -+ Partitioning part(growSize); - - SECTION("IsEmptyInitially") { - REQUIRE(1 == part.Partitions()); diff --git a/src/scintilla_backports/6445_89d992f380a1.patch b/src/scintilla_backports/6445_89d992f380a1.patch deleted file mode 100644 index b0b9acae..00000000 --- a/src/scintilla_backports/6445_89d992f380a1.patch +++ /dev/null @@ -1,418 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1517437334 -39600 -# Node ID 89d992f380a1ce28a3ba6934230388ffaf1ea611 -# Parent 1bd57324aa36e3fce1ed8a2371001b062322884b -Templatize RunStyles so it can be over ranges of different types and contain -different style types. -Currently only instantiated over . - -diff -r 1bd57324aa36 -r 89d992f380a1 src/ContractionState.cxx ---- a/src/ContractionState.cxx Thu Feb 01 09:07:21 2018 +1100 -+++ b/src/ContractionState.cxx Thu Feb 01 09:22:14 2018 +1100 -@@ -35,9 +35,9 @@ - - void ContractionState::EnsureData() { - if (OneToOne()) { -- visible = new RunStyles(); -- expanded = new RunStyles(); -- heights = new RunStyles(); -+ visible = new RunStyles(); -+ expanded = new RunStyles(); -+ heights = new RunStyles(); - foldDisplayTexts = new SparseVector(); - displayLines = new Partitioning(4); - InsertLines(0, linesInDocument); -diff -r 1bd57324aa36 -r 89d992f380a1 src/ContractionState.h ---- a/src/ContractionState.h Thu Feb 01 09:07:21 2018 +1100 -+++ b/src/ContractionState.h Thu Feb 01 09:22:14 2018 +1100 -@@ -17,9 +17,9 @@ - */ - class ContractionState { - // These contain 1 element for every document line. -- RunStyles *visible; -- RunStyles *expanded; -- RunStyles *heights; -+ RunStyles *visible; -+ RunStyles *expanded; -+ RunStyles *heights; - SparseVector *foldDisplayTexts; - Partitioning *displayLines; - Sci::Line linesInDocument; -diff -r 1bd57324aa36 -r 89d992f380a1 src/Decoration.h ---- a/src/Decoration.h Thu Feb 01 09:07:21 2018 +1100 -+++ b/src/Decoration.h Thu Feb 01 09:22:14 2018 +1100 -@@ -12,7 +12,7 @@ - class Decoration { - int indicator; - public: - Decoration *next; -- RunStyles rs; -+ RunStyles rs; - - explicit Decoration(int indicator_); -diff -r 1bd57324aa36 -r 89d992f380a1 src/RunStyles.cxx ---- a/src/RunStyles.cxx Thu Feb 01 09:07:21 2018 +1100 -+++ b/src/RunStyles.cxx Thu Feb 01 09:22:14 2018 +1100 -@@ -26,8 +26,9 @@ - using namespace Scintilla; - - // Find the first run at a position --int RunStyles::RunFromPosition(int position) const { -- int run = starts->PartitionFromPosition(position); -+template -+DISTANCE RunStyles::RunFromPosition(DISTANCE position) const { -+ DISTANCE run = starts->PartitionFromPosition(position); - // Go to first element with this position - while ((run > 0) && (position == starts->PositionFromPartition(run-1))) { - run--; -@@ -36,11 +37,12 @@ - } - - // If there is no run boundary at position, insert one continuing style. --int RunStyles::SplitRun(int position) { -- int run = RunFromPosition(position); -- const int posRun = starts->PositionFromPartition(run); -+template -+DISTANCE RunStyles::SplitRun(DISTANCE position) { -+ DISTANCE run = RunFromPosition(position); -+ const DISTANCE posRun = starts->PositionFromPartition(run); - if (posRun < position) { -- int runStyle = ValueAt(position); -+ STYLE runStyle = ValueAt(position); - run++; - starts->InsertPartition(run, position); - styles->InsertValue(run, 1, runStyle); -@@ -48,12 +50,14 @@ - return run; - } - --void RunStyles::RemoveRun(int run) { -+template -+void RunStyles::RemoveRun(DISTANCE run) { - starts->RemovePartition(run); - styles->DeleteRange(run, 1); - } - --void RunStyles::RemoveRunIfEmpty(int run) { -+template -+void RunStyles::RemoveRunIfEmpty(DISTANCE run) { - if ((run < starts->Partitions()) && (starts->Partitions() > 1)) { - if (starts->PositionFromPartition(run) == starts->PositionFromPartition(run+1)) { - RemoveRun(run); -@@ -61,7 +65,8 @@ - } - } - --void RunStyles::RemoveRunIfSameAsPrevious(int run) { -+template -+void RunStyles::RemoveRunIfSameAsPrevious(DISTANCE run) { - if ((run > 0) && (run < starts->Partitions())) { - if (styles->ValueAt(run-1) == styles->ValueAt(run)) { - RemoveRun(run); -@@ -69,34 +74,39 @@ - } - } - --RunStyles::RunStyles() { -- starts = new Partitioning(8); -- styles = new SplitVector(); -+template -+RunStyles::RunStyles() { -+ starts = new Partitioning(8); -+ styles = new SplitVector