--- a/examples/java/.classpath Sat Aug 24 17:29:19 2013 +0100
+++ b/examples/java/.classpath Sat Aug 24 17:30:57 2013 +0100
@@ -3,7 +3,9 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/stx.libjava"/>
-S <classpathentry combineaccessrules="false" kind="src" path="/stx.libjava.experiments"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/stx.libjava.experiments"/>
<classpathentry combineaccessrules="false" kind="src" path="/stx.libjava.tools"/>
+ <classpathentry kind="lib" path="libs/smackx.jar" sourcepath="libs-src/smackx-src.jar"/>
+ <classpathentry kind="lib" path="libs/smack.jar" sourcepath="libs-src/smackx-src.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
--- a/examples/java/build.xml Sat Aug 24 17:29:19 2013 +0100
+++ b/examples/java/build.xml Sat Aug 24 17:30:57 2013 +0100
@@ -3,8 +3,7 @@
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
- as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="stx.libjava.examples">
+ as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx.libjava.examples">
<property environment="env"/>
<property name="ECLIPSE_HOME" value="../../../../../../../../../../../../../opt/eclipse-4.2"/>
<property name="stx.libjava.location" value="../../java"/>
@@ -16,7 +15,7 @@
<property name="source" value="1.6"/>
<import file="build.ivy.xml"/>
<path id="stx.libjava.classpath">
- <pathelement location="${stx.libjava.location}/libjava-support/bin"/>
+ <pathelement location="${stx.libjava.location}/bin"/>
<pathelement location="${stx.libjava.location}/libs-src/groovy-all-1.8.2-sources.jar"/>
<pathelement location="${stx.libjava.location}/libs-src/junit-4.8.2-sources.jar"/>
<pathelement location="${stx.libjava.location}/libs/groovy-all-1.8.2.jar"/>
@@ -68,6 +67,8 @@
<path refid="stx.libjava.classpath"/>
<path refid="stx.libjava.experiments.classpath"/>
<path refid="stx.libjava.tools.classpath"/>
+ <pathelement location="libs/smackx.jar"/>
+ <pathelement location="libs/smack.jar"/>
</path>
<target name="init">
<mkdir dir="bin"/>
@@ -140,4 +141,9 @@
<classpath refid="stx.libjava.examples.classpath"/>
</java>
</target>
+ <target name="HelloWorld (1)">
+ <java classname="stx.libjava.examples.jabber.HelloWorld" failonerror="true" fork="yes">
+ <classpath refid="stx.libjava.examples.classpath"/>
+ </java>
+ </target>
</project>
--- a/experiments/java/build.xml Sat Aug 24 17:29:19 2013 +0100
+++ b/experiments/java/build.xml Sat Aug 24 17:30:57 2013 +0100
@@ -3,14 +3,11 @@
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
- as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="stx.libjava.experiments">
+ as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx.libjava.experiments">
<property environment="env"/>
- <property name="stx.libjava.benchmarks.location" value="../../benchmarks/java"/>
<property name="stx.libjava.examples.location" value="../../examples/java"/>
<property name="stx.libjava.examples.tomcat 6.x.location" value="../../examples/tomcat6/apache-tomcat-6.0.35-src"/>
<property name="ECLIPSE_HOME" value="../../../../../../../../../../../../../opt/eclipse-4.2"/>
- <property name="junit.output.dir" value="junit"/>
<property name="stx.libjava.location" value="../../java"/>
<property name="stx.libjava.libs.location" value="../../libs/java"/>
<property name="stx.libjava.tools.location" value="../../tools/java"/>
@@ -19,7 +16,7 @@
<property name="source" value="1.6"/>
<import file="build.ivy.xml"/>
<path id="stx.libjava.classpath">
- <pathelement location="${stx.libjava.location}/libjava-support/bin"/>
+ <pathelement location="${stx.libjava.location}/bin"/>
<pathelement location="${stx.libjava.location}/libs-src/groovy-all-1.8.2-sources.jar"/>
<pathelement location="${stx.libjava.location}/libs-src/junit-4.8.2-sources.jar"/>
<pathelement location="${stx.libjava.location}/libs/groovy-all-1.8.2.jar"/>
@@ -108,12 +105,6 @@
</javac>
</target>
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
- <ant antfile="build.xml" dir="${stx.libjava.benchmarks.location}" inheritAll="false" target="clean"/>
- <ant antfile="build.xml" dir="${stx.libjava.benchmarks.location}" inheritAll="false" target="build">
- <propertyset>
- <propertyref name="build.compiler"/>
- </propertyset>
- </ant>
<ant antfile="build.xml" dir="${stx.libjava.examples.location}" inheritAll="false" target="clean"/>
<ant antfile="build.xml" dir="${stx.libjava.examples.location}" inheritAll="false" target="build">
<propertyset>
@@ -140,36 +131,4 @@
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
<antcall target="build"/>
</target>
- <target name="CompilerTests.test_04">
- <mkdir dir="${junit.output.dir}"/>
- <junit fork="yes" printsummary="withOutAndErr">
- <formatter type="xml"/>
- <test name="stx.libjava.tools.compiler.ecj.tests.CompilerTests" todir="${junit.output.dir}"/>
- <classpath refid="stx.libjava.experiments.classpath"/>
- </junit>
- </target>
- <target name="CompilerTests.test_05">
- <mkdir dir="${junit.output.dir}"/>
- <junit fork="yes" printsummary="withOutAndErr">
- <formatter type="xml"/>
- <test name="stx.libjava.tools.compiler.ecj.tests.CompilerTests" todir="${junit.output.dir}"/>
- <classpath refid="stx.libjava.experiments.classpath"/>
- </junit>
- </target>
- <target name="CompilerTests">
- <mkdir dir="${junit.output.dir}"/>
- <junit fork="yes" printsummary="withOutAndErr">
- <formatter type="xml"/>
- <test name="stx.libjava.tools.compiler.ecj.tests.CompilerTests" todir="${junit.output.dir}"/>
- <classpath refid="stx.libjava.experiments.classpath"/>
- </junit>
- </target>
- <target name="junitreport">
- <junitreport todir="${junit.output.dir}">
- <fileset dir="${junit.output.dir}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${junit.output.dir}"/>
- </junitreport>
- </target>
</project>
--- a/java/.classpath Sat Aug 24 17:29:19 2013 +0100
+++ b/java/.classpath Sat Aug 24 17:30:57 2013 +0100
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="libs-src/groovy-all-1.8.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="libs-src/junit-4.8.2-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/groovy-all-1.8.2.jar" sourcepath="libs-src/junit-4.8.2-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/groovy-all-1.8.2.jar" sourcepath="libs-src/groovy-all-1.8.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="libs/junit4-4.8.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
--- a/java/build.xml Sat Aug 24 17:29:19 2013 +0100
+++ b/java/build.xml Sat Aug 24 17:30:57 2013 +0100
@@ -3,8 +3,7 @@
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
- as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="stx.libjava">
+ as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx.libjava">
<property environment="env"/>
<property name="stx.libjava.benchmarks.location" value="../benchmarks/java"/>
<property name="stx.libjava.examples.location" value="../examples/java"/>
--- a/libs/java/.classpath Sat Aug 24 17:29:19 2013 +0100
+++ b/libs/java/.classpath Sat Aug 24 17:30:57 2013 +0100
@@ -8,7 +8,6 @@
<classpathentry exported="true" kind="lib" path="libs/poi-3.8.jar"/>
<classpathentry exported="true" kind="lib" path="libs/saxon-9.1.0.8.jar" sourcepath="libs-src/saxon-9.1.0.8-sources.jar"/>
<classpathentry exported="true" kind="lib" path="libs/asm3-all-3.3.2.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/junit-3.8.2.jar" sourcepath="libs-src/junit-3.8.2-sources.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="libs/bcmail-jdk14-1.38.jar"/>
<classpathentry exported="true" kind="lib" path="libs/bcmail-jdk14-138.jar"/>
--- a/libs/java/build.xml Sat Aug 24 17:29:19 2013 +0100
+++ b/libs/java/build.xml Sat Aug 24 17:30:57 2013 +0100
@@ -3,8 +3,7 @@
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
- as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="stx.libjava.libs">
+ as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx.libjava.libs">
<property environment="env"/>
<property name="stx.libjava.benchmarks.location" value="../../benchmarks/java"/>
<property name="stx.libjava.examples.tomcat 6.x.location" value="../../examples/tomcat6/apache-tomcat-6.0.35-src"/>
--- a/tools/JavaMethodLikeDeclarationNode.st Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/JavaMethodLikeDeclarationNode.st Sat Aug 24 17:30:57 2013 +0100
@@ -1,13 +1,55 @@
"{ Package: 'stx:libjava/tools' }"
JavaDeclarationNode subclass:#JavaMethodLikeDeclarationNode
- instanceVariableNames:''
+ instanceVariableNames:'modifiers parameters exceptions typeParameters body'
classVariableNames:''
poolDictionaries:''
category:'Languages-Java-Parser-AST'
!
+!JavaMethodLikeDeclarationNode methodsFor:'accessing'!
+
+body
+ ^ body
+!
+
+body:aJavaBlockNode
+ body := aJavaBlockNode.
+!
+
+exceptions
+ ^ exceptions
+!
+
+exceptions:aCollection
+ exceptions := aCollection.
+!
+
+modifiers
+ ^ modifiers
+!
+
+modifiers:aCollection
+ modifiers := aCollection.
+!
+
+parameters
+ ^ parameters
+!
+
+parameters:aCollection
+ parameters := aCollection.
+!
+
+typeParameters
+ ^ typeParameters
+!
+
+typeParameters:aCollection
+ typeParameters := aCollection.
+! !
+
!JavaMethodLikeDeclarationNode class methodsFor:'documentation'!
version_HG
--- a/tools/JavaParseNodeBuilder.st Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/JavaParseNodeBuilder.st Sat Aug 24 17:30:57 2013 +0100
@@ -68,7 +68,8 @@
superclass: superclass
interfaces: interfaces
members: members
- JavaClassDeclarationNode new
+
+ ^ JavaClassDeclarationNode new
modifiers: modifiers;
name: name;
typeParameters: typeParameters;
@@ -78,6 +79,45 @@
yourself
"Created: / 04-04-2013 / 00:08:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-08-2013 / 01:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+newConstructorDeclaration_modifiers: modifiers
+ typeParameters: typeParameters
+ parameters: parameters
+ exceptions: exceptions
+ body: body
+
+ ^ JavaConstructorDeclarationNode new
+ modifiers: modifiers;
+ typeParameters: typeParameters;
+ parameters: parameters;
+ exceptions: exceptions;
+ body: body;
+ yourself
+
+ "Created: / 24-08-2013 / 02:05:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+newMethodDeclaration_modifiers: modifiers
+ typeParameters: typeParameters
+ returnType: returnType
+ name: name
+ parameters: parameters
+ exceptions: exceptions
+ body: body
+
+ ^ JavaMethodDeclarationNode new
+ modifiers: modifiers;
+ typeParameters: typeParameters;
+ returnType: returnType;
+ name: name;
+ parameters: parameters;
+ exceptions: exceptions;
+ body: body;
+ yourself
+
+ "Created: / 24-08-2013 / 02:03:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
newPackageDeclaration: name
--- a/tools/JavaParser.st Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/JavaParser.st Sat Aug 24 17:30:57 2013 +0100
@@ -91,6 +91,13 @@
!JavaParser methodsFor:'grammar-classes'!
+classBody
+
+ ^ super classBody ==> [:nodes | nodes second reject:[:e|e isNil] ]
+
+ "Created: / 24-08-2013 / 01:40:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
normalClassDeclaration
"
^ classModifiers , (self classKW) , self typeNameIdentifier ,
@@ -111,6 +118,52 @@
"Created: / 04-04-2013 / 00:04:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!JavaParser methodsFor:'grammar-classes-method'!
+
+constructorDeclaration
+
+"/ ^ constructorModifiers optional ,
+"/ typeParameters optional ,
+"/ self constructorNameIdentifier,
+"/ formalParameters ,
+"/ throws optional ,
+"/ block
+
+ ^ super constructorDeclaration ==> [:nodes |
+ builder newConstructorDeclaration_modifiers: (nodes at:1)
+ typeParameters: (nodes at: 2)
+ parameters: (nodes at: 4)
+ exceptions: (nodes at: 5)
+ body: (nodes at: 6)
+ ]
+
+ "Created: / 24-08-2013 / 01:57:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+methodNotConstructorDeclaration
+
+"/ ^ methodModifiers,
+"/ typeParameters optional,
+"/ ((self voidKW) / type),
+"/ self methodNameIdentifier,
+"/ formalParameters ,
+"/ emptySquaredParenthesis star ,
+"/ throws optional,
+"/ (block / (self tokenFor: ';'))
+
+ ^ super methodNotConstructorDeclaration ==> [:nodes |
+ builder newMethodDeclaration_modifiers: (nodes at:1)
+ typeParameters: (nodes at: 2)
+ returnType: (nodes at: 3)
+ name: (nodes at: 4)
+ parameters: (nodes at: 5)
+ exceptions: (nodes at: 7)
+ body: (nodes at: 8)
+ ]
+
+ "Created: / 24-08-2013 / 02:00:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!JavaParser methodsFor:'initialization'!
initialize
--- a/tools/JavaParserII.st Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/JavaParserII.st Sat Aug 24 17:30:57 2013 +0100
@@ -41,7 +41,7 @@
arrayCreator createdName arrayInitializer constructorDeclaration
constructorModifiers methodNotConstructorDeclaration wildcard
emptySquaredParenthesis methodModifierNotAnnotation
- classModifierNotAnnotation'
+ classModifierNotAnnotation classInitializer'
classVariableNames:''
poolDictionaries:''
category:'Languages-Java-Parser'
@@ -66,7 +66,6 @@
"
! !
-
!JavaParserII methodsFor:'accessing'!
start
@@ -77,7 +76,6 @@
"Modified: / 10-03-2012 / 12:03:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaParserII methodsFor:'as yet unclassified'!
explicitConstructorInvocation
@@ -95,7 +93,6 @@
(self tokenFor: ';')
! !
-
!JavaParserII methodsFor:'grammar'!
arguments
@@ -324,7 +321,6 @@
/ expression
! !
-
!JavaParserII methodsFor:'grammar-annotations'!
annotation
@@ -382,7 +378,6 @@
^ annotation plus
! !
-
!JavaParserII methodsFor:'grammar-classes'!
classBody
@@ -396,13 +391,13 @@
^
(self tokenFor: ';')
- / ((self staticKW) optional , block)
+ / classInitializer
/ fieldDeclaration
/ methodDeclaration
/ classDeclaration
/ interfaceDeclaration
- "Modified: / 11-03-2012 / 13:15:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-08-2013 / 01:44:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
classDeclaration
@@ -411,6 +406,13 @@
/ enumDeclaration
!
+classInitializer
+
+ ^ ((self staticKW) optional , block)
+
+ "Created: / 24-08-2013 / 01:44:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
classOrInterfaceDeclaration
^ classDeclaration
@@ -567,7 +569,6 @@
) optional
! !
-
!JavaParserII methodsFor:'grammar-classes-enum'!
enumBody
@@ -605,7 +606,6 @@
"Created: / 17-03-2012 / 19:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaParserII methodsFor:'grammar-classes-interface'!
interfaceBody
@@ -673,7 +673,6 @@
"Created: / 17-03-2012 / 19:42:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaParserII methodsFor:'grammar-classes-method'!
constructorDeclaration
@@ -763,7 +762,6 @@
^ (self throwsKW) , qualifiedNameList
! !
-
!JavaParserII methodsFor:'grammar-expressions'!
additiveExpression
@@ -946,7 +944,6 @@
/(self tokenFor: '--')) optional)
! !
-
!JavaParserII methodsFor:'grammar-modifiers'!
classModifierNotAnnotation
@@ -975,7 +972,6 @@
/ annotation) star
! !
-
!JavaParserII methodsFor:'grammar-statements'!
assertStatement
@@ -1165,7 +1161,6 @@
^(self whileKW) , parExpression , statement
! !
-
!JavaParserII class methodsFor:'documentation'!
version_CVS
--- a/tools/Make.proto Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/Make.proto Sat Aug 24 17:30:57 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,
@@ -199,7 +199,8 @@
$(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationNode.$(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/JavaDeclarationNode.$(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/JavaDeclarationNode.$(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/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) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(STCHDR)
+$(OUTDIR)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaDeclarationNode.$(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/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) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(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 Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/Make.spec Sat Aug 24 17:30:57 2013 +0100
@@ -83,6 +83,7 @@
JavaConstructorDeclarationNode \
JavaEnumDeclarationNode \
JavaInterfaceDeclarationNode \
+ JavaMethodDeclarationNode \
JavaSyntaxHighlighter \
@@ -122,6 +123,7 @@
$(OUTDIR_SLASH)JavaConstructorDeclarationNode.$(O) \
$(OUTDIR_SLASH)JavaEnumDeclarationNode.$(O) \
$(OUTDIR_SLASH)JavaInterfaceDeclarationNode.$(O) \
+ $(OUTDIR_SLASH)JavaMethodDeclarationNode.$(O) \
$(OUTDIR_SLASH)JavaSyntaxHighlighter.$(O) \
$(OUTDIR_SLASH)extensions.$(O) \
--- a/tools/abbrev.stc Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/abbrev.stc Sat Aug 24 17:30:57 2013 +0100
@@ -18,7 +18,6 @@
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
@@ -33,6 +32,7 @@
JavaSourceFile JavaSourceFile stx:libjava/tools 'Languages-Java-Parser-AST' 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
JavaVariableDeclarationNode JavaVariableDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
JavaAnnotationDeclarationNode JavaAnnotationDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
@@ -40,4 +40,5 @@
JavaConstructorDeclarationNode JavaConstructorDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
JavaEnumDeclarationNode JavaEnumDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
JavaInterfaceDeclarationNode JavaInterfaceDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
+JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
JavaSyntaxHighlighter JavaSyntaxHighlighter stx:libjava/tools 'Languages-Java-Tools' 0
--- a/tools/bc.mak Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/bc.mak Sat Aug 24 17:30:57 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)
@@ -123,7 +123,8 @@
$(OUTDIR)JavaConstructorDeclarationNode.$(O) JavaConstructorDeclarationNode.$(H): JavaConstructorDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationNode.$(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\JavaDeclarationNode.$(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\JavaDeclarationNode.$(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\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) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(STCHDR)
+$(OUTDIR)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaMethodLikeDeclarationNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaDeclarationNode.$(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\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) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(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/java/build.xml Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/java/build.xml Sat Aug 24 17:30:57 2013 +0100
@@ -3,10 +3,8 @@
Any modifications will be overwritten.
To include a user specific buildfile here, simply create one in the same
directory with the processing instruction <?eclipse.ant.import?>
- as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="stx.libjava.tools">
+ as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx.libjava.tools">
<property environment="env"/>
- <property name="stx.libjava.benchmarks.location" value="../../benchmarks/java"/>
<property name="stx.libjava.examples.location" value="../../examples/java"/>
<property name="stx.libjava.examples.tomcat 6.x.location" value="../../examples/tomcat6/apache-tomcat-6.0.35-src"/>
<property name="stx.libjava.experiments.location" value="../../experiments/java"/>
@@ -18,7 +16,7 @@
<property name="source" value="1.6"/>
<import file="build.ivy.xml"/>
<path id="stx.libjava.classpath">
- <pathelement location="${stx.libjava.location}/libjava-support/bin"/>
+ <pathelement location="${stx.libjava.location}/bin"/>
<pathelement location="${stx.libjava.location}/libs-src/groovy-all-1.8.2-sources.jar"/>
<pathelement location="${stx.libjava.location}/libs-src/junit-4.8.2-sources.jar"/>
<pathelement location="${stx.libjava.location}/libs/groovy-all-1.8.2.jar"/>
@@ -95,12 +93,6 @@
</javac>
</target>
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
- <ant antfile="build.xml" dir="${stx.libjava.benchmarks.location}" inheritAll="false" target="clean"/>
- <ant antfile="build.xml" dir="${stx.libjava.benchmarks.location}" inheritAll="false" target="build">
- <propertyset>
- <propertyref name="build.compiler"/>
- </propertyset>
- </ant>
<ant antfile="build.xml" dir="${stx.libjava.examples.location}" inheritAll="false" target="clean"/>
<ant antfile="build.xml" dir="${stx.libjava.examples.location}" inheritAll="false" target="build">
<propertyset>
--- a/tools/libInit.cc Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/libInit.cc Sat Aug 24 17:30:57 2013 +0100
@@ -60,6 +60,7 @@
_JavaConstructorDeclarationNode_Init(pass,__pRT__,snd);
_JavaEnumDeclarationNode_Init(pass,__pRT__,snd);
_JavaInterfaceDeclarationNode_Init(pass,__pRT__,snd);
+_JavaMethodDeclarationNode_Init(pass,__pRT__,snd);
_JavaSyntaxHighlighter_Init(pass,__pRT__,snd);
_stx_137libjava_137tools_extensions_Init(pass,__pRT__,snd);
--- a/tools/stx_libjava_tools.st Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/stx_libjava_tools.st Sat Aug 24 17:30:57 2013 +0100
@@ -27,9 +27,8 @@
(the browser has a menu function for that)"
^ #(
- #'stx:goodies/petitparser' "PPAbstractParseTest - superclass of JavaParserIITests "
- #'stx:goodies/sunit' "TestAsserter - superclass of JavaParserIITests "
- #'stx:libbasic' "Autoload - superclass of JavaSourcePartitioner "
+ #'stx:goodies/petitparser' "PPCompositeParser - superclass of JavaParser "
+ #'stx:libbasic' "Autoload - superclass of JavaParserIITests "
#'stx:libcomp' "ParseNode - superclass of JavaAnnotationDeclarationNode "
#'stx:libjava' "JavaObject - extended "
#'stx:libtool' "AbstractSettingsApplication - superclass of JavaSettingsApplication "
@@ -74,7 +73,6 @@
#'jv:smallsense' "SmallSenseSyntaxHighlightingService - referenced by JavaCompilerProblemService>>rehighlight: "
#'stx:libbasic2' "CacheDictionary - referenced by JavaParser_Eclipse class>>initialize "
#'stx:libjava/experiments' "JavaCompiler - referenced by JavaCompilerProblemService>>syntaxHighlighter "
- #'stx:libsvn' "JavaScannerStream - referenced by JavaParserI>>parse: "
)
!
@@ -164,7 +162,6 @@
JavaSetInspectorView
JavaSettingsApplication
JavaSourcePartition
- (JavaSourcePartitioner autoload)
(JavaSourcePartitionerTests autoload)
JavaSourceReference
(#'JavaSyntaxHighlighter_Eclipse' autoload)
@@ -179,6 +176,7 @@
JavaSourceFile
JavaMethodLikeDeclarationNode
JavaParser
+ (JavaSourcePartitioner autoload)
JavaTypeDeclarationNode
JavaVariableDeclarationNode
JavaAnnotationDeclarationNode
@@ -186,6 +184,7 @@
JavaConstructorDeclarationNode
JavaEnumDeclarationNode
JavaInterfaceDeclarationNode
+ JavaMethodDeclarationNode
JavaSyntaxHighlighter
)
!
--- a/tools/tools.rc Sat Aug 24 17:29:19 2013 +0100
+++ b/tools/tools.rc Sat Aug 24 17:30:57 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", "Fri, 09 Aug 2013 00:19:34 GMT\0"
+ VALUE "ProductDate", "Sat, 24 Aug 2013 16:10:29 GMT\0"
END
END