2006-01-16 - adrpo@ida.liu.se

- refactorings of .rml files to make translation easier + comment handling + types + imports git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2037 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 16, 2006 · 179e030 · 179e030
1 parent 9f96ed0
commit 179e030
Show file tree

Hide file tree

Showing 8 changed files with 2,415 additions and 1,603 deletions.
diff --git a/Compiler/Absyn.rml b/Compiler/Absyn.rml
diff --git a/Compiler/Algorithm.rml b/Compiler/Algorithm.rml
@@ -123,6 +123,7 @@ with "Print.rml"
 with "Dump.rml"
 with "Debug.rml"
 with "Error.rml"
+with "Absyn.rml"
 
 (** relation: make_assignment
  **

diff --git a/Compiler/Ceval.rml b/Compiler/Ceval.rml
@@ -771,9 +771,12 @@ end
  **
  ** Succeds if external function name is "known", i.e. no compilation
  ** required.
-**)
+ **
+ ** inputs:  (SCode.Ident /* string */, Absyn.Ident option /* string option */) 
+ ** outputs: ()
+ **)
 
-relation is_known_external_func:( SCode.Ident, Absyn.Ident option) => () =
+relation is_known_external_func:(string, string option) => () =
 
   axiom	is_known_external_func("acos",SOME("acos"))
   axiom	is_known_external_func("asin",SOME("asin"))

diff --git a/Compiler/DAELow.rml b/Compiler/DAELow.rml
diff --git a/Compiler/Error.rml b/Compiler/Error.rml
@@ -663,8 +663,8 @@ relation add_message: ( ErrorID,MessageTokens) => () =
 
   rule	lookup_message(error_id) => (msg_type, severity, msg) &
 	message_type_str(msg_type) => msg_type_str &
-	severity_str(severity) => severity_str &
-	ErrorExt.add_message(error_id,msg_type_str,severity_str,msg,tokens)
+	severity_str(severity) => severity_string &
+	ErrorExt.add_message(error_id,msg_type_str,severity_string,msg,tokens)
 	---------------------------
 	add_message(error_id,tokens) => ()
 
@@ -688,8 +688,8 @@ relation add_source_message: ( ErrorID,MessageTokens, Absyn.Info) => () =
 
   rule	lookup_message(error_id) => (msg_type, severity, msg) &
 	message_type_str(msg_type) => msg_type_str &
-	severity_str(severity) => severity_str &
-	ErrorExt.add_source_message(error_id,msg_type_str,severity_str,
+	severity_str(severity) => severity_string &
+	ErrorExt.add_source_message(error_id,msg_type_str,severity_string,
 				    line,col,file,
 				    msg,tokens )
 	---------------------------