- Instantiation/typing of functions for SCodeInst.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11948 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 29, 2012 · 7302fe4 · 7302fe4
1 parent 5c26799
commit 7302fe4
Show file tree

Hide file tree

Showing 11 changed files with 469 additions and 73 deletions.
diff --git a/Compiler/FrontEnd/InstTypes.mo b/Compiler/FrontEnd/InstTypes.mo
@@ -275,4 +275,12 @@ public uniontype Equation
   end NORETCALL_EQUATION;
 end Equation;
 
+public uniontype FunctionSlot
+  record SLOT
+    String name;
+    Option<DAE.Exp> arg;
+    Option<DAE.Exp> defaultValue;
+  end SLOT;
+end FunctionSlot;
+
 end InstTypes;
diff --git a/Compiler/FrontEnd/InstUtil.mo b/Compiler/FrontEnd/InstUtil.mo
@@ -462,6 +462,21 @@ algorithm
   end match;
 end getBindingExp;
 
+public function getBindingExpOpt
+  input Binding inBinding;
+  output Option<DAE.Exp> outExp;
+algorithm
+  outExp := match(inBinding)
+    local
+      DAE.Exp exp;
+
+    case InstTypes.UNTYPED_BINDING(bindingExp = exp) then SOME(exp);
+    case InstTypes.TYPED_BINDING(bindingExp = exp) then SOME(exp);
+    else NONE();
+
+  end match;
+end getBindingExpOpt;
+
 public function makeEnumType
   input list<SCode.Enum> inEnumLiterals;
   input Absyn.Path inEnumPath;

diff --git a/Compiler/FrontEnd/SCodeDependency.mo b/Compiler/FrontEnd/SCodeDependency.mo
@@ -170,14 +170,14 @@ algorithm
     case (Absyn.IDENT(name = _), _, _, _)
       equation
         (item, _, env, _) = 
-          SCodeLookup.lookupName(inPath, inEnv, inInfo, NONE());
+          SCodeLookup.lookupNameSilent(inPath, inEnv, inInfo);
       then
         (item, env);
 
     case (Absyn.QUALIFIED(name = id, path = rest_path), _, _, _)
       equation
         (item, _, env, _) = 
-          SCodeLookup.lookupName(Absyn.IDENT(id), inEnv, inInfo, NONE());
+          SCodeLookup.lookupNameSilent(Absyn.IDENT(id), inEnv, inInfo);
         analyseItem(item, env);
         (item, env) = lookupNameInItem(rest_path, item, env, inPrintError);
       then  
@@ -1098,7 +1098,7 @@ algorithm
 
     case (_, _, _)
       equation
-        (item, _, env, _) = SCodeLookup.lookupName(inPath, inEnv, inInfo, NONE());
+        (item, _, env, _) = SCodeLookup.lookupNameSilent(inPath, inEnv, inInfo);
       then
         (SOME(item), SOME(env));
 
@@ -1286,7 +1286,7 @@ protected
   Env env;
 algorithm
   (item, _, env, _) := 
-    SCodeLookup.lookupName(Absyn.IDENT(inName), inEnv, inInfo, NONE());
+    SCodeLookup.lookupNameSilent(Absyn.IDENT(inName), inEnv, inInfo);
   analyseItem(item, env);
 end analyseAnnotationName;
 

diff --git a/Compiler/FrontEnd/SCodeEnv.mo b/Compiler/FrontEnd/SCodeEnv.mo
@@ -895,7 +895,7 @@ algorithm
       equation
         bc = Absyn.removePartialPrefix(getEnvPath(inEnv), inBaseClass);
         (item, bc, env, _) = 
-          SCodeLookup.lookupName(inBaseClass, inEnv, inInfo, NONE());
+          SCodeLookup.lookupNameSilent(inBaseClass, inEnv, inInfo);
         bc = mergePathWithEnvPath(bc, env);
       then
         (SOME(bc), SOME(item));

diff --git a/Compiler/FrontEnd/SCodeFlatten.mo b/Compiler/FrontEnd/SCodeFlatten.mo
@@ -155,8 +155,8 @@ algorithm
   _ := matchcontinue(inEnv)
     case _
       equation
-        (_, _, _, _) = SCodeLookup.lookupName(Absyn.IDENT("cardinality"), inEnv,
-          Absyn.dummyInfo, NONE());
+        (_, _, _, _) = SCodeLookup.lookupNameSilent(Absyn.IDENT("cardinality"),
+          inEnv, Absyn.dummyInfo);
         System.setUsesCardinality(true);
       then
         ();

diff --git a/Compiler/FrontEnd/SCodeFlattenRedeclare.mo b/Compiler/FrontEnd/SCodeFlattenRedeclare.mo
@@ -629,7 +629,7 @@ algorithm
         path = Absyn.crefToPath(inCref);
         (SCodeEnv.VAR(var = SCode.COMPONENT(name = name, attributes = SCode.ATTR(
             variability = SCode.CONST()))), path, env, SCodeLookup.CLASS_ORIGIN()) = 
-          SCodeLookup.lookupName(path, inEnv, Absyn.dummyInfo, NONE());
+          SCodeLookup.lookupNameSilent(path, inEnv, Absyn.dummyInfo);
         path = SCodeEnv.mergePathWithEnvPath(Absyn.IDENT(name), env);
         cref = Absyn.pathToCref(path);
       then