IF statements

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

Author: x97davka

modeq/dump.rml

@@ -271,6 +271,13 @@ relation print_equation: Absyn.Equation => () =
 	-------------------------------------------
 	print_equation(Absyn.EQ_EXPR(e))
 
+  rule	print "IF (" & print_exp(e) & print ") THEN " &
+	print_list(tb, print_equation, ";") &
+	print_list(eb, print_elseif, " ") &
+	print " ELSE " & print_list(fb, print_equation, ";")
+	----------------------------------------------------
+	print_equation(Absyn.EQ_IF(e,tb,eb,fb))
+	
   rule	print "EQ_EQUALS(" & print_exp(e1) & print "," &
 	print_exp(e2) & print ")"
 	-------------------------------------------
@@ -292,6 +299,17 @@ relation print_equation: Absyn.Equation => () =
 
 end
 
+(**)
+
+relation print_elseif : (Absyn.Exp * Absyn.Equation list) => () =
+
+  rule	print " ELSEIF " & print_exp e & print " THEN " &
+	print_list(el, print_equation, ";")
+	-----------------------------------
+	print_elseif((e,el))
+
+end
+
 (** - Algorithm clauses *)
 
 relation print_algorithm: Absyn.Algorithm => () =
@@ -412,9 +430,9 @@ relation print_exp: Absyn.Exp => () =
 	-----------------------------------------------------------------
 	print_exp(Absyn.RELATION(e1, op, e2))
 
-  rule	print "IF " & print_exp(c) &
-	print " THEN " & print_exp(t) &
-	print " ELSE " & print_exp(f)
+  rule	print "if " & print_exp(c) &
+	print " then " & print_exp(t) &
+	print " else " & print_exp(f)
 	----------------------------
 	print_exp(Absyn.IFEXP(c,t,f))
 

modeq/env.rml

@@ -17,15 +17,13 @@ module Env:
   with "classinf.rml"
   with "exp.rml"
 
+  type Binding = Types.Binding
+
   datatype FrameVar = FRAMEVAR of SCode.Ident
 			    	* Absyn.VarAttr
 			    	* Types.Type
 			    	* Binding
 
-  datatype Binding = UNBOUND
-		   | EQBOUND of Exp.Exp
-		   | VALBOUND of Values.Value
-
   datatype Frame = FRAME of (SCode.Ident*FrameVar) list
 			  * (SCode.Ident*SCode.Class) list