- Made Parser use C-files instead of C++, which leads to fewer hacks

sjoelund · sjoelund · commit 751738d84178 · 2012-09-18T10:27:02.000Z
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12958 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/Parser/Makefile.common b/Parser/Makefile.common
@@ -13,7 +13,7 @@ install: libantlr3.a libomparse.a
 
 libantlr3.a: antlr-3.2/runtime/C/src/* antlr-3.2/runtime/C/include/* 
 	# build the library
-	$(REAL_CC) ${CFLAGS} ${CPPFLAGS} -c antlr-3.2/runtime/C/src/*.c -Iantlr-3.2/runtime/C/include -Iantlr-3.2/runtime/C
+	$(CC) ${CFLAGS} ${CPPFLAGS} -c antlr-3.2/runtime/C/src/*.c -Iantlr-3.2/runtime/C/include -Iantlr-3.2/runtime/C
 	rm -f $@
 	ar -ru libantlr3.a antlr3*.o
 	ranlib libantlr3.a
diff --git a/Parser/Makefile.in b/Parser/Makefile.in
@@ -1,5 +1,4 @@
-REAL_CC=@CC@
-CC=@CXX@
+CC=@CC@
 CXX=@CXX@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@ -I$(COMPILERHOME) $(RMLINC) -I. -Iantlr-3.2/runtime/C -Iantlr-3.2/runtime/C/include $(BUILDINC)
diff --git a/Parser/Modelica.g b/Parser/Modelica.g
@@ -95,7 +95,7 @@ goto rule ## func ## Ex; }}
 #endif
   #define token_to_scon(tok) mk_scon((char*)tok->getText(tok)->chars)
   #define NYI(void) fprintf(stderr, "NYI \%s \%s:\%d\n", __FUNCTION__, __FILE__, __LINE__); exit(1);
-  #define INFO(start) Absyn__INFO(ModelicaParser_filename_RML, mk_bcon(isReadOnly), mk_icon(start->line), mk_icon(start->line == 1 ? start->charPosition+2 : start->charPosition+1), mk_icon(LT(1)->line), mk_icon(LT(1)->charPosition+1), Absyn__TIMESTAMP(mk_rcon(0),mk_rcon(0)))
+  #define PARSER_INFO(start) (void*)Absyn__INFO(ModelicaParser_filename_RML, mk_bcon(isReadOnly), mk_icon(start->line), mk_icon(start->line == 1 ? start->charPosition+2 : start->charPosition+1), mk_icon(LT(1)->line), mk_icon(LT(1)->charPosition+1), Absyn__TIMESTAMP(mk_rcon(0),mk_rcon(0)))
   typedef struct fileinfo_struct {
     int line1;
     int line2;
@@ -149,7 +149,7 @@ class_definition_list returns [void* ast] :
 class_definition [int final] returns [void* ast] :
   ((e=ENCAPSULATED)? (p=PARTIAL)? ct=class_type cs=class_specifier)
     {
-      $ast = Absyn__CLASS($cs.name, mk_bcon(p), mk_bcon(final), mk_bcon(e), ct, $cs.ast, INFO($start));
+      $ast = Absyn__CLASS($cs.name, mk_bcon(p), mk_bcon(final), mk_bcon(e), ct, $cs.ast, PARSER_INFO($start));
     }
   ;
 
@@ -364,8 +364,8 @@ element returns [void* ast]
   void *redecl;
 }
   :
-    ic=import_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ic, INFO($start), mk_none());}
-  | ec=extends_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ec, INFO($start),mk_none());}
+    ic=import_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ic, PARSER_INFO($start), mk_none());}
+  | ec=extends_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ec, PARSER_INFO($start),mk_none());}
   | du=defineunit_clause { $ast = du;}
   | (r=REDECLARE)? (f=FINAL)? (i=INNER)? (o=T_OUTER)? { final = mk_bcon(f); innerouter = make_inner_outer(i,o); }
     ( ( cdef=class_definition[f != NULL] | cc=component_clause )
@@ -374,19 +374,19 @@ element returns [void* ast]
              $ast = Absyn__ELEMENT(final, r != NULL ? mk_some(make_redeclare_keywords(false,r != NULL)) : mk_none(),
                                   innerouter,
                                   Absyn__CLASSDEF(RML_FALSE, cdef.ast),
-                                  INFO($start), mk_none());
+                                  PARSER_INFO($start), mk_none());
            else
              $ast = Absyn__ELEMENT(final, r != NULL ? mk_some(make_redeclare_keywords(false,r != NULL)) : mk_none(), innerouter,
-                                   cc, INFO($start), mk_none());
+                                   cc, PARSER_INFO($start), mk_none());
         }
     | (REPLACEABLE ( cdef=class_definition[f != NULL] | cc=component_clause ) constr=constraining_clause_comment? )
         {
            if (cc)
              $ast = Absyn__ELEMENT(final, mk_some(make_redeclare_keywords(true,r != NULL)), innerouter,
-                                   cc, INFO($start), mk_some_or_none(constr));
+                                   cc, PARSER_INFO($start), mk_some_or_none(constr));
            else
              $ast = Absyn__ELEMENT(final, mk_some(make_redeclare_keywords(true,r != NULL)), innerouter,
-                                   Absyn__CLASSDEF(RML_TRUE, cdef.ast), INFO($start), mk_some_or_none(constr));
+                                   Absyn__CLASSDEF(RML_TRUE, cdef.ast), PARSER_INFO($start), mk_some_or_none(constr));
         }
     )
   | conn=CONNECT
@@ -398,7 +398,7 @@ element returns [void* ast]
 import_clause returns [void* ast] :
   im=IMPORT (imp=explicit_import_name | imp=implicit_import_name) cmt=comment
     {
-      ast = Absyn__IMPORT(imp, mk_some_or_none(cmt), INFO($im));
+      ast = Absyn__IMPORT(imp, mk_some_or_none(cmt), PARSER_INFO($im));
     }
   ;
 defineunit_clause returns [void* ast] :
@@ -543,7 +543,7 @@ modification returns [void* ast] :
   | eq=ASSIGN e=expression
   )
     {
-      ast = Absyn__CLASSMOD(or_nil(cm), e ? Absyn__EQMOD(e,INFO($eq)) : Absyn__NOMOD);
+      ast = Absyn__CLASSMOD(or_nil(cm), e ? Absyn__EQMOD(e,PARSER_INFO($eq)) : Absyn__NOMOD);
     }
   ;
 
@@ -574,7 +574,7 @@ element_modification_or_replaceable returns [void* ast] @init {
 element_modification [void *each, void *final] returns [void* ast] @init {
   $ast = NULL;
 } :
-  cr=component_reference ( mod=modification )? cmt=string_comment { $ast = Absyn__MODIFICATION(final, each, cr.ast, mk_some_or_none(mod), mk_some_or_none(cmt), INFO($start)); }
+  cr=component_reference ( mod=modification )? cmt=string_comment { $ast = Absyn__MODIFICATION(final, each, cr.ast, mk_some_or_none(mod), mk_some_or_none(cmt), PARSER_INFO($start)); }
   ;
 
 element_redeclaration returns [void* ast]  @init {
@@ -587,7 +587,7 @@ element_redeclaration returns [void* ast]  @init {
        if ($er.ast) {
          $ast = $er.ast;
        } else {
-         $ast = Absyn__REDECLARATION(mk_bcon(f), make_redeclare_keywords(false,true), e ? Absyn__EACH : Absyn__NON_5fEACH, $cc.ast ? $cc.ast : Absyn__CLASSDEF(RML_FALSE,$cdef.ast), mk_none(), INFO($start));
+         $ast = Absyn__REDECLARATION(mk_bcon(f), make_redeclare_keywords(false,true), e ? Absyn__EACH : Absyn__NON_5fEACH, $cc.ast ? $cc.ast : Absyn__CLASSDEF(RML_FALSE,$cdef.ast), mk_none(), PARSER_INFO($start));
        }
      }
   ;
@@ -599,7 +599,7 @@ element_replaceable [int each, int final, int redeclare] returns [void* ast] @in
     {
       $ast = Absyn__REDECLARATION(mk_bcon(final), make_redeclare_keywords(true,redeclare),
                                   each ? Absyn__EACH : Absyn__NON_5fEACH, e_spec ? e_spec : Absyn__CLASSDEF(RML_TRUE, $cd.ast),
-                                  mk_some_or_none($constr.ast), INFO($start));
+                                  mk_some_or_none($constr.ast), PARSER_INFO($start));
     }
   ;
   
@@ -673,7 +673,7 @@ equation returns [void* ast] :
     }
   )
   cmt=comment
-    {$ast = Absyn__EQUATIONITEM(e, mk_some_or_none(cmt), INFO($start));}
+    {$ast = Absyn__EQUATIONITEM(e, mk_some_or_none(cmt), PARSER_INFO($start));}
   ;
 
 constraint returns [void* ast] :
@@ -712,7 +712,7 @@ algorithm returns [void* ast] :
     }
   )
   cmt=comment
-    {$ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), INFO($start));}
+    {$ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), PARSER_INFO($start));}
   ;
 
 assign_clause_a returns [void* ast] @declarations {
@@ -1355,7 +1355,7 @@ top_algorithm returns [void* ast, int isExp] :
   )
     {
       if (!e) {
-        $ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), INFO($start));
+        $ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), PARSER_INFO($start));
         $isExp = 0;
       } else {
         $ast = e;
@@ -1433,7 +1433,7 @@ cases2 returns [void* ast] :
                              ModelicaParser_readonly, ModelicaParser_filename_C);
       if ($th) $el = $th;
       if (exp)
-       $ast = mk_cons(Absyn__ELSE(or_nil(es),or_nil(eqs),exp,INFO($el),mk_some_or_none(cmt),INFO($start)),mk_nil());
+       $ast = mk_cons(Absyn__ELSE(or_nil(es),or_nil(eqs),exp,PARSER_INFO($el),mk_some_or_none(cmt),PARSER_INFO($start)),mk_nil());
       else
        $ast = mk_nil();
     }
@@ -1451,10 +1451,10 @@ onecase returns [void* ast] :
           c_add_source_message(2, ErrorType_syntax, ErrorLevel_warning, "case local declarations are deprecated. Move all case- and else-declarations to the match local declarations.",
                                NULL, 0, $start->line, $start->charPosition+1, LT(1)->line, LT(1)->charPosition+1,
                                ModelicaParser_readonly, ModelicaParser_filename_C);
-        $ast = Absyn__CASE(pat.ast,mk_some_or_none(guard),pat.info,or_nil(es),or_nil(eqs),exp,INFO($th),mk_some_or_none(cmt),INFO($start));
+        $ast = Absyn__CASE(pat.ast,mk_some_or_none(guard),pat.info,or_nil(es),or_nil(eqs),exp,PARSER_INFO($th),mk_some_or_none(cmt),PARSER_INFO($start));
     }
   ;
 
 pattern returns [void* ast, void* info] :
-  e=expression {$ast = e; $info = INFO($start);}
+  e=expression {$ast = e; $info = PARSER_INFO($start);}
   ;
diff --git a/Parser/Parser_omc.c b/Parser/Parser_omc.c
@@ -28,8 +28,6 @@
  *
  */
 
