Changeset 547 for branches/xtext-MDT/org.modelica.xtext.core

Timestamp:

11/17/09 00:24:33 (15 years ago)

Author:

nasko

Message:

Some changes in the ModelicaAST.xtext and the MANIFEST.MF files to fit the newer version. Still problem at with parsing at runtime

File:

• branches/xtext-MDT/org.modelica.xtext.core/src/org/modelica/xtext/ModelicaAST.xtext (modified) (11 diffs)

branches/xtext-MDT/org.modelica.xtext.core/src/org/modelica/xtext/ModelicaAST.xtext

@@ -90 +90 @@
     
 ClassDefinitionDerived returns ClassDef::DERIVED :
-    EQUALS attributes=ElementAttributes typeSpec=TypeSpecification 
+    '=' attributes=ElementAttributes typeSpec=TypeSpecification 
     ('(' arguments+=ElementArg (',' arguments+=ElementArg)* ')')?  comment=Comment
     ;
 
 ClassDefinitionEnum returns ClassDef::ENUMERATION :
-    EQUALS 'enumeration' '(' enumLiterals=EnumerationDefinition ')' comment=Comment 
+    '=' 'enumeration' '(' enumLiterals=EnumerationDefinition ')' comment=Comment 
     ;
 
 ClassDefinitionOverload returns ClassDef::OVERLOAD :
-    EQUALS 'overload' '(' functionNames+=Path (',' functionNames+=Path)* ')' comment=Comment
+    '=' 'overload' '(' functionNames+=Path (',' functionNames+=Path)* ')' comment=Comment
     ;
 
 // CHECK Comment?
 ClassDefinitionPartialDer returns ClassDef::PDER :
-    EQUALS 'der' '(' functionName=Path (',' vars+=IDENT)+ ')'
+    '=' 'der' '(' functionName=Path (',' vars+=IDENT)+ ')'
     ;
 // CHECK Comment or StringComment
@@ -122 +122 @@
 EnumerationDefinition returns EnumDef::uEnumDef :
     {EnumDef::ENUMLITERALS} enumLiterals+=EnumLiteral (',' enumLiterals+=EnumLiteral)* 
-    | {EnumDef::ENUM_COLON} COLON
+    | {EnumDef::ENUM_COLON} ':'
     ;
 
@@ -154 +154 @@
 // FIXME Figure out the text thing
 // fix redeclareKeyword>s< ?=('redeclare')?
-Element returns Element::uElement :
-    ElementElement
+//Element returns Element::uElement :
+//  ElementElement
     //|{TEXT}
     //|{DEFINEUNIT}
-    ;
+    //;
     
 // FIXME constrainedby clause   
-ElementElement returns Element::ELEMENT :
-    specification=(ElementSpecificationImport|ElementSpecificationExtends) innerOuter=InnerOuterUnspecified
-    |redeclareKeywords=RedeclareKeyword? finalPrefix?=('final')?
+Element returns Element::uElement:
+    {Element::ELEMENT} specification=(ElementSpecificationImport|ElementSpecificationExtends) innerOuter=InnerOuterUnspecified
+    |{Element::ELEMENT} redeclareKeywords=RedeclareKeyword? finalPrefix?=('final')?
         innerOuter=InnerOuter specification=(ElementSpecificationClassDefinition | ElementSpecificationComponents) 
-    |redeclareKeywords=(RedeclareReplaceableKeyword | ReplaceableKeyword) innerOuter=InnerOuter 
+    |{Element::ELEMENT} redeclareKeywords=(RedeclareReplaceableKeyword | ReplaceableKeyword) innerOuter=InnerOuter 
         specification=(ElementSpecificationClassDefinition | ElementSpecificationComponents) 
         //('constrainedby' name=IDENT  constrainClass=ConstrainClass)?
@@ -216 +216 @@
 // FIXME the unqualified import- perhaps in a M2M transformation
 Import returns Import::uImport :
