--- a/compiler/tests/PPCompiledExpressionGrammarTest.st	Thu Apr 30 23:43:14 2015 +0200
+++ b/compiler/tests/PPCompiledExpressionGrammarTest.st	Sun May 10 06:28:36 2015 +0100
@@ -12,43 +12,112 @@
 !PPCompiledExpressionGrammarTest class methodsFor:'as yet unclassified'!
 
 resources
-	^ (OrderedCollection with: PPCompiledExpressionGrammarResource)
-		addAll: super resources;
-		yourself
+    ^ (OrderedCollection with: PPCompiledExpressionGrammarResource)
+        addAll: super resources;
+        yourself
 ! !
 
 !PPCompiledExpressionGrammarTest methodsFor:'as yet unclassified'!
 
 compilerArguments
-	^ PPCArguments default
-		profile: true;
-		ll: true;
-		yourself
+    ^ PPCArguments default
+        profile: true;
+        ll: true;
+        yourself
 !
 
 context
-	^ PPCContext new
+    ^ PPCContext new
 !
 
 parserClass
-	^ Smalltalk at: #PPCompiledExpressionGrammar
+    ^ Smalltalk at: #PPCompiledExpressionGrammar
 !
 
 parserInstanceFor: aSymbol
-	^ (Smalltalk at: #PPCompiledExpressionGrammar) new startSymbol: aSymbol
+    ^ (Smalltalk at: #PPCompiledExpressionGrammar) new startSymbol: aSymbol
+!
+
+testAdd
+    result := self parse: '1+2' rule: #add.
+    self assert: result isArray.
+    self assert: result first = 1.
+    self assert: result second inputValue = '+'.
+    self assert: result third = 2.
+!
+
+testMul
+    result := self parse: '1 * 2' rule: #mul.
+    self assert: result isArray.
+    self assert: result first = 1.
+    self assert: result second inputValue = '*'.
+    self assert: result third = 2.
 !
 
 testNumber
-	result := self parse: '1' rule: #number.
-	self assert: result = 1.
+    result := self parse: '1' rule: #number.
+    self assert: result = 1.
+!
+
+testParens
+    result := self parse: '(1)' rule: #parens.
+    self assert: result size = 3.
+    self assert: result first inputValue = '('.
+    self assert: result second = 1.
+    self assert: result third inputValue = ')'.
+    
+!
+
+testPrim
+    result := self parse: '1' rule: #prim.
+    self assert: result = 1.
+!
+
+testPrim2
+    result := self parse: '(1)' rule: #prim.
+    self assert: result size = 3.
+    self assert: result second = 1.
+!
+
+testProd
+    result := self parse: '1' rule: #prod.
+    self assert: result = 1.
 !
 
 testTerm
-	result := self parse: '1 + 2' rule: #term.
-	self assert: result size = 3.
-	self assert: result first = 1.
-	self assert: result second inputValue = '+'.
-	self assert: result third = 2.
-	
+    result := self parse: '1' rule: #term.
+    self assert: result = 1.
+    
+!
+
+testTerm11
+    result := self parse: '1 + 2' rule: #term.
+    self assert: result size = 3.
+    self assert: result first = 1.
+    self assert: result second inputValue = '+'.
+    self assert: result third = 2.
+    
+!
+
+testTerm12
+    result := self parse: '1 + 2 * 3' rule: #term.
+    self assert: result size = 3.
+    self assert: result second inputValue = '+'.
+    self assert: result first = 1.
+    self assert: result third isArray.
+    self assert: result third first = 2.
+    self assert: result third second inputValue = '*'.
+    self assert: result third third = 3.	
+!
+
+testTerm13
+    result := self parse: '1 * 2 + 3' rule: #term.
+    self assert: result size = 3.
+    self assert: result first isArray.
+    self assert: result first first = 1.
+    self assert: result first second inputValue = '*'.
+    self assert: result first third = 2.	
+    self assert: result second inputValue = '+'.
+    self assert: result third = 3.
 ! !