Changeset 553 for branches/xtext-MDT/org.modelica.xtext.core/src/org

Timestamp:

12/05/09 15:56:01 (15 years ago)

Author:

nasko

Message:

Fixed some problem with the grammar file

File:

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

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

@@ -133 +133 @@
     |{ClassPart::PROTECTED} 'protected' (contents+=ElementItem)*
     |{ClassPart::EQUATIONS} 'equation' (contents+=EquationItem)*
-    //|{ClassPart::INITIALEQUATIONS} 'initial' 'equation' (contents+=EquationItem)*
+    |{ClassPart::INITIALEQUATIONS} 'initial' 'equation' (contents+=EquationItem)*
     |{ClassPart::ALGORITHMS} 'algorithm' (contents+=AlgorithmItem)*
     |{ClassPart::INITIALALGORITHMS} 'initial' 'algorithm' (contents+=AlgorithmItem)*
@@ -294 +294 @@
     ;
 
-AlgorithmIf returns AlgorithmStatement::ALG_IF:
+AlgorithmIf returns AlgorithmStatement::uAlgorithmStatement :
+    {AlgorithmStatement::ALG_IF}
     'if' ifExp=Expression 'then' (trueBranch+=AlgorithmItem)* 
     (elseIfAlgorithmBranch+=ElseIfAlgorithmBranch)* 
@@ -305 +306 @@
     ;
 
-AlgorithmAssign returns AlgorithmStatement::ALG_ASSIGN:
-    assignComponent=ExprRange ':=' value=Expression
-    ;
-AlgorithmNoRetCall returns AlgorithmStatement::ALG_NORETCALL :
+AlgorithmAssign returns AlgorithmStatement::uAlgorithmStatement :
+    {AlgorithmStatement::ALG_ASSIGN} assignComponent=ExprRange ':=' value=Expression
+    ;
+AlgorithmNoRetCall returns  AlgorithmStatement::uAlgorithmStatement:
+    {AlgorithmStatement::ALG_NORETCALL} 
     functionCall=ComponentRef '(' functionArgs=FunctionArguments? ')'
     ;
@@ -316 +318 @@
     ; 
 
-AlgorithmWhen returns AlgorithmStatement::ALG_WHEN_A :
+AlgorithmWhen returns AlgorithmStatement::uAlgorithmStatement :
+    {AlgorithmStatement::ALG_WHEN_A}
     'when' boolExpr=Expression 'then' (whenBody+=AlgorithmItem)
     (elseWhenAlgorithmBranch+=ElseWhenAlgorithmBranch)*
@@ -416 +419 @@
 
 ExprRange returns Exp::uExp :
-    ExprLogical ({Exp::RANGE.start=current} ':'  stop=ExprLogical 
-    | {Exp::RANGE.start=current} ':' step=ExprLogical ':' stop=ExprLogical )?
+    ExprLogical ({Exp::RANGE.start=current} ':'  (step=ExprLogical ':' stop=ExprLogical | stop=ExprLogical) )?
     ;
     
@@ -435 +437 @@
 ExprRelation returns Exp::uExp :
     ExprArithmetic
-    ({Exp::RELATION.exp1=current}  op=OperatorLogical exp2=ExprArithmetic)?
+    ({Exp::RELATION.exp1=current} op = (OperatorLess | OperatorLessEq | OperatorGreater | 
+    OperatorGreaterEq | OperatorEqual | OperatorEqual)  exp2=ExprArithmetic)?
     ;
 
 ExprArithmetic returns Exp::uExp :
     ExprUnaryArithmetic 
-    ({Exp::BINARY.exp1=current} op=OperatorAddSub exp2=ExprArithmetic2)?
+    ({Exp::BINARY.exp1=current} op=(OperatorAdd | OperatorSub | OperatorAddEW | OperatorSubEW) 
+    exp2=ExprArithmetic2)?
     ;
 
 ExprArithmetic2 returns Exp::uExp :
     ExprArithmeticTerm 
-    ({Exp::BINARY.exp1=current} op=OperatorAddSub exp2=ExprArithmetic2)?
+    ({Exp::BINARY.exp1=current} op=(OperatorAdd | OperatorSub | OperatorAddEW | OperatorSubEW)
+    exp2=ExprArithmetic2)?
     ;
 
@@ -550 +555 @@
     Operators
 */
-
+/*
 OperatorLogical returns Operator::uOperator:
     {Operator::LESS} '<' | {Operator::LESSEQ} '<=' | {Operator::GREATER} '>' 
@@ -557 +562 @@
 
 OperatorAddSub returns Operator::uOperator:
-    {Operator::ADD} '+' | {Operator::SUB} '-' | {Operator::ADD_EW} '.+' | {Operator::SUB_EW} '.-'
-    ;
-
+    {Operator::SUB} '-' | {Operator::ADD} '+' | {Operator::ADD_EW} '.+' | {Operator::SUB_EW} '.-'
+    ;
+*/
     
 OperatorAdd returns Operator::ADD :