-    {Import::NAMED_IMPORT} name=IDENT EQUALS path=Path
+    {Import::NAMED_IMPORT} name=IDENT '=' path=Path
     |{Import::QUAL_IMPORT} path=Path
     //|{UNQUAL_IMPORT} path=Path
@@ -324 +324 @@
 
 AlgorithmReturn returns AlgorithmStatement::ALG_RETURN :
-    'return'
+    {AlgorithmStatement::ALG_RETURN} 'return'
     ;
 
 AlgorithmWhile returns AlgorithmStatement::ALG_WHILE :
-    'while' boolExpr=Expression 'loop' (whileBody+=AlgorithmItem)* 'end' 'while'
+    {AlgorithmStatement::ALG_WHILE} 'while' boolExpr=Expression 'loop' (whileBody+=AlgorithmItem)* 'end' 'while'
     ;
 
 AlgorithmBreak returns AlgorithmStatement::ALG_BREAK :
-    'break'
+    {AlgorithmStatement::ALG_BREAK} 'break'
     ; 
 
 Modification returns Modifications::uModification :
     {Modifications::CLASSMOD}   (
-    '(' elementArgList+=ElementArg (',' elementArgList+=ElementArg)* ')' (EQUALS expOption=Expression)?
-    | (EQUALS|ASSIGN) expOption=Expression)
+    '(' elementArgList+=ElementArg (',' elementArgList+=ElementArg)* ')' ('=' expOption=Expression)?
+    | ('='|':=') expOption=Expression)
     ;
     
@@ -396 +396 @@
     
 ArrayDim returns ArrayDim::ArrayDim :
-    ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')?
+    {ArrayDim::ArrayDim} ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')?
     ;   
 
@@ -511 +511 @@
     
 ExprTuple returns Exp::TUPLE :
-    '(' expressions+=Expression (',' expressions+=Expression)* ')'
+    {Exp::TUPLE} '(' expressions+=Expression (',' expressions+=Expression)* ')'
     ;
     
 ExprEnd returns Exp::END :
-    'end'
+    {Exp::END} 'end'
     ;
     
@@ -550 +550 @@
     
 OperatorAdd returns Operator::ADD :
-    '+'
+    {Operator::ADD} '+'
     ;
     
 OperatorSub returns Operator::SUB :
-    '-'
+    {Operator::SUB} '-'
     ;
     
 OperatorMul returns Operator::MUL :
-    '*'
+    {Operator::MUL} '*'
     ;
     
 OperatorDiv returns Operator::DIV :
-    '/'
+    {Operator::DIV} '/'
     ;
     
 OperatorPow returns Operator::POW :
-    '^'
+    {Operator::POW} '^'
     ;
 
 OperatorUnPlus returns Operator::UPLUS :
-    '+'
+    {Operator::UPLUS} '+'
     ;
 
 OperatorUnMinus returns Operator::UMINUS :
-    '-'
+    {Operator::UMINUS} '-'
     ;
 
 OperatorAddEW returns Operator::ADD_EW :
-    '.+'
+    {Operator::ADD_EW} '.+'
     ;
     
 OperatorSubEW returns Operator::SUB_EW :
-    '.-'
+    {Operator::SUB_EW} '.-'
     ;
     
 OperatorMulEW returns Operator::MUL_EW :
-    '.*'
+    {Operator::MUL_EW} '.*'
     ;
     
 OperatorDivEW returns Operator::DIV_EW :
-    './'
+    {Operator::DIV_EW} './'
     ;
     
 OperatorPowEW returns Operator::POW_EW :
-    '.^'
+    {Operator::POW_EW} '.^'
     ;
 
 OperatorUnPlusEW returns Operator::UPLUS_EW :
-    '.+'
+    {Operator::UPLUS_EW} '.+'
     ;
 
 OperatorUnMinusEW returns Operator::UMINUS_EW :
-    '.-'
+    {Operator::UMINUS_EW} '.-'
     ;
 
 OperatorAnd returns Operator::AND :
