--- a/Parser.st	Tue Oct 18 16:49:27 2011 +0200
+++ b/Parser.st	Tue Oct 18 19:53:45 2011 +0200
@@ -8651,23 +8651,38 @@
 
     self nextToken.
     (tokenType == #Integer) ifFalse:[
-        (parserFlags allowSqueakExtensions
-        or:[ parserFlags allowSqueakPrimitives ]) ifTrue:[
-            (tokenType == #String) ifFalse:[
-                self parseError:'primitive name as string expected'.
-                ^ #Error
-            ]
+        (tokenType == #String) ifTrue:[
+            (parserFlags allowSqueakExtensions
+            or:[ parserFlags allowSqueakPrimitives ]) ifFalse:[
+                self parseError:'primitive name as string expected (Squeak primitives not allowed - see settings)'.
+            ].
         ] ifFalse:[
-            parserFlags allowVisualAgePrimitives ifTrue:[
-                (tokenType == #Identifier) ifFalse:[
-                    self parseError:'primitive name expected'.
-                    ^ #Error
+            (tokenType == #Identifier) ifTrue:[
+                (false "parserFlags allowVisualAgeExtensions"
+                or:[ parserFlags allowVisualAgePrimitives ]) ifFalse:[
+                    self parseError:'primitive number expected (VA-primitives not allowed - see settings)'.
                 ]
             ] ifFalse:[
                 self parseError:'primitive number expected'.
-                ^ #Error
-            ].
-        ]
+            ].
+        ].
+"/        (parserFlags allowSqueakExtensions
+"/        or:[ parserFlags allowSqueakPrimitives ]) ifTrue:[
+"/            (tokenType == #String) ifFalse:[
+"/                self parseError:'primitive name as string expected (Squeak primitives not allowed - see settings)'.
+"/                ^ #Error
+"/            ]
+"/        ] ifFalse:[
+"/            parserFlags allowVisualAgePrimitives ifTrue:[
+"/                (tokenType == #Identifier) ifFalse:[
+"/                    self parseError:'primitive name expected'.
+"/                    ^ #Error
+"/                ]
+"/            ] ifFalse:[
+"/                self parseError:'primitive number expected (VA-primitives not allowed - see settings)'.
+"/                ^ #Error
+"/            ].
+"/        ]
     ].
     primitiveNr notNil ifTrue:[
         self parseError:'only one primitive spec allowed'.
@@ -8700,6 +8715,7 @@
     ^ primNumber
 
     "Modified: / 03-11-2009 / 17:14:48 / Jan Travnicek <travnja3@fel.cvut.cz>"
+    "Modified: / 18-10-2011 / 16:57:38 / cg"
 !
 
 parseVWTypeOrExternalFunctionDeclarationFrom:aStream definitionType:definitionType knownDefinitions:dictionaryOfTypesOrNil lineNr:lineNr
@@ -10613,11 +10629,11 @@
 !Parser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.694 2011-10-05 14:14:52 az Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.695 2011-10-18 17:53:45 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.694 2011-10-05 14:14:52 az Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.695 2011-10-18 17:53:45 cg Exp $'
 !
 
 version_SVN