Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes in JavaSyntaxHighlighter. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 23 Apr 2013 00:47:30 +0100
branchdevelopment
changeset 2546 46baf5ad2310
parent 2545 f79da9903d12
child 2547 ead869f48c58
Fixes in JavaSyntaxHighlighter.
tools/JavaLiteralNode.st file | annotate | diff | comparison | revisions
tools/JavaParseNode.st file | annotate | diff | comparison | revisions
tools/JavaParseNodeBuilder.st file | annotate | diff | comparison | revisions
tools/JavaSyntaxHighlighter.st file | annotate | diff | comparison | revisions
tools/Make.proto file | annotate | diff | comparison | revisions
tools/Make.spec file | annotate | diff | comparison | revisions
tools/abbrev.stc file | annotate | diff | comparison | revisions
tools/bc.mak file | annotate | diff | comparison | revisions
tools/libInit.cc file | annotate | diff | comparison | revisions
tools/stx_libjava_tools.st file | annotate | diff | comparison | revisions
tools/tools.rc file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/JavaLiteralNode.st	Tue Apr 23 00:47:30 2013 +0100
@@ -0,0 +1,27 @@
+"{ Package: 'stx:libjava/tools' }"
+
+JavaParseNode subclass:#JavaLiteralNode
+	instanceVariableNames:'value'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Languages-Java-Parser-AST'
+!
+
+
+!JavaLiteralNode methodsFor:'accessing'!
+
+value
+    ^ value
+!
+
+value:something
+    value := something.
+! !
+
+!JavaLiteralNode class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/tools/JavaParseNode.st	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/JavaParseNode.st	Tue Apr 23 00:47:30 2013 +0100
@@ -21,7 +21,7 @@
 "{ Package: 'stx:libjava/tools' }"
 
 ParseNode subclass:#JavaParseNode
-	instanceVariableNames:''
+	instanceVariableNames:'line'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Parser-AST'
@@ -62,6 +62,28 @@
     "Created: / 08-03-2012 / 21:44:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaParseNode methodsFor:'accessing'!
+
+line
+    ^ line
+!
+
+line:something
+    line := something.
+!
+
+stopPosition
+    ^self endPosition
+
+    "Created: / 22-04-2013 / 18:20:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+stopPosition: anInteger
+    ^self endPosition: anInteger
+
+    "Created: / 22-04-2013 / 18:20:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !JavaParseNode methodsFor:'queries'!
 
 isMethodDeclaration
--- a/tools/JavaParseNodeBuilder.st	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/JavaParseNodeBuilder.st	Tue Apr 23 00:47:30 2013 +0100
@@ -25,8 +25,43 @@
 "
 ! !
 
+!JavaParseNodeBuilder methodsFor:'accessing'!
+
+start
+    ^ start
+!
+
+start:something
+    start := something.
+!
+
+start: startPos stop: stopPos
+    start := startPos.
+    stop := stopPos.
+
+    "Created: / 22-04-2013 / 18:15:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+stop
+    ^ stop
+!
+
+stop:something
+    stop := something.
+! !
+
 !JavaParseNodeBuilder methodsFor:'building'!
 
+new: parseNodeClass
+    ^parseNodeClass new
+        startPosition: start;
+        stopPosition: stop;
+        line: line;
+        yourself
+
+    "Created: / 22-04-2013 / 18:19:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 newClassDeclaration_modifiers: modifiers
                     name: name
                     typeParameters: typeParameters
@@ -61,6 +96,14 @@
         yourself
 
     "Created: / 03-04-2013 / 23:21:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+newStringLiteral:aString
+    ^(self new: JavaLiteralNode)
+        value: aString;
+        yourself
+
+    "Created: / 22-04-2013 / 18:21:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaParseNodeBuilder class methodsFor:'documentation'!
--- a/tools/JavaSyntaxHighlighter.st	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/JavaSyntaxHighlighter.st	Tue Apr 23 00:47:30 2013 +0100
@@ -553,12 +553,12 @@
     "Created: / 09-03-2012 / 17:11:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-newStringLiteral: string
+newStringLiteral: text
 
     highlighter markStringFrom:start to: stop.
-    ^super newStringLiteral: string
+    ^super newStringLiteral: text
 
-    "Created: / 17-03-2012 / 17:32:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 22-04-2013 / 18:22:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaSyntaxHighlighter::Parser methodsFor:'accessing'!
@@ -627,12 +627,13 @@
 
     ^super stringLiteral ==> [:stringToken|
         builder 
-            start: stringToken startPosition 
+            start: stringToken startPosition; 
             stop: stringToken endPosition;
             newStringLiteral: stringToken value
     ]
 
     "Created: / 17-03-2012 / 17:31:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-04-2013 / 18:13:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaSyntaxHighlighter::Parser methodsFor:'utility'!
