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

Timestamp:

12/05/09 14:23:12 (15 years ago)

Author:

nasko

Message:

Work in progress

File:

• branches/xtext-MDT/org.modelica.xtext.core/src/org/modelica/xtext/ModelicaAST.xtext (modified) (17 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)*
@@ -167 +167 @@
     | (redeclareKeywords=RedeclareReplaceableKeyword | redeclareKeywords=ReplaceableKeyword) innerOuter=InnerOuter 
         (specification=ElementSpecificationClassDefinition | specification=ElementSpecificationComponents)  
-    ;
-
-//('constrainedby' name=IDENT  constrainClass=ConstrainClass)?
+    constrainClass=ConstrainClass?
+    ;
+
+ConstrainClass returns ConstrainClass::uConstrainClass :
+    {ConstrainClass::CONSTRAINCLASS} elementSpec=ElementSpecificationConstrainedby comment=Comment?
+    ;
+
 /*
-ConstrainClass returns uConstrainClass :
-    {CONSTRAINCLASS} elementSpec=ElementSpecification comment=Comment
-    ;
-*/
-
-
 ElementSpecification returns ElementSpec::uElementSpec :
     ElementSpecificationImport
@@ -183 +181 @@
     |ElementSpecificationComponents
     ;
-
+*/
 ElementSpecificationImport returns ElementSpec::uElementSpec :
     {ElementSpec::IMPORT} 'import' import_=Import comment=Comment
@@ -193 +191 @@
     ;
 
-/* FIXME check the 'replaceable' */
+ElementSpecificationConstrainedby returns ElementSpec::uElementSpec :
+    {ElementSpec::EXTENDS} 'constrainedby' path=Path ( '('
+    elementArg+=ElementArg (',' elementArg+=ElementArg)* ')' )? annotationOpt=Annotation?
+    ;
+
+/* FIXME 'replaceable' both here and in InnerClass */
 ElementSpecificationClassDefinition returns ElementSpec::uElementSpec :
     {ElementSpec::CLASSDEF} /*replaceable_?=('replaceable')?*/ class_=InnerClass
@@ -245 +248 @@
 Equation returns Equation::uEquation :
     EquationIf | EquationEquals | EquationConnect | EquationFor | EquationWhenEq 
-    | EquationNoRetCall  //FIXME what is this doing? 
+    | EquationNoRetCall 
     //|EqFailure
     ;
@@ -309 +312 @@
     ;
 
-AlgorithmFor returns AlgorithmStatement::ALG_FOR :
-    'for' iterators=ForIterators 'loop' (forBody+=AlgorithmItem)* 'end' 'for'
+AlgorithmFor returns AlgorithmStatement::uAlgorithmStatement :
+    {AlgorithmStatement::ALG_FOR} 'for' iterators=ForIterators 'loop' (forBody+=AlgorithmItem)* 'end' 'for'
     ; 
 
@@ -341 +344 @@
     ;
     
-// TODO componentRef? constrain part
 ElementArg returns ElementArg::uElementArg :
     {ElementArg::MODIFICATION} each_=Each finalItem?=('final')? 
@@ -349 +351 @@
     redeclareKeywords=( ReplaceableKeyword | RedeclareReplaceableKeyword )
     elementSpec=( ElementSpecificationClassDefinition | ElementSpecificationComponents1 )
-    /* constrainClass=ConstrainClass? */
+    constrainClass=ConstrainClass?
     |{ElementArg::REDECLARATION} each_=Each finalItem?=('final') redeclareKeywords=RedeclareKeyword 
     elementSpec=( ElementSpecificationClassDefinition | ElementSpecificationComponents1 )
@@ -414 +416 @@
 
 ExprRange returns Exp::uExp :
-    ExprLogical ({Exp::RANGE.start=current} ':' step=ExprLogical (':' stop=ExprLogical)? )?
+    ExprLogical ({Exp::RANGE.start=current} ':'  stop=ExprLogical 
+    | {Exp::RANGE.start=current} ':' step=ExprLogical ':' stop=ExprLogical )?
     ;
     
