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

Timestamp:

11/19/09 00:28:56 (15 years ago)

Author:

nasko

Message:

added ecore models for elements, graphical annotation and GUI

File:

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

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

@@ -161 +161 @@
     
 // FIXME constrainedby clause   
-Element returns Element::uElement:
-    {Element::ELEMENT} specification=(ElementSpecificationImport|ElementSpecificationExtends) innerOuter=InnerOuterUnspecified
-    |{Element::ELEMENT} redeclareKeywords=RedeclareKeyword? finalPrefix?=('final')?
-        innerOuter=InnerOuter specification=(ElementSpecificationClassDefinition | ElementSpecificationComponents) 
-    |{Element::ELEMENT} redeclareKeywords=(RedeclareReplaceableKeyword | ReplaceableKeyword) innerOuter=InnerOuter 
-        specification=(ElementSpecificationClassDefinition | ElementSpecificationComponents) 
-        //('constrainedby' name=IDENT  constrainClass=ConstrainClass)?
-    
-    ;
-
+Element returns Element::ELEMENT:
+    innerOuter=InnerOuter (specification=ElementSpecificationImport | specification=ElementSpecificationExtends)
+    | redeclareKeywords=RedeclareKeyword? finalPrefix?='final'?
+        innerOuter=InnerOuter (specification=ElementSpecificationClassDefinition | specification=ElementSpecificationComponents) 
+    | (redeclareKeywords=RedeclareReplaceableKeyword | redeclareKeywords=ReplaceableKeyword) innerOuter=InnerOuter 
+        (specification=ElementSpecificationClassDefinition | specification=ElementSpecificationComponents)  
+    ;
+
+//('constrainedby' name=IDENT  constrainClass=ConstrainClass)?
 /*
 ConstrainClass returns uConstrainClass :
@@ -176 +175 @@
     ;
 */
+
 
 ElementSpecification returns ElementSpec::uElementSpec :
@@ -207 +207 @@
     |{InnerOuter::INNER} 'inner'
     |{InnerOuter::OUTER} 'outer'
-    |InnerOuterUnspecified
-    ;
-
-InnerOuterUnspecified returns InnerOuter::uInnerOuter :
-    {InnerOuter::UNSPECIFIED}
-    ;
+    |{InnerOuter::UNSPECIFIED}
+    ;
+
+//InnerOuterUnspecified returns InnerOuter::uInnerOuter :
+//  ;
 
 // FIXME the unqualified import- perhaps in a M2M transformation
@@ -230 +229 @@
 
 Component returns Component::uComponent :
-    {Component::COMPONENT} name=IDENT arrayDim=ArrayDim modification=Modification?
+    {Component::COMPONENT} name=IDENT arrayDim=ArrayDim? modification=Modification?
     ;
 
@@ -396 +395 @@
     
 ArrayDim returns ArrayDim::ArrayDim :
-    {ArrayDim::ArrayDim} ('[' subscripts+=Subscript (',' subscripts+=Subscript)* ']')?
+    {ArrayDim::ArrayDim} '[' subscripts+=Subscript (',' subscripts+=Subscript)* ']'
     ;