- Modelica 3.0 grammar updates!

+ added constrainedby to the grammar + now the entire Modelica Standard Library 3.0 can be parsed. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3383 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 16, 2008 · 7f7a1ea · 7f7a1ea
1 parent 421ebaa
commit 7f7a1ea
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/Compiler/absyn_builder/walker.g b/Compiler/absyn_builder/walker.g
@@ -856,8 +856,22 @@ extends_clause returns [void* ast]
 		)
 	;
 
-constraining_clause returns [void *ast] :
-		(ast = extends_clause)
+constraining_clause returns [void *ast] 
+{
+	void* path;
+	void* mod = 0;
+}
+    :
+		  (ast = extends_clause)
+		| (#(e:CONSTRAINEDBY 
+				path = name_path 
+				( mod = class_modification )? 
+			)
+			{
+				if (!mod) mod = mk_nil();
+				ast = Absyn__EXTENDS(path,mod);
+			}
+		)		
 	;
 
 // returns datatype ElementSpec

diff --git a/flat_modelica_parser/src/flat_modelica_lexer.g b/flat_modelica_parser/src/flat_modelica_lexer.g
@@ -69,6 +69,7 @@ tokens {
 	ENCAPSULATED	= "encapsulated";
     EXPANDABLE  = "expandable";
 	EXTENDS		= "extends"	;
+	CONSTRAINEDBY =  "constrainedby" ;
 	EXTERNAL	= "external"	;
 	FALSE		= "false"	;
 	FINAL		= "final"	;

diff --git a/flat_modelica_parser/src/flat_modelica_parser.g b/flat_modelica_parser/src/flat_modelica_parser.g
@@ -408,7 +408,7 @@ extends_clause :
 		;
 
 constraining_clause :
-		extends_clause
+		extends_clause | CONSTRAINEDBY^ name_path ( class_modification )?
 		;
 
 /*

diff --git a/modelica_parser/src/modelica_lexer.g b/modelica_parser/src/modelica_lexer.g
@@ -68,7 +68,8 @@ tokens {
 	EQUATION	= "equation"	;
 	ENCAPSULATED	= "encapsulated";
     EXPANDABLE  = "expandable";
-	EXTENDS		= "extends"	;
+	EXTENDS		= "extends" ;
+	CONSTRAINEDBY =  "constrainedby" ;
 	EXTERNAL	= "external"	;
 	FALSE		= "false"	;
 	FINAL		= "final"	;

diff --git a/modelica_parser/src/modelica_parser.g b/modelica_parser/src/modelica_parser.g
@@ -408,7 +408,7 @@ extends_clause :
 		;
 
 constraining_clause :
-		extends_clause
+		extends_clause | CONSTRAINEDBY^ name_path ( class_modification )?
 		;
 
 /*