Modifed the grammar to accept multiple return values from functions.

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

Author: x98petro

modeq/ast/modgram.g

@@ -424,7 +424,7 @@ argument :
 
 element_modification : << bool is_final=false; >>
 	{ FINAL << is_final=true; >> } 
-	cr:component_reference /* name_path /* Not in spec */
+	cr:single_component_reference /* name_path /* Not in spec */
 	sp:modification
 	<< 
 	   Attrib a = $[MODIFICATION,"---"];
@@ -517,7 +517,7 @@ equation : << bool is_assign = false; AST *top; >>
 	;
 
 algorithm :
-	( cr:component_reference
+	( cr:single_component_reference
 	  ( ASSIGN^ e:expression
 	    << #0->rml = Absyn__ALG_5fASSIGN(#cr->rml, #e->rml); >>
 	  | function_call << unimpl("algorithm function_call"); >> )
@@ -752,14 +752,16 @@ primary : << bool is_matrix; >>
 	| f:FALS/*E*/        << #f->rml = Absyn__BOOL(RML_FALSE); >>
 	| t:TRU/*E*/         << #t->rml = Absyn__BOOL(RML_TRUE); >>
 /* 	| (name_path_function_arguments)? */
-	| i:component_reference
+	/*		| i:single_component_reference
 	  { fc:function_call }
 	  << if(#fc)
 	       #0->rml = Absyn__CALL(#i->rml,#fc->rml);
      	     else
 	       #0->rml = Absyn__CREF(#i->rml);
           >>
-	| s:STRING << #s->rml = Absyn__STRING(mk_scon($s.u.stringval)); >>
+	  */
+	| component_references 
+      	| s:STRING << #s->rml = Absyn__STRING(mk_scon($s.u.stringval)); >>
 	| par:LPAR^
 	  e:expression RPAR!
 	  << #par->rml = #e->rml; >>
@@ -776,6 +778,15 @@ primary : << bool is_matrix; >>
 	  RBRACK!
 	;
 
+component_references:
+	  single_component_reference { function_or_multiple_references }
+       ;
+
+function_or_multiple_references:
+	    function_call 
+	    | "," single_component_reference { "," single_component_reference }
+	  ;
+
 /* name_path_function_arguments ! : << Attrib a = $[FUNCALL,"---"]; >> */
 /* 	n:name_path f:function_arguments */
 /* 	<<  */
@@ -802,10 +813,10 @@ name_path : << bool qualified = false; >>
 /* 	name_path b:LBRACK^ subscript_list RBRACK! */
 /* 	; */
 
-component_reference : << void *tail = NULL;>>
+single_component_reference : << void *tail = NULL;>>
 	  i:IDENT^ { a:array_subscripts }
 	  << #i->rml = mk_scon($i.u.stringval); >>
-	  { dot:DOT^ c:component_reference << tail = #c->rml; >> }
+	  { dot:DOT^ c:single_component_reference << tail = #c->rml; >> }
 	  << if(tail)
 	       #0->rml = Absyn__CREF_5fQUAL(#i->rml, #a?#a->rml:mk_nil(), tail);
              else

modeq/history.txt

@@ -0,0 +1,7 @@
+
+30 nov 1998
+The grammar now accepts multiple return values. The semantics does not complain although it should! (The semantics expects only one return value )
+
+26 nov 1998
+Started with adding multiple return values for functions to the grammar.
+

modeq/main.rml

@@ -27,8 +27,11 @@ with "rtopts.rml"
 
 relation translate_file : string list => () =
 
-  rule	Parser.parse f => p &
+  rule	print "Parsing\n" &
+	Parser.parse f => p &
+	print "elaborating\n" &
 	SCode.elaborate(p) => p' &
+	print "instantiating\n" &
 	Inst.instantiate(p') => d &
 	DAE.dump d
 	----------