-extern "C" {
-
 #include "meta_modelica.h"
 #include "rml_compatibility.h"
 #include "parse.c"
@@ -86,5 +84,3 @@ void* ParserExt_parsestringexp(const char* data, const char* filename, int accep
     MMC_THROW();
   }
 }
-
-}
diff --git a/Parser/parse.c b/Parser/parse.c
@@ -34,17 +34,7 @@
 #include <errno.h>
 #include <string.h>
 
-#if !defined(_MSC_VER)
-#ifdef __cplusplus
-/* Make sure we don't use any C++ features anywhere */
-#define __cplusplusend
-#undef __cplusplus
-#endif
-
-extern "C" {
-#else
 #define bool int
-#endif
 
 #include <MetaModelica_Lexer.h>
 #include <Modelica_3_Lexer.h>
@@ -426,7 +416,3 @@ static void* parseFile(const char* fileName, int flags, const char *encoding, in
   }
   return parseStream(input, runningTestsuite);
 }
-
-#ifdef __cplusplusend
-}
-#endif

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ goto rule ## func ## Ex; }}`
`95`	`95`	`#endif`
`96`	`96`	`#define token_to_scon(tok) mk_scon((char*)tok->getText(tok)->chars)`
`97`	`97`	`#define NYI(void) fprintf(stderr, "NYI \%s \%s:\%d\n", __FUNCTION__, __FILE__, __LINE__); exit(1);`
`98`		`- #define INFO(start) Absyn__INFO(ModelicaParser_filename_RML, mk_bcon(isReadOnly), mk_icon(start->line), mk_icon(start->line == 1 ? start->charPosition+2 : start->charPosition+1), mk_icon(LT(1)->line), mk_icon(LT(1)->charPosition+1), Absyn__TIMESTAMP(mk_rcon(0),mk_rcon(0)))`
	`98`	`+ #define PARSER_INFO(start) (void*)Absyn__INFO(ModelicaParser_filename_RML, mk_bcon(isReadOnly), mk_icon(start->line), mk_icon(start->line == 1 ? start->charPosition+2 : start->charPosition+1), mk_icon(LT(1)->line), mk_icon(LT(1)->charPosition+1), Absyn__TIMESTAMP(mk_rcon(0),mk_rcon(0)))`
