Some fixes for separate compilation

- Make sure all package are marked encapsulated since otherwise it does not work
- Moved generation of literals to the body instead of the header (they have to be there since we want to include headers from other files)


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

Author: sjoelund

Compiler/BackEnd/MathematicaDump.mo

@@ -1,4 +1,4 @@
-package MathematicaDump "Copyright (C) MathCore Engineering AB, 2005 "
+encapsulated package MathematicaDump "Copyright (C) MathCore Engineering AB, 2005 "
 
   import BackendDAE;
   import BackendVariable;
@@ -23,7 +23,7 @@ algorithm
     local
       BackendDAE.Variables vars,knvars;
       list<BackendDAE.Equation> eqns,ieqns;
-      String allVarStr,s1_1,s1_2,s1_3,s1_4,s1_5,s3,s4,res;
+      String allVarStr,s1_1,s1_2,s1_3,s1_4,s1_5,s3,s4;
       list<String> params,inputs,states,algs,outputs,inputsStates;
     case((vars,knvars,eqns,ieqns)) equation
 
@@ -793,7 +793,7 @@ algorithm
   (params, inputs) := match(knvars)
     local
       list<BackendDAE.Var> varLst;
-    case(knvars) equation
+    case _ equation
       varLst = BackendVariable.varList(knvars);
       params = List.map(varLst,printMmaParamStr);
       inputs = List.map(varLst,printMmaInputStr);

Compiler/BackEnd/Uncertainties.mo

@@ -1,4 +1,4 @@
-package Uncertainties
+encapsulated package Uncertainties
 
   import DAE;
   import Absyn;

Compiler/Script/CevalScript.mo

@@ -4556,7 +4556,7 @@ protected function generateFunctions
   input list<tuple<String,list<String>>> iacc;
   output list<tuple<String,list<String>>> deps;
 algorithm
-  deps := match (icache,ienv,p,isp,iacc)
+  deps := matchcontinue (icache,ienv,p,isp,iacc)
     local
       String name;
       list<String> names,dependencies;
@@ -4568,14 +4568,14 @@ algorithm
       list<SCode.Element> sp;
       Env.Cache cache;
       Env.Env env;
+      String file;
+      Integer n;
+      Absyn.Info info;
 
     case (cache,env,_,{},acc) then acc;
-    case (cache,env,_,SCode.CLASS(name="OpenModelica")::sp,acc)
-      equation
-        acc = generateFunctions(cache,env,p,sp,acc);
-      then acc;
-    case (cache,env,_,SCode.CLASS(name=name,encapsulatedPrefix=SCode.ENCAPSULATED(),restriction=SCode.R_PACKAGE(),classDef=SCode.PARTS(elementLst=elementLst))::sp,acc)
+    case (cache,env,_,SCode.CLASS(name=name,encapsulatedPrefix=SCode.ENCAPSULATED(),restriction=SCode.R_PACKAGE(),classDef=SCode.PARTS(elementLst=elementLst),info=info as Absyn.INFO(fileName=file))::sp,acc)
       equation
+        (0,_) = System.regex(file, "ModelicaBuiltin.mo$", 1, false, false);
         names = List.map(List.filterOnTrue(List.map(List.filterOnTrue(elementLst, SCode.elementIsClass), SCode.getElementClass), SCode.isFunction), SCode.className);
         paths = List.map1r(names,Absyn.makeQualifiedPathFromStrings,name);
         cache = instantiateDaeFunctions(cache, env, paths);
@@ -4589,11 +4589,13 @@ algorithm
         SimCodeMain.translateFunctions(p, name, NONE(), d, {}, dependencies);
         acc = generateFunctions(cache,env,p,sp,acc);
       then acc;
-    case (cache,env,_,_::sp,acc)
+    case (cache,env,_,SCode.CLASS(name=name,info=info as Absyn.INFO(fileName=file))::sp,acc)
       equation
