Addition of PositionCache module which adds cacing of string

to position information and segments long pieces of text so they
can be handled more efficiently.

4 files changed, 33 insertions, 12 deletions

diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 71c7b342f..7a1aab337 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -43,6 +43,7 @@
 #include "Decoration.h"
 #include "CharClassify.h"
 #include "Document.h"
+#include "PositionCache.h"
 #include "Editor.h"
 #include "SString.h"
 #include "ScintillaBase.h"
diff --git a/gtk/deps.mak b/gtk/deps.mak
index f8fa285fd..8fe88e266 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -1,9 +1,7 @@
-PlatGTK.o: PlatGTK.cxx  \
-   ../include/Platform.h \
+PlatGTK.o: PlatGTK.cxx \
   ../include/Scintilla.h ../include/ScintillaWidget.h \
   ../src/UniConversion.h ../src/XPM.h Converter.h
-ScintillaGTK.o: ScintillaGTK.cxx  \
-   ../include/Platform.h \
+ScintillaGTK.o: ScintillaGTK.cxx \
   ../include/Scintilla.h ../include/ScintillaWidget.h \
   ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
   ../include/Accessor.h ../include/KeyWords.h ../src/ContractionState.h \
@@ -11,9 +9,10 @@ ScintillaGTK.o: ScintillaGTK.cxx  \
   ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
   ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/AutoComplete.h \
   ../src/ViewStyle.h ../src/RunStyles.h ../src/Decoration.h \
-  ../src/CharClassify.h ../src/Document.h ../src/Editor.h \
-  ../include/SString.h ../src/ScintillaBase.h ../src/UniConversion.h \
-  scintilla-marshal.h ../src/ExternalLexer.h Converter.h
+  ../src/CharClassify.h ../src/Document.h ../src/PositionCache.h \
+  ../src/Editor.h ../include/SString.h ../src/ScintillaBase.h \
+  ../src/UniConversion.h scintilla-marshal.h ../src/ExternalLexer.h \
+  Converter.h
 AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
 CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
@@ -43,7 +42,8 @@ Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
   ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
   ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Decoration.h ../src/Document.h ../src/Editor.h
+  ../src/Decoration.h ../src/Document.h ../src/PositionCache.h \
+  ../src/Editor.h
 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
   ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
   ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \
@@ -137,6 +137,9 @@ LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
   ../include/SciLexer.h
+LexGAP.o: ../src/LexGAP.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
@@ -260,6 +263,13 @@ LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
   ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
+PositionCache.o: ../src/PositionCache.cxx ../include/Platform.h \
+  ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \
+  ../src/SplitVector.h ../src/Partitioning.h ../src/CellBuffer.h \
+  ../src/KeyMap.h ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h \
+  ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
+  ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \
+  ../src/PositionCache.h
 PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h
 RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h
@@ -274,7 +284,8 @@ ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \
   ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
   ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
   ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \
-  ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h
+  ../src/Document.h ../src/PositionCache.h ../src/Editor.h \
+  ../src/ScintillaBase.h
 StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
   ../src/StyleContext.h
diff --git a/gtk/makefile b/gtk/makefile
index eb7dec885..52a88f4e7 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -80,12 +80,12 @@ clean:
 	rm -f *.o $(COMPLIB)
 
 deps:
-	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
+	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
 
 $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
 	CharClassify.o Decoration.o Document.o CallTip.o \
 	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
-	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
+	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 	RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
 	$(MARSHALLER) $(LEXOBJS)
 	$(AR) rc $@ $^
diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak
index deb3df2ea..1f2dcc798 100644
--- a/gtk/scintilla.mak
+++ b/gtk/scintilla.mak
@@ -128,6 +128,7 @@ SOBJS=\
 	$(DIR_O)\KeyMap.obj \
 	$(DIR_O)\LineMarker.obj \
 	$(DIR_O)\PlatGTK.obj \
+	$(DIR_O)\PositionCache.obj \
 	$(MARSHALLER) \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
@@ -222,6 +223,7 @@ LOBJS=\
 	$(DIR_O)\KeyWords.obj \
 	$(DIR_O)\LineMarker.obj \
 	$(DIR_O)\PlatGTK.obj \
+	$(DIR_O)\PositionCache.obj \
 	$(MARSHALLER) \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
@@ -324,7 +326,7 @@ $(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintill
   ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
   ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
   ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
-  ../src/Document.h ../src/Editor.h
+  ../src/Document.h ../src/Editor.h ../src/PositionCache.h
 
 $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \
   ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \
@@ -478,6 +480,13 @@ $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \
 $(DIR_O)\PlatGTK.obj: PlatGTK.cxx ../include/Platform.h \
   ../src/UniConversion.h ../src/XPM.h
 
+$(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
+  ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \
+  ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \
+  ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
+  ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \
+  ../src/Decoration.h ../src/Document.h ../src/Editor.h ../src/PositionCache.h
+
 $(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
   ../include/SString.h