--- a/tools/Make.proto	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/Make.proto	Tue Apr 23 00:47:30 2013 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
 
 
 # if you need any additional defines for embedded C code,
@@ -133,22 +133,19 @@
 
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
@@ -186,6 +183,7 @@
 $(OUTDIR)stx_libjava_tools.$(O) stx_libjava_tools.$(H): stx_libjava_tools.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaDeclarationWithJavadodNode.$(O) JavaDeclarationWithJavadodNode.$(H): JavaDeclarationWithJavadodNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaImportDeclarationNode.$(O) JavaImportDeclarationNode.$(H): JavaImportDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaLiteralNode.$(O) JavaLiteralNode.$(H): JavaLiteralNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaPackageDeclarationNode.$(O) JavaPackageDeclarationNode.$(H): JavaPackageDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaParserII.$(O) JavaParserII.$(H): JavaParserII.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaScanner.$(O) JavaScanner.$(H): JavaScanner.st $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -198,7 +196,7 @@
 $(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaEnumDeclarationNode.$(O) JavaEnumDeclarationNode.$(H): JavaEnumDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaInterfaceDeclarationNode.$(O) JavaInterfaceDeclarationNode.$(H): JavaInterfaceDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
--- a/tools/Make.spec	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/Make.spec	Tue Apr 23 00:47:30 2013 +0100
@@ -68,6 +68,7 @@
 	stx_libjava_tools \
 	JavaDeclarationWithJavadodNode \
 	JavaImportDeclarationNode \
+	JavaLiteralNode \
 	JavaPackageDeclarationNode \
 	JavaParserII \
 	JavaScanner \
@@ -104,6 +105,7 @@
     $(OUTDIR_SLASH)stx_libjava_tools.$(O) \
     $(OUTDIR_SLASH)JavaDeclarationWithJavadodNode.$(O) \
     $(OUTDIR_SLASH)JavaImportDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaLiteralNode.$(O) \
     $(OUTDIR_SLASH)JavaPackageDeclarationNode.$(O) \
     $(OUTDIR_SLASH)JavaParserII.$(O) \
     $(OUTDIR_SLASH)JavaScanner.$(O) \
--- a/tools/abbrev.stc	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/abbrev.stc	Tue Apr 23 00:47:30 2013 +0100
@@ -17,20 +17,21 @@
 JavaSetInspectorView JavaSetInspectorView stx:libjava/tools 'Languages-Java-Tools-Inspectors' 2
 JavaSettingsApplication JavaSettingsApplication stx:libjava/tools 'Languages-Java-Tools' 1
 JavaSourcePartition JavaSourcePartition stx:libjava/tools 'Languages-Java-Parser-Utils' 0
+JavaSourcePartitioner JavaSourcePartitioner stx:libjava/tools 'Languages-Java-Parser-Utils' 0
 JavaSourcePartitionerTests JavaSourcePartitionerTests stx:libjava/tools 'Languages-Java-Tests-Parser' 1
 JavaSourceReference JavaSourceReference stx:libjava/tools 'Languages-Java-Parser-Utils' 0
 JavaSyntaxHighlighter_Eclipse JavaSyntaxHighlighter_Eclipse stx:libjava/tools 'Languages-Java-Tools-Eclipse' 0
+JavaSyntaxHighlighter_Old JavaSyntaxHighlighter_Old stx:libjava/tools 'Languages-Java-Tools' 0
 stx_libjava_tools stx_libjava_tools stx:libjava/tools '* Projects & Packages *' 3
 JavaDeclarationWithJavadodNode JavaDeclarationWithJavadodNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaImportDeclarationNode JavaImportDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
+JavaLiteralNode JavaLiteralNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaPackageDeclarationNode JavaPackageDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaParserII JavaParserII stx:libjava/tools 'Languages-Java-Parser' 0
 JavaScanner JavaScanner stx:libjava/tools 'Languages-Java-Parser' 3
 JavaSourceFile JavaSourceFile stx:libjava/tools 'Languages-Java-Parser-AST' 0
-JavaSyntaxHighlighter_Old JavaSyntaxHighlighter_Old stx:libjava/tools 'Languages-Java-Tools' 0
 JavaMethodLikeDeclarationNode JavaMethodLikeDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaParser JavaParser stx:libjava/tools 'Languages-Java-Parser' 0
-JavaSourcePartitioner JavaSourcePartitioner stx:libjava/tools 'Languages-Java-Parser-Utils' 0
 JavaTypeDeclarationNode JavaTypeDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaAnnotationDeclarationNode JavaAnnotationDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
 JavaClassDeclarationNode JavaClassDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
--- a/tools/bc.mak	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/bc.mak	Tue Apr 23 00:47:30 2013 +0100
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -50,22 +50,19 @@
 
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
@@ -110,6 +107,7 @@
 $(OUTDIR)stx_libjava_tools.$(O) stx_libjava_tools.$(H): stx_libjava_tools.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaDeclarationWithJavadodNode.$(O) JavaDeclarationWithJavadodNode.$(H): JavaDeclarationWithJavadodNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaImportDeclarationNode.$(O) JavaImportDeclarationNode.$(H): JavaImportDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaLiteralNode.$(O) JavaLiteralNode.$(H): JavaLiteralNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaPackageDeclarationNode.$(O) JavaPackageDeclarationNode.$(H): JavaPackageDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaParserII.$(O) JavaParserII.$(H): JavaParserII.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaScanner.$(O) JavaScanner.$(H): JavaScanner.st $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -122,7 +120,7 @@
 $(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaEnumDeclarationNode.$(O) JavaEnumDeclarationNode.$(H): JavaEnumDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaInterfaceDeclarationNode.$(O) JavaInterfaceDeclarationNode.$(H): JavaInterfaceDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationWithJavadodNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libjava\JavaObject.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
--- a/tools/libInit.cc	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/libInit.cc	Tue Apr 23 00:47:30 2013 +0100
@@ -45,6 +45,7 @@
 _stx_137libjava_137tools_Init(pass,__pRT__,snd);
 _JavaDeclarationWithJavadodNode_Init(pass,__pRT__,snd);
 _JavaImportDeclarationNode_Init(pass,__pRT__,snd);
+_JavaLiteralNode_Init(pass,__pRT__,snd);
 _JavaPackageDeclarationNode_Init(pass,__pRT__,snd);
 _JavaParserII_Init(pass,__pRT__,snd);
 _JavaScanner_Init(pass,__pRT__,snd);
--- a/tools/stx_libjava_tools.st	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/stx_libjava_tools.st	Tue Apr 23 00:47:30 2013 +0100
@@ -34,14 +34,13 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPAbstractParseTest - superclass of JavaParserIITests "
-        #'stx:goodies/sunit'    "TestCase - superclass of JavaParserIITests "
-        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libjava_tools "
-        #'stx:libcomp'    "ParseNode - superclass of JavaInterfaceDeclarationNode "
-        #'stx:libjava'    "PPJavaNode - superclass of JavaMethodDeclarationNode "
-        #'stx:libtool'    "DictionaryInspectorView - superclass of JavaMapInspectorView "
-        #'stx:libview'    "DisplaySurface - superclass of JavaListInspectorView "
-        #'stx:libview2'    "Model - superclass of JavaSettingsApplication "
+        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of JavaParserII "
+        #'stx:libbasic'    "Autoload - superclass of JavaParserITests "
+        #'stx:libcomp'    "ParseNode - superclass of JavaConstructorDeclarationNode "
+        #'stx:libjava'    "JavaObject - extended "
+        #'stx:libtool'    "InspectorView - superclass of JavaListInspectorView "
+        #'stx:libview'    "SimpleView - superclass of JavaListInspectorView "
+        #'stx:libview2'    "SimpleDialog - superclass of JavaCodeLibraryEditor "
         #'stx:libwidg2'    "HierarchicalItem - superclass of JavaCodeBundleEditor::Item "
     )
 !
@@ -168,20 +167,21 @@
         JavaSetInspectorView
         JavaSettingsApplication
         JavaSourcePartition
+        (JavaSourcePartitioner autoload)
         (JavaSourcePartitionerTests autoload)
         JavaSourceReference
         (#'JavaSyntaxHighlighter_Eclipse' autoload)
+        (#'JavaSyntaxHighlighter_Old' autoload)
         #'stx_libjava_tools'
         JavaDeclarationWithJavadodNode
         JavaImportDeclarationNode
+        JavaLiteralNode
         JavaPackageDeclarationNode
         JavaParserII
         JavaScanner
         JavaSourceFile
-        (#'JavaSyntaxHighlighter_Old' autoload)
         JavaMethodLikeDeclarationNode
         JavaParser
-        (JavaSourcePartitioner autoload)
         JavaTypeDeclarationNode
         JavaAnnotationDeclarationNode
         JavaClassDeclarationNode
--- a/tools/tools.rc	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/tools.rc	Tue Apr 23 00:47:30 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 18 Apr 2013 15:54:28 GMT\0"
+      VALUE "ProductDate", "Mon, 22 Apr 2013 23:44:29 GMT\0"
     END
 
   END
hg/stx-libjava