+        (n,_) = System.regex(file, "ModelicaBuiltin.mo$", 1, false, false);
+        Error.assertion(n > 0, "Not an encapsulated class (required for separate compilation): " +& name, info);
         acc = generateFunctions(cache,env,p,sp,acc);
       then acc;
-  end match;
+  end matchcontinue;
 end generateFunctions;
 
 protected function matchQualifiedCalls

Compiler/Template/CodegenC.tpl

@@ -94,8 +94,8 @@ template translateFunctions(FunctionCode functionCode)
   case FUNCTIONCODE(__) then
     let filePrefix = name
     let _= (if mainFunction then textFile(functionsMakefile(functionCode), '<%filePrefix%>.makefile'))
-    let()= textFile(functionsHeaderFile(filePrefix, mainFunction, functions, extraRecordDecls, externalFunctionIncludes, literals), '<%filePrefix%>.h')
-    let()= textFile(functionsFile(filePrefix, mainFunction, functions), '<%filePrefix%>.c')
+    let()= textFile(functionsHeaderFile(filePrefix, mainFunction, functions, extraRecordDecls, externalFunctionIncludes), '<%filePrefix%>.h')
+    let()= textFile(functionsFile(filePrefix, mainFunction, functions, literals), '<%filePrefix%>.c')
     let()= textFile(recordsFile(filePrefix, extraRecordDecls), '<%filePrefix%>_records.c')
     // If ParModelica generate the kernels file too.
     if acceptParModelicaGrammar() then
@@ -3275,11 +3275,15 @@ end commonHeader;
 
 template functionsFile(String filePrefix,
                        Option<Function> mainFunction,
-                       list<Function> functions)
+                       list<Function> functions,
+                       list<Exp> literals)
  "Generates the contents of the main C file for the function case."
 ::=
   <<
   #include "<%filePrefix%>.h"
+  <% /* Note: The literals may not be part of the header due to separate compilation */
+     literals |> literal hasindex i0 fromindex 0 => literalExpConst(literal,i0) ; separator="\n";empty
+  %>
   #include "modelica.h"
   void (*omc_assert)(FILE_INFO info,const char *msg,...) = omc_assert_function;
   void (*omc_assert_warning)(FILE_INFO info,const char *msg,...) = omc_assert_warning_function;
@@ -3296,8 +3300,7 @@ template functionsHeaderFile(String filePrefix,
                        Option<Function> mainFunction,
                        list<Function> functions,
                        list<RecordDeclaration> extraRecordDecls,
-                       list<String> includes,
-                       list<Exp> literals)
+                       list<String> includes)
  "Generates the contents of the main C file for the function case."
 ::=
   <<
@@ -3313,8 +3316,6 @@ template functionsHeaderFile(String filePrefix,
   <%functionHeaders(functions)%>
   <%externalFunctionIncludes(includes)%>
 
-  <%literals |> literal hasindex i0 fromindex 0 => literalExpConst(literal,i0) ; separator="\n";empty%>
-
   #ifdef __cplusplus
   }
   #endif

configure.in

@@ -59,6 +59,7 @@ AC_SUBST(LIBSIMULATION)
 AC_SUBST(LIBRUNTIME)
 AC_SUBST(LIBFMIRUNTIME)
 AC_SUBST(SHREXT)
+AC_SUBST(LINK)
 
 FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
 
@@ -653,6 +654,7 @@ if test "Darwin" = `uname`; then
   LIBRUNTIME=libOpenModelicaRuntimeC.a
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
   RT_LDFLAGS="$RT_LDFLAGS -liconv -lgc $OPENMP"
+  LINK="cp -fr"
 else
   EXE=""
   SHREXT=".so"
@@ -661,6 +663,7 @@ else
   LIBRUNTIME=libOpenModelicaRuntimeC.so
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
   RT_LDFLAGS="$RT_LDFLAGS -lrt -lgc $OPENMP"
+  LINK="cp -frl"
 fi
 
 dnl should we compile modpar