`99`	`99`	`typedef struct fileinfo_struct {`
`100`	`100`	`int line1;`
`101`	`101`	`int line2;`
`@@ -149,7 +149,7 @@ class_definition_list returns [void* ast] :`
`149`	`149`	`class_definition [int final] returns [void* ast] :`
`150`	`150`	`((e=ENCAPSULATED)? (p=PARTIAL)? ct=class_type cs=class_specifier)`
`151`	`151`	`{`
`152`		`- $ast = Absyn__CLASS($cs.name, mk_bcon(p), mk_bcon(final), mk_bcon(e), ct, $cs.ast, INFO($start));`
	`152`	`+ $ast = Absyn__CLASS($cs.name, mk_bcon(p), mk_bcon(final), mk_bcon(e), ct, $cs.ast, PARSER_INFO($start));`
`153`	`153`	`}`
`154`	`154`	`;`
`155`	`155`
`@@ -364,8 +364,8 @@ element returns [void* ast]`
`364`	`364`	`void *redecl;`
`365`	`365`	`}`
`366`	`366`	`:`
`367`		`- ic=import_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ic, INFO($start), mk_none());}`
`368`		`- \| ec=extends_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ec, INFO($start),mk_none());}`
	`367`	`+ ic=import_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ic, PARSER_INFO($start), mk_none());}`
	`368`	`+ \| ec=extends_clause { $ast = Absyn__ELEMENT(RML_FALSE,mk_none(),Absyn__NOT_5fINNER_5fOUTER, ec, PARSER_INFO($start),mk_none());}`
