Fixes compilation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22359 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/Makefile.common

@@ -256,6 +256,7 @@ VarTransform.mo \
 # HashTable6.mo \
 
 SCRIPT = \
+BlockCallRewrite.mo \
 CevalScript.mo \
 Interactive.mo \
 GlobalScript.mo \

Compiler/Script/BlockCallRewrite.mo

@@ -1,9 +1,25 @@
 
-encapsulated package BlockCallRewrite 
+encapsulated package BlockCallRewrite
 " file:        BlockCallRewrite.mo
   package:     BlockCallRewrite
   description: This module implements an extension for properties modelling for calling blocks as functions.
-  					   It rewrites block calls into block instantiations.
+               It rewrites block calls into block instantiations.
 "
 
-end BlockCallRewrite;
+public import Absyn;
+protected import Error;
+
+public function rewriteBlockCall
+  input Absyn.Program inPg "Model containing block calls";
+  input Absyn.Program inDefs "Block definitions";
+  output Absyn.Program newOut "Standard Modelica output";
+algorithm
+  (newOut) := match(inPg, inDefs)
+    case (_, _)
+      equation
+        Error.addMessgae(Error.INTERNAL_ERROR,{"rewriteBlockCall is not implemented in RML; use the bootstrapped omc to use BlockCallRewrite.mo"});
+      then fail();
+  end match;
+end rewriteBlockCall;
+
+end BlockCallRewrite;

Compiler/Script/CevalScript.mo

@@ -1184,13 +1184,14 @@ algorithm
             p as Absyn.PROGRAM(globalBuildTimes=ts),instClsLst = ic, lstVarVal = iv,compiledFunctions = cf,
             loadedFiles = lf)),_)
       equation
+        absynClass = Interactive.getPathedClassInProgram(path, p);
+        classes = {absynClass};
         absynClass = Interactive.getPathedClassInProgram(classpath, p);
-        classes = {Interactive.getPathedClassInProgram(path, p)};
         within_ = Interactive.buildWithin(classpath);
         pnew = BlockCallRewrite.rewriteBlockCall(Absyn.PROGRAM({absynClass}, within_,ts), (Absyn.PROGRAM(classes, within_,ts)));
         newp = Interactive.updateProgram(pnew, p);
       then
-        (cache,Values.BOOL(true),GlobalScript.SYMBOLTABLE(newp,NONE(),ic,iv,cf,lf));   
+        (cache,Values.BOOL(true),GlobalScript.SYMBOLTABLE(newp,NONE(),ic,iv,cf,lf));
 
     case (cache, _, "rewriteBlockCall", _, st, _)
       then (cache, Values.BOOL(false), st);

Compiler/boot/LoadCompilerSources.mos

@@ -172,8 +172,8 @@ if true then /* Suppress output */
     "../Script/Interactive.mo",
     "../Script/Refactor.mo",
     "../Script/RewriteRules.mo",
-  "../Script/Figaro.mo",
-  "../Script/BlockCallRewrite.mo",
+    "../Script/Figaro.mo",
+    "../Script/BlockCallRewrite.bootstrapped.mo",
 
   // "Template";
     "../Template/AbsynDumpTpl.mo",