- Updated ANTLR3 grammar slightly (if-expressions). It can now handle ~623 of the testcases, and many of the "failing" ones are just old ones but with improved error messages.

sjoelund · sjoelund · commit 4a6b0c5a7596 · 2010-09-01T09:39:12.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5992 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/Parser/Modelica.g b/Parser/Modelica.g
@@ -1012,12 +1012,11 @@ pattern returns [void* ast] :
   ;
 
 if_expression returns [void* ast] :
-  IF cond=expression THEN e1=expression es=elseif_expression_list ELSE e2=expression {Absyn__IFEXP(cond,e1,e2,es);}
+  IF cond=expression THEN e1=expression es=elseif_expression_list? ELSE e2=expression {ast = Absyn__IFEXP(cond,e1,e2,or_nil(es));}
   ;
 
 elseif_expression_list returns [void* ast] :
-  e=elseif_expression es=elseif_expression_list { ast = mk_cons(e,es); }
-  | { ast = mk_nil(); }
+  e=elseif_expression es=elseif_expression_list? { ast = mk_cons(e,or_nil(es)); }
   ;
 
 elseif_expression returns [void* ast] :

Original file line number	Diff line number	Diff line change
`@@ -1012,12 +1012,11 @@ pattern returns [void* ast] :`
`1012`	`1012`	`;`
`1013`	`1013`
`1014`	`1014`	`if_expression returns [void* ast] :`
`1015`		`- IF cond=expression THEN e1=expression es=elseif_expression_list ELSE e2=expression {Absyn__IFEXP(cond,e1,e2,es);}`
	`1015`	`+ IF cond=expression THEN e1=expression es=elseif_expression_list? ELSE e2=expression {ast = Absyn__IFEXP(cond,e1,e2,or_nil(es));}`
`1016`	`1016`	`;`
`1017`	`1017`
`1018`	`1018`	`elseif_expression_list returns [void* ast] :`
`1019`		`- e=elseif_expression es=elseif_expression_list { ast = mk_cons(e,es); }`
`1020`		`- \| { ast = mk_nil(); }`
	`1019`	`+ e=elseif_expression es=elseif_expression_list? { ast = mk_cons(e,or_nil(es)); }`
`1021`	`1020`	`;`
`1022`	`1021`
`1023`	`1022`	`elseif_expression returns [void* ast] :`