starting indomain implementation

OpenModelica · Feb 10, 2016 · 6defd95 · 6defd95
1 parent 9090acd
commit 6defd95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Compiler/FrontEnd/Absyn.mo b/Compiler/FrontEnd/Absyn.mo
@@ -463,6 +463,7 @@ uniontype Equation "Information on one (kind) of equation, different constructor
   record EQ_EQUALS
     Exp leftSide "leftSide" ;
     Exp rightSide "rightSide Connect stmt" ;
+    Option<ComponentRef> domain "domain for PDEs" ;
   end EQ_EQUALS;
 
   record EQ_CONNECT

diff --git a/Parser/BaseModelica_Lexer.g b/Parser/BaseModelica_Lexer.g
@@ -154,6 +154,7 @@ END_PARFOR;
 // ---------
 
 FIELD;
+INDOMAIN;
 
 // ---------
 // Operators
@@ -298,6 +299,7 @@ CONSTRAINT : 'constraint' { if (!optimica_enabled()) $type = IDENT; };
 
 FIELD : 'field';
 NONFIELD : 'nonfield';
+INDOMAIN : 'indomain';
 
 /*------------------------------------------------------------------
  * LEXER RULES

diff --git a/Parser/Modelica.g b/Parser/Modelica.g
@@ -896,12 +896,16 @@ assign_clause_a returns [void* ast]
   ;
 
 equality_or_noretcall_equation returns [void* ast]
-@init { ass = 0; e1 = 0; ass = 0; e2.ast = 0; } :
+@init { ass = 0; e1 = 0; ass = 0; e2.ast = 0; dom = 0;} :
   e1=simple_expression
-    (  (EQUALS | ass=ASSIGN) e2=expression[metamodelica_enabled()]
+    (  (EQUALS | ass=ASSIGN) e2=expression[metamodelica_enabled()] (INDOMAIN dom=component_reference)
       {
         modelicaParserAssert(ass==0,"Equations can not contain assignments (':='), use equality ('=') instead", equality_or_noretcall_equation, $ass->line, $ass->charPosition+1, $ass->line, $ass->charPosition+2);
-        $ast = Absyn__EQ_5fEQUALS(e1,e2.ast);
+        if (dom = 0) {
+            $ast = Absyn__EQ_5fEQUALS(e1,e2.ast,mmc_mk_none());
+        } else {
+            $ast = Absyn__EQ_5fEQUALS(e1,e2.ast,mmc_mk_some(dom));
+        }
       }
     | {LA(1) != EQUALS && LA(1) != ASSIGN}? /* It has to be a CALL */
        {