Mercurial Mercurial > hg > stx-goodies-petitparser / 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.
Merge
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 01 May 2015 14:04:37 +0200
changeset 442 d333233f7ebd
parent 441 6f0eb79b3dda (diff)
parent 438 20598d7ce9fa (current diff)
child 443 2c87ed364404
Merge
compiler/PPCInlineAnyNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineCharSetPredicateNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineCharacterNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineLiteralNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineMessagePredicateNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineNilNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineNotCharSetPredicateNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineNotLiteralNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineNotMessagePredicateNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlinePluggableNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineTokenStarMessagePredicateNode.st file | annotate | diff | comparison | revisions
compiler/PPCInlineTokenStarSeparatorNode.st file | annotate | diff | comparison | revisions
compiler/PPCMethodStrategy.st file | annotate | diff | comparison | revisions
compiler/PPCOptimizationResult.st file | annotate | diff | comparison | revisions
compiler/PPCTokenActionNode.st file | annotate | diff | comparison | revisions 
--- a/Make.proto	Thu Apr 30 23:43:14 2015 +0200
+++ b/Make.proto	Fri May 01 14:04:37 2015 +0200
@@ -21,7 +21,7 @@
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:
-SUBDIRS= analyzer tests
+SUBDIRS= analyzer tests parser/smalltalk parser/java compiler compiler/tests
 
 
 # subdirectories where Makefiles are to be made:
--- a/analyzer/Make.proto	Thu Apr 30 23:43:14 2015 +0200
+++ b/analyzer/Make.proto	Fri May 01 14:04:37 2015 +0200
@@ -108,7 +108,7 @@
 
 
 # build all packages containing referenced classes for this package
-# they are nor needed to compile the package
+# they are not needed to compile the package (but later, to load it)
 references:
 
 
--- a/bmake.bat	Thu Apr 30 23:43:14 2015 +0200
+++ b/bmake.bat	Fri May 01 14:04:37 2015 +0200
@@ -23,4 +23,32 @@
 @call bmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "***********************************"
+@pushd parser\smalltalk
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "***********************************"
+@pushd parser\java
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler/tests
+@echo "***********************************"
+@pushd compiler\tests
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
--- a/islands/Make.proto	Thu Apr 30 23:43:14 2015 +0200
+++ b/islands/Make.proto	Fri May 01 14:04:37 2015 +0200
@@ -108,7 +108,7 @@
 
 
 # build all packages containing referenced classes for this package
-# they are nor needed to compile the package
+# they are not needed to compile the package (but later, to load it)
 references:
 
 
--- a/islands/tests/Make.proto	Thu Apr 30 23:43:14 2015 +0200
+++ b/islands/tests/Make.proto	Fri May 01 14:04:37 2015 +0200
@@ -106,7 +106,7 @@
 
 
 # build all packages containing referenced classes for this package
-# they are nor needed to compile the package
+# they are not needed to compile the package (but later, to load it)
 references:
 
 
--- a/lccmake.bat	Thu Apr 30 23:43:14 2015 +0200
+++ b/lccmake.bat	Fri May 01 14:04:37 2015 +0200
@@ -19,4 +19,32 @@
 @call lccmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "***********************************"
+@pushd parser\smalltalk
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "***********************************"
+@pushd parser\java
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler/tests
+@echo "***********************************"
+@pushd compiler\tests
+@call lccmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
--- a/mingwmake.bat	Thu Apr 30 23:43:14 2015 +0200
+++ b/mingwmake.bat	Fri May 01 14:04:37 2015 +0200
@@ -27,4 +27,32 @@
 @call mingwmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "***********************************"
+@pushd parser\smalltalk
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "***********************************"
+@pushd parser\java
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler/tests
+@echo "***********************************"
+@pushd compiler\tests
+@call mingwmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
--- a/parsers/java/PJEndOfLineCommentsNode.st	Thu Apr 30 23:43:14 2015 +0200
+++ b/parsers/java/PJEndOfLineCommentsNode.st	Fri May 01 14:04:37 2015 +0200
@@ -23,7 +23,7 @@
 !
 
 printOn: aStream
-	.^	aStream 
+	^	aStream 
 		nextPutAll: 'EndOfLineComment value ==> ';
 		nextPutAll: self comment.
  
--- a/parsers/java/PPJavaTokenParser.st	Thu Apr 30 23:43:14 2015 +0200
+++ b/parsers/java/PPJavaTokenParser.st	Fri May 01 14:04:37 2015 +0200
@@ -12,29 +12,31 @@
 !PPJavaTokenParser methodsFor:'parsing'!
 
 parseComments: anArray on: aStream
-	
-	| start comments |
-	comments := anArray.
-	[ 
-		| peekTwice |
-	[ aStream atEnd not and: [ aStream peek isSeparator ] ]
-		whileTrue: [ aStream next ].
-	peekTwice := aStream peekTwice.	
-	  ((peekTwice  first = $/) and: 
-		[ (peekTwice second = $*) or: [peekTwice second = $/]])] whileTrue: [
-"		
-		Transcript show: ('position ', aStream position asString, ' char ', aStream next asString); cr.
-"		
-		aStream next.
-		start := aStream position.
-		(aStream next = $*) 
-			ifTrue: [ aStream upToAll: '*/' ]
-			ifFalse: [ 
-				| position |
-				position := aStream position.
-				aStream upToAnyOf: CharacterSet crlf].
-		comments := comments copyWith: (start to: aStream position) ].
-	^ comments
+        
+        | start comments |
+        comments := anArray.
+        [ 
+                | peekTwice |
+        [ aStream atEnd not and: [ aStream peek isSeparator ] ]
+                whileTrue: [ aStream next ].
+        peekTwice := aStream peekTwice. 
+          ((peekTwice  first = $/) and: 
+                [ (peekTwice second = $*) or: [peekTwice second = $/]])] whileTrue: [
+"               
+                Transcript show: ('position ', aStream position asString, ' char ', aStream next asString); cr.
+"               
+                aStream next.
+                start := aStream position.
+                (aStream next = $*) 
+                        ifTrue: [ aStream upToAll: '*/' ]
+                        ifFalse: [ 
+                                | position |
+                                position := aStream position.
+                                aStream upToAnyOf: (String with: (Character codePoint: 13) with: (Character codePoint: 10))].
+                comments := comments copyWith: (start to: aStream position) ].
+        ^ comments
+
+    "Modified: / 21-04-2015 / 17:23:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 parseOn: aPPContext
--- a/vcmake.bat	Thu Apr 30 23:43:14 2015 +0200
+++ b/vcmake.bat	Fri May 01 14:04:37 2015 +0200
@@ -31,4 +31,32 @@
 @call vcmake %1 %2 || exit /b "%errorlevel%"
 @popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/smalltalk
+@echo "***********************************"
+@pushd parser\smalltalk
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
 
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/parser/java
+@echo "***********************************"
+@pushd parser\java
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler
+@echo "***********************************"
+@pushd compiler
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+@echo "***********************************"
+@echo "Buildung stx/goodies/petitparser/compiler/tests
+@echo "***********************************"
+@pushd compiler\tests
+@call vcmake %1 %2 || exit /b "%errorlevel%"
+@popd
+
+
hg/stx-goodies-petitparser