@@ -432 +435 @@
 ExprRelation returns Exp::uExp :
     ExprArithmetic
-    ({Exp::RELATION.exp1=current}  op=( OperatorLess | OperatorLessEq | OperatorGreater | OperatorGreaterEq 
-        | OperatorEqual | OperatorNotEqual ) exp2=ExprArithmetic)?
+    ({Exp::RELATION.exp1=current}  op=OperatorLogical exp2=ExprArithmetic)?
     ;
 
 ExprArithmetic returns Exp::uExp :
     ExprUnaryArithmetic 
-    ({Exp::BINARY.exp1=current} op=(OperatorAdd | OperatorSub | OperatorAddEW | OperatorSubEW) exp2=ExprArithmetic2)?
+    ({Exp::BINARY.exp1=current} op=OperatorAddSub exp2=ExprArithmetic2)?
     ;
 
 ExprArithmetic2 returns Exp::uExp :
     ExprArithmeticTerm 
-    ({Exp::BINARY.exp1=current} op=(OperatorAdd | OperatorSub | OperatorAddEW | OperatorSubEW) exp2=ExprArithmetic2)?
+    ({Exp::BINARY.exp1=current} op=OperatorAddSub exp2=ExprArithmetic2)?
     ;
 
@@ -483 +485 @@
 
 ExprComponentRef returns Exp::uExp :
-    {Exp::CREF} componentReg=ComponentRef
+    {Exp::CREF} componentRef=ComponentRef
     ;
 
@@ -548 +550 @@
     Operators
 */
+
+OperatorLogical returns Operator::uOperator:
+    {Operator::LESS} '<' | {Operator::LESSEQ} '<=' | {Operator::GREATER} '>' 
+    | {Operator::GREATEREQ} '>=' | {Operator::EQUAL} '==' | {Operator::NEQUAL} ('><'|'!=')
+    ;
+
+OperatorAddSub returns Operator::uOperator:
+    {Operator::ADD} '+' | {Operator::SUB} '-' | {Operator::ADD_EW} '.+' | {Operator::SUB_EW} '.-'
+    ;
+
     
 OperatorAdd returns Operator::ADD :
@@ -620 +632 @@
     {Operator::LESS} '<'
     ;
-    
+
 OperatorLessEq returns Operator::LESSEQ :
     {Operator::LESSEQ} '<='
@@ -647 +659 @@
     ComponentReferenceQualified 
     |{ComponentRef::CREF_IDENT} 
-    name=IDENT ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')? 
+    ref=IDENT ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')? 
     //  {WILD}  
     ;
@@ -653 +665 @@
 ComponentReferenceQualified returns ComponentRef::uComponentRef  :  
     {ComponentRef::CREF_QUAL}
-    name=IDENT ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')? 
+    ref=IDENT ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')? 
     '.' componentRef=ComponentRef
     ;
@@ -680 +692 @@
     |{Restriction::R_FUNCTION} 'function'
     |{Restriction::R_ENUMERATION} 'enumeration'
-    //|{R_PREDEFINED_INT} 'Integer'
-    //|{R_PREDEFINED_REAL} 'Real'
-    //|{R_PREDEFINED_STRING} 'String'
-    //|{R_PREDEFINED_BOOL} 'Boolean'
+    //|{Restriction::R_PREDEFINED_INT} 'Integer'
+    //|{Restriction::R_PREDEFINED_REAL} 'Real'
+    //|{Restriction::R_PREDEFINED_STRING} 'String'
+    //|{Restriction::R_PREDEFINED_BOOL} 'Boolean'
     ;   
 
@@ -710 +722 @@
 */
 
+ForIterators returns Iterators::ForIterators :
+    forIterator+=ForIterator (',' forIterator+=ForIterator)*
+    ;
+
 ForIterator returns Iterators::ForIterator :
     tuple=ForIteratorTuple
-    ;
-
-ForIterators returns Iterators::ForIterators :
-    forIterator+=ForIterator (',' forIterator+=ForIterator)*
     ;