Oops, merged code which contained Pharoism's
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 26 May 2015 07:27:15 +0100
changeset 473 90eb2d1f7bed
parent 472 72074e22bd61
child 474 62b5330d8b23
Oops, merged code which contained Pharoism's
compiler/tests/extras/PPCompiledExpressionGrammarResource.st
compiler/tests/extras/PPLL1ExpressionGrammar.st
compiler/tests/extras/PPTokenizedExpressionGrammarResource.st
compiler/tests/extras/PPTokenizedLL1ExpressionGrammarResource.st
--- a/compiler/tests/extras/PPCompiledExpressionGrammarResource.st	Mon May 25 02:49:22 2015 +0100
+++ b/compiler/tests/extras/PPCompiledExpressionGrammarResource.st	Tue May 26 07:27:15 2015 +0100
@@ -9,6 +9,7 @@
 	category:'PetitCompiler-Extras-Tests-Expressions'
 !
 
+
 !PPCompiledExpressionGrammarResource methodsFor:'as yet unclassified'!
 
 setUp
@@ -24,3 +25,10 @@
     
 ! !
 
+!PPCompiledExpressionGrammarResource class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/compiler/tests/extras/PPLL1ExpressionGrammar.st	Mon May 25 02:49:22 2015 +0100
+++ b/compiler/tests/extras/PPLL1ExpressionGrammar.st	Tue May 26 07:27:15 2015 +0100
@@ -13,12 +13,14 @@
 
 add
    ^ prod, addPrime optional
- 	map: [ :_prod :_addPrime |
-		_addPrime isNil 
-			ifTrue: [ _prod  ]
-			ifFalse: [ Array with: _prod withAll: _addPrime ]
-		
-	]
+        map: [ :_prod :_addPrime |
+                _addPrime isNil 
+                        ifTrue: [ _prod  ]
+                        ifFalse: [ (Array with: _prod) , _addPrime ]
+                
+        ]
+
+    "Modified (format): / 26-05-2015 / 07:23:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 addPrime
@@ -27,12 +29,14 @@
 
 mul
    ^ prim, mulPrime optional
- 	map: [ :_prim :_mulPrime |
-		_mulPrime isNil 
-			ifTrue: [ _prim  ]
-			ifFalse: [ Array with: _prim withAll: _mulPrime ]
-		
-	]
+        map: [ :_prim :_mulPrime |
+                _mulPrime isNil 
+                        ifTrue: [ _prim  ]
+                        ifFalse: [ (Array with: _prim) , _mulPrime ]
+                
+        ]
+
+    "Modified (format): / 26-05-2015 / 07:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 mulPrime
@@ -61,11 +65,13 @@
 
 term
     ^ prod, termPrime optional
- 	map: [ :_prod :_termPrime |
+        map: [ :_prod :_termPrime |
         _termPrime isNil 
             ifTrue: [ _prod  ]
-            ifFalse: [ Array with: _prod withAll: _termPrime ]
-    ]	
+            ifFalse: [ (Array with: _prod) , _termPrime ]
+    ]
+
+    "Modified: / 26-05-2015 / 07:24:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 termPrime
--- a/compiler/tests/extras/PPTokenizedExpressionGrammarResource.st	Mon May 25 02:49:22 2015 +0100
+++ b/compiler/tests/extras/PPTokenizedExpressionGrammarResource.st	Tue May 26 07:27:15 2015 +0100
@@ -20,7 +20,8 @@
     time := Time millisecondsToRun: [
         PPExpressionGrammar new compileWithConfiguration: configuration.
     ].
-    Transcript crShow: 'Expression grammar tokenized in: ', time asString, 'ms'.
-    
+    Transcript show: 'Expression grammar tokenized in: '; show: time asString; show: 'ms'; cr.
+
+    "Modified: / 26-05-2015 / 07:25:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
--- a/compiler/tests/extras/PPTokenizedLL1ExpressionGrammarResource.st	Mon May 25 02:49:22 2015 +0100
+++ b/compiler/tests/extras/PPTokenizedLL1ExpressionGrammarResource.st	Tue May 26 07:27:15 2015 +0100
@@ -20,7 +20,8 @@
     time := Time millisecondsToRun: [
         PPLL1ExpressionGrammar new compileWithConfiguration: configuration.
     ].
-    Transcript crShow: 'LL1 Expression grammar tokenized in: ', time asString, 'ms'.
-    
+    Transcript show: 'LL1 Expression grammar tokenized in: '; show: time asString; show: 'ms'; cr.
+
+    "Modified: / 26-05-2015 / 07:24:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !