Fixed the imports as there are intermediate results from function calls

that require additional module imports. Please DO NOT TAKE THEM OUT. Made the rml2mod translator run ~50% faster. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2245 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 24, 2006 · af61583 · af61583
1 parent 13ea309
commit af61583
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 2 deletions.
diff --git a/Compiler/Algorithm.rml b/Compiler/Algorithm.rml
@@ -122,8 +122,8 @@ with "Util.rml"
 with "Print.rml"
 with "Debug.rml"
 with "Error.rml"
-(* adrpo -- not used
 with "Absyn.rml"
+(* adrpo -- not used
 with "Dump.rml" 
 *)
 

diff --git a/Compiler/DAE.rml b/Compiler/DAE.rml
@@ -216,6 +216,7 @@ with "Ceval.rml"
 with "ModUtil.rml"
 with "Debug.rml"
 with "Error.rml"
+with "SCode.rml"
 
 (** relation: dump
  **

diff --git a/Compiler/Main.rml b/Compiler/Main.rml
@@ -76,6 +76,7 @@ with "TaskGraphExt.rml"
 with "SimCodegen.rml"
 with "ErrorExt.rml"
 with "Error.rml"
+with "Types.rml"
 (* adrpo -- not used
 with "ModUtil.rml"
 with "Codegen.rml"

diff --git a/Compiler/ModUtil.rml b/Compiler/ModUtil.rml
@@ -74,6 +74,8 @@ end
 
 with "RTOpts.rml"
 with "Util.rml"
+with "Algorithm.rml"
+with "Types.rml"
 (* adrpo -- not used
 with "Print.rml"
 *)

diff --git a/Compiler/SimCodegen.rml b/Compiler/SimCodegen.rml
@@ -133,6 +133,8 @@ with "Dump.rml"
 with "Inst.rml"
 with "Error.rml"
 with "Settings.rml"
+with "Algorithm.rml"
+with "Types.rml"
 
 (** relation: generate_makefile
  **

diff --git a/Compiler/VarTransform.rml b/Compiler/VarTransform.rml
@@ -106,6 +106,7 @@ with "System.rml"
 with "Util.rml" 
 with "Algorithm.rml"
 with "Debug.rml"
+with "Absyn.rml"
 
 (** relation: apply_replacements
  **

diff --git a/tools/rml2mod/rmltomod.rml b/tools/rml2mod/rmltomod.rml
@@ -1396,6 +1396,8 @@ end
 
 relation is_function =
 
+  axiom  is_function ("vars_size", _) => false
+
   rule	Dictionary.search(dict, mid) => SOME(Absyn.RMLDB_REL(_,_,_,_)) 
 		-----------------------------------------------------------------
 		is_function(mid,PDB(_, dict)) => true
@@ -1471,12 +1473,14 @@ relation transform_expression =
 		transform_expression(Absyn.RML_REFERENCE(id),pdb) => 
 		Absyn.CREF(cref)
 
+(*
   rule	get_rml_id2(id) => mid &
 		is_variable(id, pdb) => true &
 		create_cref(mid) => cref 
 		---------------------------
 		transform_expression(Absyn.RML_REFERENCE(id),pdb) => 
-		Absyn.CREF(cref)				
+		Absyn.CREF(cref)
+*)
 
   rule	get_rml_id2(id) => mid &
 		is_function(mid, pdb) => true &