stinst: Be able to parse class pragmas with multiple keywords.

2012-10-02 Holger Freyther <holger@freyther.de> * tests/stcompiler.st: Add testcase for pragma parsing. * tests/stcompiler.ok: Update the test result. 2012-10-02 Holger Freyther <holger@freyther.de> * GSTParser.st: Change GSTFileInParser>>#parseClassTag to parse more complicated pragmas.
lm · Oct 8, 2012 · fa264ab · fa264ab
1 parent 983e5e7
commit fa264ab
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-02  Holger Freyther  <holger@freyther.de>
+
+	* tests/stcompiler.st: Add testcase for pragma parsing.
+	* tests/stcompiler.ok: Update the test result.
+
 2012-09-29  Holger Freyther  <holger@freyther.de>
 
 	* scripts/Convert.st: Collect all rewrite expressions and parse

diff --git a/packages/stinst/parser/ChangeLog b/packages/stinst/parser/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-02  Holger Freyther  <holger@freyther.de>
+
+	* GSTParser.st: Change GSTFileInParser>>#parseClassTag to parse
+	more complicated pragmas.
+
 2012-09-29  Holger Freyther  <holger@freyther.de>
 
 	* RBParser.st: Add RBScanner>>#digitValue:.

diff --git a/packages/stinst/parser/GSTParser.st b/packages/stinst/parser/GSTParser.st
@@ -237,21 +237,28 @@ STInST.STFileInParser subclass: GSTFileInParser [
     ]
 
     parseClassTag [
-        | selector argument stmt |
+        | selectors arguments stmt |
 
         self skipExpectedToken: #<.
 
         (currentToken isKeyword)
-            ifTrue: [selector := currentToken value asSymbol. self step]
             ifFalse: [self parserError: 'expected keyword'].
-
-        argument := self parsePrimitiveObject.
+
+        selectors := OrderedCollection new.
+        arguments := OrderedCollection new.
+
+        "Consume all keywords and literals of the pragma"
+        [currentToken isKeyword] whileTrue: [
+            selectors add: currentToken. self step.
+            arguments add: self parsePrimitiveObject.
+        ].
+
         self skipExpectedToken: #>.
 
         stmt := RBMessageNode
     	             receiver: taggee
-    	             selector: selector
-    	             arguments: { argument }.
+	             selectorParts: selectors
+	             arguments: arguments.
         self evaluateStatement: stmt.
     ]
 

diff --git a/tests/stcompiler.st b/tests/stcompiler.st
@@ -104,6 +104,13 @@ literalValueFoo12345
 Eval [
     | classes |
 
+    "Attempt to parse a pragma with multiple parameters"
+    classes := STInST.STClassLoader new
+                  parseSmalltalkStream: 'Object subclass: Bla [
+                            <pragma: 1 withParam: 3> ]' readStream
+                  with: STInST.GSTFileInParser.
+
+    "Check if the proxy has a proper behavior"
     classes := STInST.STClassLoader new
                   parseSmalltalkStream: 'Object subclass: Foo []' readStream
                   with: STInST.GSTFileInParser.