- Removed unused delayed type checking to simplify SCode.Mod.

OpenModelica · May 12, 2015 · ed483a2 · ed483a2
1 parent 475d005
commit ed483a2
Show file tree

Hide file tree

Showing 18 changed files with 146 additions and 253 deletions.
diff --git a/Compiler/BackEnd/Uncertainties.mo b/Compiler/BackEnd/Uncertainties.mo
@@ -628,7 +628,7 @@ protected function isApproximatedEquation3
   output Boolean out;
 algorithm
 out:= match(m)
-  case(SCode.NAMEMOD("__OpenModelica_ApproximatedEquation",SCode.MOD(binding = SOME((Absyn.BOOL(true),_)))))
+  case(SCode.NAMEMOD("__OpenModelica_ApproximatedEquation",SCode.MOD(binding = SOME(Absyn.BOOL(true)))))
      then true;
   case(_)
      then false;

diff --git a/Compiler/FFrontEnd/FGraphBuild.mo b/Compiler/FFrontEnd/FGraphBuild.mo
@@ -203,7 +203,7 @@ algorithm
       Ref nr;
       SCode.Element e;
       list<SCode.SubMod> sm;
-      Option<tuple<Absyn.Exp, Boolean>> b;
+      Option<Absyn.Exp> b;
       Absyn.Path p;
 
     // no mods
@@ -290,7 +290,7 @@ algorithm
 end mkSubMods;
 
 public function mkBindingNode
-  input Option<tuple<Absyn.Exp, Boolean>> inBinding;
+  input Option<Absyn.Exp> inBinding;
   input Ref inParentRef;
   input Kind inKind;
   input Graph inGraph;
@@ -308,7 +308,7 @@ algorithm
     case (NONE(), _, _, g) then g;
 
     // some binding
-    case (SOME((e, _)), _, _, g)
+    case (SOME(e), _, _, g)
       equation
         g = mkExpressionNode(FNode.bndNodeName, e, inParentRef, inKind, g);
       then

diff --git a/Compiler/FFrontEnd/FGraphBuildEnv.mo b/Compiler/FFrontEnd/FGraphBuildEnv.mo
@@ -198,7 +198,7 @@ algorithm
       Ref nr;
       SCode.Element e;
       list<SCode.SubMod> sm;
-      Option<tuple<Absyn.Exp, Boolean>> b;
+      Option<Absyn.Exp> b;
 
     // no mods
     case (_, SCode.NOMOD(), _, _, g) then g;
@@ -279,7 +279,7 @@ algorithm
 end mkSubMods;
 
 public function mkBindingNode
-  input Option<tuple<Absyn.Exp, Boolean>> inBinding;
+  input Option<Absyn.Exp> inBinding;
   input Ref inParentRef;
   input Kind inKind;
   input Graph inGraph;
@@ -297,7 +297,7 @@ algorithm
     case (NONE(), _, _, g) then g;
 
     // some binding
-    case (SOME((e, _)), _, _, g)
+    case (SOME(e), _, _, g)
       equation
         g = mkExpressionNode(FNode.bndNodeName, e, inParentRef, inKind, g);
       then

diff --git a/Compiler/FFrontEnd/FMod.mo b/Compiler/FFrontEnd/FMod.mo
@@ -199,7 +199,7 @@ algorithm
       SCode.Final fp;
       SCode.Each ep;
       list<SCode.SubMod> submods1, submods2;
-      Option<tuple<Absyn.Exp, Boolean>> binding;
+      Option<Absyn.Exp> binding;
       SourceInfo info1, info2;
       SCode.Mod mod1, mod2;
 

diff --git a/Compiler/FrontEnd/InstExtends.mo b/Compiler/FrontEnd/InstExtends.mo
@@ -1768,7 +1768,6 @@ algorithm
       SCode.Each eachPrefix;
       list<SCode.SubMod> subModLst;
       Absyn.Exp exp;
-      Boolean b;
       SCode.Element elt;
       FCore.Cache cache;
       FCore.Graph env;
@@ -1778,12 +1777,12 @@ algorithm
 
     case (cache,_,SCode.NOMOD(),_) then (cache,SCode.NOMOD());
 
-    case (cache,env,SCode.MOD(finalPrefix,eachPrefix,subModLst,SOME((exp,b)),info),ht)
+    case (cache,env,SCode.MOD(finalPrefix,eachPrefix,subModLst,SOME(exp),info),ht)
       equation
         (cache, subModLst) = fixSubModList(cache, env, subModLst, ht);
         (cache,exp) = fixExp(cache,env,exp,ht);
       then
-        (cache,SCode.MOD(finalPrefix,eachPrefix,subModLst,SOME((exp,b)),info));
+        (cache,SCode.MOD(finalPrefix,eachPrefix,subModLst,SOME(exp),info));
 
     case (cache,env,SCode.MOD(finalPrefix,eachPrefix,subModLst,NONE(),info),ht)
       equation