--- a/compiler/Dart__Parser.st Fri Jan 11 13:43:38 2013 +0000
+++ b/compiler/Dart__Parser.st Fri Jan 11 15:53:03 2013 +0000
@@ -111,7 +111,7 @@
arguments
- ^('(' asParser) , (argumentList optional) , (')' asParser)
+ ^(TokenParser for:$() , (argumentList optional) , (TokenParser for:$))
!
assignableExpression
@@ -132,20 +132,21 @@
assignmentOperator
- ^ ('=' asParser)
- / ('*=' asParser)
- / ('/=' asParser)
- / ('~/=' asParser)
- / ('%=' asParser)
- / ('+=' asParser)
- / ('-=' asParser)
- / ('<<=' asParser)
- / (('>' asParser) , ('>' asParser) , ('>' asParser) , ('=' asParser))
- / (('>' asParser) , ('>' asParser) , ('=' asParser))
- / ('&=' asParser)
- / ('^=' asParser)
- / ('|=' asParser)
-
+ ^ (TokenParser for: $=)
+ / (TokenParser for: #'*=' )
+ / (TokenParser for: #'/=' )
+ / (TokenParser for: #'~/=' )
+ / (TokenParser for: #'%=' )
+ / (TokenParser for: #'+=' )
+ / (TokenParser for: #'-=' )
+ / (TokenParser for: #'<<=' )
+ / (('>' asParser) , ('>' asParser) , ('>' asParser) , ('=' asParser))
+ / (('>' asParser) , ('>' asParser) , ('=' asParser))
+ / (TokenParser for: #'&=' )
+ / (TokenParser for: #'^=' )
+ / (TokenParser for: #'|=' )
+
+ "Modified: / 11-01-2013 / 15:51:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
bitwiseAndExpression
@@ -180,25 +181,27 @@
block
- ^('{' asParser) , statements , ('}' asParser)
+ ^(TokenParser for:${) , statements , (TokenParser for:$})
+
+ "Modified: / 11-01-2013 / 15:06:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
catchPart
- ^(TokenParser for:#catch) , ('(' asParser) , declaredIdentifier , (((',' asParser) , declaredIdentifier) optional) , (')' asParser) , block
+ ^(TokenParser for:#catch) , (TokenParser for:$() , declaredIdentifier , (((',' asParser) , declaredIdentifier) optional) , (TokenParser for:$)) , block
!
classDefinition
- ^ ((TokenParser for:#class) , identifier , (typeParameters optional) , (superclass optional) , (interfaces optional) , ('{' asParser) , (classMemberDefinition star) , ('}' asParser))
- / ((TokenParser for:#class) , identifier , (typeParameters optional) , (interfaces optional) , (TokenParser for:#native) , (TokenParser for:#string) , ('{' asParser) , (classMemberDefinition star) , ('}' asParser))
+ ^ ((TokenParser for:#class) , identifier , (typeParameters optional) , (superclass optional) , (interfaces optional) , (TokenParser for:${) , (classMemberDefinition star) , (TokenParser for:$}))
+ / ((TokenParser for:#class) , identifier , (typeParameters optional) , (interfaces optional) , (TokenParser for:#native) , (TokenParser for:#string) , (TokenParser for:${) , (classMemberDefinition star) , (TokenParser for:$}))
!
classMemberDefinition
- ^ (declaration , (';' asParser))
- / (constructorDeclaration , (';' asParser))
+ ^ (declaration , (TokenParser for:$;))
+ / (constructorDeclaration , (TokenParser for:$;))
/ (methodDeclaration , functionBodyOrNative)
/ ((TokenParser for:#const) , factoryConstructorDeclaration , functionNative)
@@ -284,7 +287,7 @@
directive
- ^('#' asParser) , identifier , arguments , (';' asParser)
+ ^('#' asParser) , identifier , arguments , (TokenParser for:$;)
!
equalityExpression
@@ -313,7 +316,7 @@
expressionInParentheses
- ^('(' asParser) , constantExpression , (')' asParser)
+ ^(TokenParser for:$() , constantExpression , (TokenParser for:$))
!
expressionList
@@ -356,14 +359,14 @@
forInitializerStatement
- ^ (initializedVariableDeclaration , (';' asParser))
- / ((constantExpression optional) , (';' asParser))
+ ^ (initializedVariableDeclaration , (TokenParser for:$;))
+ / ((constantExpression optional) , (TokenParser for:$;))
!
forLoopParts
- ^ (forInitializerStatement , (constantExpression optional) , (';' asParser) , (expressionList optional))
+ ^ (forInitializerStatement , (constantExpression optional) , (TokenParser for:$;) , (expressionList optional))
/ (declaredIdentifier , (TokenParser for:#in) , constantExpression)
/ (identifier , (TokenParser for:#in) , constantExpression)
@@ -371,14 +374,14 @@
formalParameterList
- ^ (('(' asParser) , (namedFormalParameters optional) , (')' asParser))
- / (('(' asParser) , normalFormalParameter , (normalFormalParameterTail optional) , (')' asParser))
+ ^ ((TokenParser for:$() , (namedFormalParameters optional) , (TokenParser for:$)))
+ / ((TokenParser for:$() , normalFormalParameter , (normalFormalParameterTail optional) , (TokenParser for:$)))
!
functionBody
- ^ (('=>' asParser) , constantExpression , (';' asParser))
+ ^ (('=>' asParser) , constantExpression , (TokenParser for:$;))
/ block
!
@@ -410,7 +413,7 @@
functionNative
- ^(TokenParser for:#native) , ((TokenParser for:#string) optional) , (';' asParser)
+ ^(TokenParser for:#native) , ((TokenParser for:#string) optional) , (TokenParser for:$;)
!
functionPrefix
@@ -420,7 +423,7 @@
functionTypeAlias
- ^(TokenParser for:#typedef) , functionPrefix , (typeParameters optional) , formalParameterList , (';' asParser)
+ ^(TokenParser for:#typedef) , functionPrefix , (typeParameters optional) , formalParameterList , (TokenParser for:$;)
!
getOrSet
@@ -433,7 +436,7 @@
identifier
^ (TokenParser for:#identifier_no_dollar)
- / (TokenParser for:#identifier)
+ / (TokenParser for:#Identifier)
/ (TokenParser for:#abstract)
/ (TokenParser for:#assert)
/ (TokenParser for:#class)
@@ -453,7 +456,7 @@
/ (TokenParser for:#static)
/ (TokenParser for:#typedef)
- "Modified: / 11-01-2013 / 13:25:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 11-01-2013 / 15:04:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
importReference
@@ -496,17 +499,17 @@
interfaceDefinition
- ^(TokenParser for:#interface) , identifier , (typeParameters optional) , (superinterfaces optional) , (factorySpecification optional) , ('{' asParser) , (interfaceMemberDefinition star) , ('}' asParser)
+ ^(TokenParser for:#interface) , identifier , (typeParameters optional) , (superinterfaces optional) , (factorySpecification optional) , (TokenParser for:${) , (interfaceMemberDefinition star) , (TokenParser for:$})
!
interfaceMemberDefinition
- ^ ((TokenParser for:#static) , (TokenParser for:#final) , (type optional) , initializedIdentifierList , (';' asParser))
- / (functionDeclaration , (';' asParser))
- / (constantConstructorDeclaration , (';' asParser))
- / (namedConstructorDeclaration , (';' asParser))
- / (specialSignatureDefinition , (';' asParser))
- / (variableDeclaration , (';' asParser))
+ ^ ((TokenParser for:#static) , (TokenParser for:#final) , (type optional) , initializedIdentifierList , (TokenParser for:$;))
+ / (functionDeclaration , (TokenParser for:$;))
+ / (constantConstructorDeclaration , (TokenParser for:$;))
+ / (namedConstructorDeclaration , (TokenParser for:$;))
+ / (specialSignatureDefinition , (TokenParser for:$;))
+ / (variableDeclaration , (TokenParser for:$;))
!
@@ -522,9 +525,9 @@
iterationStatement
- ^ ((TokenParser for:#while) , ('(' asParser) , constantExpression , (')' asParser) , statement)
- / ((TokenParser for:#do) , statement , (TokenParser for:#while) , ('(' asParser) , constantExpression , (')' asParser) , (';' asParser))
- / ((TokenParser for:#for) , ('(' asParser) , forLoopParts , (')' asParser) , statement)
+ ^ ((TokenParser for:#while) , (TokenParser for:$() , constantExpression , (TokenParser for:$)) , statement)
+ / ((TokenParser for:#do) , statement , (TokenParser for:#while) , (TokenParser for:$() , constantExpression , (TokenParser for:$)) , (TokenParser for:$;))
+ / ((TokenParser for:#for) , (TokenParser for:$() , forLoopParts , (TokenParser for:$)) , statement)
!
@@ -540,7 +543,7 @@
libraryDefinition
- ^(TokenParser for:#library) , ('{' asParser) , libraryBody , ('}' asParser)
+ ^(TokenParser for:#library) , (TokenParser for:${) , libraryBody , (TokenParser for:$})
!
libraryImport
@@ -570,10 +573,11 @@
^ (TokenParser for: #null)
/ (TokenParser for: #true)
/ (TokenParser for: #false)
- / (TokenParser for: #number)
+ / (TokenParser for: #Integer)
+ / (TokenParser for: #Float)
/ (TokenParser for:#string)
- "Modified: / 11-01-2013 / 10:08:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 11-01-2013 / 15:17:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
logicalAndExpression
@@ -588,7 +592,7 @@
mapLiteral
- ^('{' asParser) , ((mapLiteralEntry , (((',' asParser) , mapLiteralEntry) star) , ((',' asParser) optional)) optional) , ('}' asParser)
+ ^(TokenParser for:${) , ((mapLiteralEntry , (((',' asParser) , mapLiteralEntry) star) , ((',' asParser) optional)) optional) , (TokenParser for:$})
!
mapLiteralEntry
@@ -647,16 +651,16 @@
nonLabelledStatement
^ block
- / (initializedVariableDeclaration , (';' asParser))
+ / (initializedVariableDeclaration , (TokenParser for:$;))
/ iterationStatement
/ selectionStatement
/ tryStatement
- / ((TokenParser for: #break) , (identifier optional) , (';' asParser))
- / ((TokenParser for: #continue) , (identifier optional) , (';' asParser))
- / ((TokenParser for: #return) , (constantExpression optional) , (';' asParser))
- / ((TokenParser for: #throw) , (constantExpression optional) , (';' asParser))
- / ((constantExpression optional) , (';' asParser))
- / ((TokenParser for: #assert) , ('(' asParser) , conditionalExpression , (')' asParser) , (';' asParser))
+ / ((TokenParser for: #break) , (identifier optional) , (TokenParser for:$;))
+ / ((TokenParser for: #continue) , (identifier optional) , (TokenParser for:$;))
+ / ((TokenParser for: #return) , (constantExpression optional) , (TokenParser for:$;))
+ / ((TokenParser for: #throw) , (constantExpression optional) , (TokenParser for:$;))
+ / ((constantExpression optional) , (TokenParser for:$;))
+ / ((TokenParser for: #assert) , (TokenParser for:$() , conditionalExpression , (TokenParser for:$)) , (TokenParser for:$;))
/ (functionDeclaration , functionBody)
"Modified: / 11-01-2013 / 10:09:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -761,8 +765,8 @@
selectionStatement
- ^ ((TokenParser for: #if) , ('(' asParser) , constantExpression , (')' asParser) , statement , (((TokenParser for: #else) , statement) optional))
- / ((TokenParser for: #switch) , ('(' asParser) , constantExpression , (')' asParser) , ('{' asParser) , (switchCase star) , (defaultCase optional) , ('}' asParser))
+ ^ ((TokenParser for: #if) , (TokenParser for:$() , constantExpression , (TokenParser for:$)) , statement , (((TokenParser for: #else) , statement) optional))
+ / ((TokenParser for: #switch) , (TokenParser for:$() , constantExpression , (TokenParser for:$)) , (TokenParser for:${) , (switchCase star) , (defaultCase optional) , (TokenParser for:$}))
"Modified: / 11-01-2013 / 10:10:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -863,8 +867,8 @@
/ functionTypeAlias
/ (functionDeclaration , functionBodyOrNative)
/ ((returnType optional) , getOrSet , identifier , formalParameterList , functionBodyOrNative)
- / ((TokenParser for:#final) , (type optional) , staticFinalDeclarationList , (';' asParser))
- / (constInitializedVariableDeclaration , (';' asParser))
+ / ((TokenParser for:#final) , (type optional) , staticFinalDeclarationList , (TokenParser for:$;))
+ / (constInitializedVariableDeclaration , (TokenParser for:$;))
!