`369`	`369`	`\| du=defineunit_clause { $ast = du;}`
`370`	`370`	`\| (r=REDECLARE)? (f=FINAL)? (i=INNER)? (o=T_OUTER)? { final = mk_bcon(f); innerouter = make_inner_outer(i,o); }`
`371`	`371`	`( ( cdef=class_definition[f != NULL] \| cc=component_clause )`
`@@ -374,19 +374,19 @@ element returns [void* ast]`
`374`	`374`	`$ast = Absyn__ELEMENT(final, r != NULL ? mk_some(make_redeclare_keywords(false,r != NULL)) : mk_none(),`
`375`	`375`	`innerouter,`
`376`	`376`	`Absyn__CLASSDEF(RML_FALSE, cdef.ast),`
`377`		`- INFO($start), mk_none());`
	`377`	`+ PARSER_INFO($start), mk_none());`
`378`	`378`	`else`
`379`	`379`	`$ast = Absyn__ELEMENT(final, r != NULL ? mk_some(make_redeclare_keywords(false,r != NULL)) : mk_none(), innerouter,`
`380`		`- cc, INFO($start), mk_none());`
	`380`	`+ cc, PARSER_INFO($start), mk_none());`
`381`	`381`	`}`
`382`	`382`	`\| (REPLACEABLE ( cdef=class_definition[f != NULL] \| cc=component_clause ) constr=constraining_clause_comment? )`
`383`	`383`	`{`
`384`	`384`	`if (cc)`
`385`	`385`	`$ast = Absyn__ELEMENT(final, mk_some(make_redeclare_keywords(true,r != NULL)), innerouter,`
`386`		`- cc, INFO($start), mk_some_or_none(constr));`
	`386`	`+ cc, PARSER_INFO($start), mk_some_or_none(constr));`
