corrected the elab_builtin_diagonal to return an array of array. Added comments

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

Author: x02lucpo

modeq/ceval.rml

@@ -1572,6 +1572,12 @@ relation ceval_builtin_integer : (Env.Env, Exp.Exp, bool, Interactive.Interactiv
 
 end
 
+(* relation ceval_builtin_diagonal
+** This relation generates a matrix[n,n] (A) of the vector {a,b,...,n}
+** where the diagonal of A is the vector {a,b,...,n}
+** ie A[1,1] == a, A[2,2] == b ...
+*)
+
 relation ceval_builtin_diagonal : (Env.Env, Exp.Exp, bool, Interactive.InteractiveSymbolTable option) 
 	=> (Values.Value, Interactive.InteractiveSymbolTable option) =
 
@@ -1598,6 +1604,9 @@ relation ceval_builtin_diagonal : (Env.Env, Exp.Exp, bool, Interactive.Interacti
 
 end
 
+(* this is a help relation that is calling itself recursively to 
+ generate the a nxn matrix with some special diagonal elements. 
+ see ceval_builtin_diagonal *)
 
 relation ceval_builtin_diagonal2 : (Env.Env, Exp.Exp, bool, Interactive.InteractiveSymbolTable option, int, int,  Values.Value list  ) 
 		=>  Values.Value list =

modeq/staticexp.rml

@@ -1455,16 +1455,17 @@ end
 
 relation elab_builtin_diagonal : (Env.Env, Absyn.Exp list) => (Exp.Exp, Types.Properties)	=
 
-   rule 	Debug.fprint("failtrace", "elab_builtin_diagonal\n") &
+  rule 	Debug.fprint("failtrace", "elab_builtin_diagonal\n") &
 		elab_exp (env,s1,false,NONE) 
-	      => (s1', Types.PROP((Types.T_ARRAY(Types.DIM(SOME(dimension)),arrType),NONE),c),_)
+	      => (s1', Types.PROP((Types.T_ARRAY(dim as Types.DIM(SOME(dimension)),arrType),NONE),c),_)
           (**print "# integer function not implemented yet REAL\n" **)
-     --------------------------------------
-     elab_builtin_diagonal(env,[s1]) 
-        => (Exp.CALL(Absyn.IDENT("diagonal"),[s1'],false,false),
-                 Types.PROP((Types.T_ARRAY(Types.DIM(SOME(dimension)),arrType),NONE),c))
+        --------------------------------------
+        elab_builtin_diagonal(env,[s1]) 
+          => (
+              Exp.CALL(Absyn.IDENT("diagonal"),[s1'],false,false),
+              Types.PROP((Types.T_ARRAY(dim,(Types.T_ARRAY(dim,arrType),NONE)),NONE),c))
 
-       
+      
   rule  print"#-- elab_builtin_diagonal: Couldn't elaborate diagonal()\n"
 	    ---------------------------------------------------------
 	    elab_builtin_diagonal (_,_) => fail