-    'and'
+    {Operator::AND} 'and'
     ;
 
 OperatorOr returns Operator::OR :
-    'or'
+    {Operator::OR} 'or'
     ;
     
 OperatorNot returns Operator::NOT :
-    'not'
+    {Operator::NOT} 'not'
     ;
     
 OperatorLess returns Operator::LESS :
-    LESS
+    {Operator::LESS} '<'
     ;
     
 OperatorLessEq returns Operator::LESSEQ :
-    LESSEQ
+    {Operator::LESSEQ} '<='
     ;
 OperatorGreater returns Operator::GREATER :
-    GREATER
+    {Operator::GREATER} '>'
     ;
     
 OperatorGreaterEq returns Operator::GREATEREQ :
-    GREATEREQ
+    {Operator::GREATEREQ} '>='
     ;
 OperatorEqual returns Operator::EQUAL :
-    EQEQ
+    {Operator::EQUAL} '=='
     ;
     
 OperatorNotEqual returns Operator::NEQUAL :
-    LESSGT
+    {Operator::NEQUAL} ('><'|'!=')
     ;
 
@@ -700 +700 @@
 
 ExternalDeclaration returns ExternalDecl::uExternalDecl :
-    {ExternalDecl::EXTERNALDECL} (lang=STRING)? ((output_=ComponentRef EQUALS)? funcName=IDENT
+    {ExternalDecl::EXTERNALDECL} (lang=STRING)? ((output_=ComponentRef '=')? funcName=IDENT
     '(' args+=Expression (',' args+=Expression)* ')')? (annotation_=Annotation)?
     ;
@@ -766 +766 @@
 **********************************/
   
-terminal    DOT     : '.'           ;  
-terminal  LPAR      : '('       ;
-terminal   RPAR     : ')'       ;
-terminal   LBRACK   : '['       ;
-terminal   RBRACK   : ']'       ;
-terminal   LBRACE   : '{'       ;
-terminal   RBRACE   : '}'       ;
-terminal   EQUALS   : '='       ;
-terminal   ASSIGN   : ':='      ;
-terminal   COMMA        : ','       ;
-terminal   COLON        : ':'       ;
-terminal   SEMICOLON    : ';'       ;
+/*
+terminal    DOT     : '.'           ;  
+terminal    LPAR        : '('       ;
+terminal    RPAR        : ')'       ;
+terminal    LBRACK  : '['       ;
+terminal    RBRACK  : ']'       ;
+terminal    LBRACE  : '{'       ;
+terminal    RBRACE  : '}'       ;
+terminal    EQUALS  : '='       ;
+terminal    ASSIGN  : ':='      ;
+terminal    COMMA       : ','       ;
+terminal    COLON       : ':'       ;
+terminal    SEMICOLON   : ';'       ;
+*/
   /* elementwise operators */  
-terminal   PLUS_EW      : '.+'      ; /* Modelica 3.0 */
-terminal   MINUS_EW     : '.-'      ; /* Modelica 3.0 */    
-terminal   STAR_EW      : '.*'      ; /* Modelica 3.0 */
-terminal   SLASH_EW     : './'      ; /* Modelica 3.0 */  
-terminal   POWER_EW     : '.^'      ; /* Modelica 3.0 */
-  
+
+//terminal   PLUS_EW        : '.+'      ; /* Modelica 3.0 */
+//terminal   MINUS_EW       : '.-'      ; /* Modelica 3.0 */    
+//terminal   STAR_EW        : '.*'      ; /* Modelica 3.0 */
+//terminal   SLASH_EW       : './'      ; /* Modelica 3.0 */  
+//terminal   POWER_EW       : '.^'      ; /* Modelica 3.0 */
+
+/*  
 terminal STAR       : '*'('.')?                 ;
 terminal MINUS      : '-'('.')?                 ;
@@ -796 +800 @@
 terminal POWER      : '^'('.')?                 ;
 terminal SLASH      : '/'('.')?                 ;
-
+*/
 terminal ANY_OTHER: .;