`387`	`387`	`else`
`388`	`388`	`$ast = Absyn__ELEMENT(final, mk_some(make_redeclare_keywords(true,r != NULL)), innerouter,`
`389`		`- Absyn__CLASSDEF(RML_TRUE, cdef.ast), INFO($start), mk_some_or_none(constr));`
	`389`	`+ Absyn__CLASSDEF(RML_TRUE, cdef.ast), PARSER_INFO($start), mk_some_or_none(constr));`
`390`	`390`	`}`
`391`	`391`	`)`
`392`	`392`	`\| conn=CONNECT`
`@@ -398,7 +398,7 @@ element returns [void* ast]`
`398`	`398`	`import_clause returns [void* ast] :`
`399`	`399`	`im=IMPORT (imp=explicit_import_name \| imp=implicit_import_name) cmt=comment`
`400`	`400`	`{`
`401`		`- ast = Absyn__IMPORT(imp, mk_some_or_none(cmt), INFO($im));`
	`401`	`+ ast = Absyn__IMPORT(imp, mk_some_or_none(cmt), PARSER_INFO($im));`
`402`	`402`	`}`
`403`	`403`	`;`
`404`	`404`	`defineunit_clause returns [void* ast] :`
`@@ -543,7 +543,7 @@ modification returns [void* ast] :`
`543`	`543`	`\| eq=ASSIGN e=expression`
`544`	`544`	`)`
`545`	`545`	`{`
`546`		`- ast = Absyn__CLASSMOD(or_nil(cm), e ? Absyn__EQMOD(e,INFO($eq)) : Absyn__NOMOD);`
	`546`	`+ ast = Absyn__CLASSMOD(or_nil(cm), e ? Absyn__EQMOD(e,PARSER_INFO($eq)) : Absyn__NOMOD);`
`547`	`547`	`}`
`548`	`548`	`;`
`549`	`549`
`@@ -574,7 +574,7 @@ element_modification_or_replaceable returns [void* ast] @init {`
`574`	`574`	`element_modification [void each, void final] returns [void* ast] @init {`
`575`	`575`	`$ast = NULL;`
`576`	`576`	`} :`
`577`		`- cr=component_reference ( mod=modification )? cmt=string_comment { $ast = Absyn__MODIFICATION(final, each, cr.ast, mk_some_or_none(mod), mk_some_or_none(cmt), INFO($start)); }`
	`577`	`+ cr=component_reference ( mod=modification )? cmt=string_comment { $ast = Absyn__MODIFICATION(final, each, cr.ast, mk_some_or_none(mod), mk_some_or_none(cmt), PARSER_INFO($start)); }`
`578`	`578`	`;`
`579`	`579`
`580`	`580`	`element_redeclaration returns [void* ast] @init {`
`@@ -587,7 +587,7 @@ element_redeclaration returns [void* ast] @init {`
`587`	`587`	`if ($er.ast) {`
`588`	`588`	`$ast = $er.ast;`
`589`	`589`	`} else {`
`590`		`- $ast = Absyn__REDECLARATION(mk_bcon(f), make_redeclare_keywords(false,true), e ? Absyn__EACH : Absyn__NON_5fEACH, $cc.ast ? $cc.ast : Absyn__CLASSDEF(RML_FALSE,$cdef.ast), mk_none(), INFO($start));`
	`590`	`+ $ast = Absyn__REDECLARATION(mk_bcon(f), make_redeclare_keywords(false,true), e ? Absyn__EACH : Absyn__NON_5fEACH, $cc.ast ? $cc.ast : Absyn__CLASSDEF(RML_FALSE,$cdef.ast), mk_none(), PARSER_INFO($start));`
`591`	`591`	`}`
`592`	`592`	`}`
`593`	`593`	`;`
`@@ -599,7 +599,7 @@ element_replaceable [int each, int final, int redeclare] returns [void* ast] @in`
`599`	`599`	`{`
`600`	`600`	`$ast = Absyn__REDECLARATION(mk_bcon(final), make_redeclare_keywords(true,redeclare),`
`601`	`601`	`each ? Absyn__EACH : Absyn__NON_5fEACH, e_spec ? e_spec : Absyn__CLASSDEF(RML_TRUE, $cd.ast),`
`602`		`- mk_some_or_none($constr.ast), INFO($start));`
	`602`	`+ mk_some_or_none($constr.ast), PARSER_INFO($start));`
