Array constructor added as syntactic sugar. {expr for iter in range} is created

as array(expr for iter in range) in Absyn. Implemented in walker.


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

Author: levsa

modeq/TODO

@@ -58,8 +58,7 @@ List of things to implement:
 	implementing them. Some of them are added to the builtin.rml,
 	some of them not.  15 days.
 
-14.	3.4.3.1 Reduction expressions (Not implemented at all, except
-	for in Absyn). (See also 3.4.4)  15 days.
+14.	3.4.3.1 Reduction expressions (Not implemented at all). (See also 3.4.4)  15 days.
 
 15.	Array access with end operator A[end]:=A[end-1];
 	Array access on the form A[{1,2,3}] (in ceval)
@@ -118,9 +117,16 @@ List of things to implement:
 
 25.	Array construction (3.4.4.1). Using array(... for ...)
 	syntax. Related to 14, should be done after or together with 14.
+	Partially implemented. Left to do:
+	* Constant evaluation and/or optimization. Could be implemented 
+	  as function calls with index as argument. Or array can be unrolled and indexed, or if 
+	  constant value can be calculated and indexed. Array should then be cached.
+	* Automatic type conversion of element type, e.g. (Real[]) a[5] = {(Integer)3 for ...} fails.
+	* Handle multiple iterators
 
 26.	Array constructors with iterators. Using {expr for i in ...}
 	syntax. Related to 14 and 25.
+	Implemented in walker which generates array() call (see 25.).
 
 27.	Deduction of ranges (3.3.3.1). It is allowed to leave out "in
 	range" in loops. e.g. 

modeq/absyn.rml

@@ -256,7 +256,6 @@ module Absyn:
 	       | TUPLE of Exp list (*PR.*)
 	       | END
 	       | CODE of Code
-	       | FOR_ITER_EXP of Exp * Ident * Exp
 
   (** The `Exp' datatype is the container of a Modelica expression. *)
 

modeq/absyn_builder/walker.g

@@ -1525,6 +1525,11 @@ primary returns [void* ast]
 			}
 		| #(LBRACE ( (ast = expression_list) { ast = Absyn__ARRAY(ast); }
                    | #(FOR_ITERATOR ast = for_iterator)
+                    {
+                        /* create an array constructor as a reduction expression */
+                        /* for unified handling in compiler */
+                        ast = Absyn__CALL(Absyn__CREF_5fIDENT(mk_scon("array"), mk_nil()),ast);
+                    }
                 ))
 		| END { ast = Absyn__END; }
 		)