`603`	`603`	`}`
`604`	`604`	`;`
`605`	`605`
`@@ -673,7 +673,7 @@ equation returns [void* ast] :`
`673`	`673`	`}`
`674`	`674`	`)`
`675`	`675`	`cmt=comment`
`676`		`- {$ast = Absyn__EQUATIONITEM(e, mk_some_or_none(cmt), INFO($start));}`
	`676`	`+ {$ast = Absyn__EQUATIONITEM(e, mk_some_or_none(cmt), PARSER_INFO($start));}`
`677`	`677`	`;`
`678`	`678`
`679`	`679`	`constraint returns [void* ast] :`
`@@ -712,7 +712,7 @@ algorithm returns [void* ast] :`
`712`	`712`	`}`
`713`	`713`	`)`
`714`	`714`	`cmt=comment`
`715`		`- {$ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), INFO($start));}`
	`715`	`+ {$ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), PARSER_INFO($start));}`
`716`	`716`	`;`
`717`	`717`
`718`	`718`	`assign_clause_a returns [void* ast] @declarations {`
`@@ -1355,7 +1355,7 @@ top_algorithm returns [void* ast, int isExp] :`
`1355`	`1355`	`)`
`1356`	`1356`	`{`
`1357`	`1357`	`if (!e) {`
`1358`		`- $ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), INFO($start));`
	`1358`	`+ $ast = Absyn__ALGORITHMITEM(a, mk_some_or_none(cmt), PARSER_INFO($start));`
`1359`	`1359`	`$isExp = 0;`
`1360`	`1360`	`} else {`
`1361`	`1361`	`$ast = e;`
`@@ -1433,7 +1433,7 @@ cases2 returns [void* ast] :`
`1433`	`1433`	`ModelicaParser_readonly, ModelicaParser_filename_C);`
`1434`	`1434`	`if ($th) $el = $th;`
`1435`	`1435`	`if (exp)`
`1436`		`- $ast = mk_cons(Absyn__ELSE(or_nil(es),or_nil(eqs),exp,INFO($el),mk_some_or_none(cmt),INFO($start)),mk_nil());`
	`1436`	`+ $ast = mk_cons(Absyn__ELSE(or_nil(es),or_nil(eqs),exp,PARSER_INFO($el),mk_some_or_none(cmt),PARSER_INFO($start)),mk_nil());`
`1437`	`1437`	`else`
`1438`	`1438`	`$ast = mk_nil();`
`1439`	`1439`	`}`
`@@ -1451,10 +1451,10 @@ onecase returns [void* ast] :`
`1451`	`1451`	`c_add_source_message(2, ErrorType_syntax, ErrorLevel_warning, "case local declarations are deprecated. Move all case- and else-declarations to the match local declarations.",`
`1452`	`1452`	`NULL, 0, $start->line, $start->charPosition+1, LT(1)->line, LT(1)->charPosition+1,`
`1453`	`1453`	`ModelicaParser_readonly, ModelicaParser_filename_C);`
`1454`		`- $ast = Absyn__CASE(pat.ast,mk_some_or_none(guard),pat.info,or_nil(es),or_nil(eqs),exp,INFO($th),mk_some_or_none(cmt),INFO($start));`
	`1454`	`+ $ast = Absyn__CASE(pat.ast,mk_some_or_none(guard),pat.info,or_nil(es),or_nil(eqs),exp,PARSER_INFO($th),mk_some_or_none(cmt),PARSER_INFO($start));`
`1455`	`1455`	`}`
`1456`	`1456`	`;`
`1457`	`1457`
`1458`	`1458`	`pattern returns [void* ast, void* info] :`
`1459`		`- e=expression {$ast = e; $info = INFO($start);}`
	`1459`	`+ e=expression {$ast = e; $info = PARSER_INFO($start);}`
`1460`	`1460`	`;`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@`
`28`	`28`	`*`
`29`	`29`	`*/`
`30`	`30`
`31`		`-extern "C" {`
`32`		`-`
`33`	`31`	`#include "meta_modelica.h"`
`34`	`32`	`#include "rml_compatibility.h"`
`35`	`33`	`#include "parse.c"`
`@@ -86,5 +84,3 @@ void* ParserExt_parsestringexp(const char* data, const char* filename, int accep`
`86`	`84`	`MMC_THROW();`
`87`	`85`	`}`
`88`	`86`	`}`
`89`		`-`
`90`		`-}`