#2341 Support loadString() parsing optimica

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17194 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 12, 2013 · c623a9c · c623a9c
1 parent 8d167da
commit c623a9c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Parser/Parser_omc.c b/Parser/Parser_omc.c
@@ -64,7 +64,7 @@ void* ParserExt_parsestring(const char* data, const char* filename, int accepted
   int flags = PARSE_MODELICA;
   if(acceptedGrammer == 2) flags |= PARSE_META_MODELICA;
   else if(acceptedGrammer == 3) flags |= PARSE_PARMODELICA;
-  else if(acceptedGrammer == 4) flags |= PARSE_OPTIMICA; 
+  else if(acceptedGrammer == 4) flags |= PARSE_OPTIMICA;
 
   void *res = parseString(data, filename, flags, langStd, runningTestsuite);
   if (res != NULL) {

diff --git a/Parser/Parser_rml.c b/Parser/Parser_rml.c
@@ -49,9 +49,10 @@ void ParserExt_5finit(void)
 RML_BEGIN_LABEL(ParserExt__parse)
 {
   int flags = PARSE_MODELICA;
-  if(RML_UNTAGFIXNUM(rmlA2) == 2) flags |= PARSE_META_MODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA2) == 3) flags |= PARSE_PARMODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA2) == 4) flags |= PARSE_OPTIMICA;
+  int grammarFlag = RML_UNTAGFIXNUM(rmlA2);
+  if(grammarFlag == 2) flags |= PARSE_META_MODELICA;
+  else if(grammarFlag == 3) flags |= PARSE_PARMODELICA;
+  else if(grammarFlag == 4) flags |= PARSE_OPTIMICA;
 
   rmlA0 = parseFile(RML_STRINGDATA(rmlA0),RML_STRINGDATA(rmlA1),flags,RML_STRINGDATA(rmlA3),RML_UNTAGFIXNUM(rmlA4),RML_UNTAGFIXNUM(rmlA5));
   if (rmlA0)
@@ -65,9 +66,10 @@ RML_END_LABEL
 RML_BEGIN_LABEL(ParserExt__parseexp)
 {
   int flags = PARSE_EXPRESSION;
-  if(RML_UNTAGFIXNUM(rmlA2) == 2) flags |= PARSE_META_MODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA2) == 3) flags |= PARSE_PARMODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA2) == 4) flags |= PARSE_OPTIMICA;
+  int grammarFlag = RML_UNTAGFIXNUM(rmlA2);
+  if(grammarFlag == 2) flags |= PARSE_META_MODELICA;
+  else if(grammarFlag == 3) flags |= PARSE_PARMODELICA;
+  else if(grammarFlag == 4) flags |= PARSE_OPTIMICA;
 
   rmlA0 = parseFile(RML_STRINGDATA(rmlA0),RML_STRINGDATA(rmlA1),flags,"UTF-8",RML_UNTAGFIXNUM(rmlA3),RML_UNTAGFIXNUM(rmlA4));
   if (rmlA0)
@@ -80,9 +82,10 @@ RML_END_LABEL
 RML_BEGIN_LABEL(ParserExt__parsestring)
 {
   int flags = PARSE_MODELICA;
-  if(RML_UNTAGFIXNUM(rmlA2) == 2) flags |= PARSE_META_MODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA2) == 3) flags |= PARSE_PARMODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA1) == 4) flags |= PARSE_OPTIMICA;
+  int grammarFlag = RML_UNTAGFIXNUM(rmlA2);
+  if(grammarFlag == 2) flags |= PARSE_META_MODELICA;
+  else if(grammarFlag == 3) flags |= PARSE_PARMODELICA;
+  else if(grammarFlag == 4) flags |= PARSE_OPTIMICA;
 
   rmlA0 = parseString(RML_STRINGDATA(rmlA0),RML_STRINGDATA(rmlA1),flags,RML_UNTAGFIXNUM(rmlA3),RML_UNTAGFIXNUM(rmlA4));
   if (rmlA0) {
@@ -97,9 +100,10 @@ RML_END_LABEL
 RML_BEGIN_LABEL(ParserExt__parsestringexp)
 {
   int flags = PARSE_EXPRESSION;
-  if(RML_UNTAGFIXNUM(rmlA2) == 2) flags |= PARSE_META_MODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA2) == 3) flags |= PARSE_PARMODELICA;
-  else if(RML_UNTAGFIXNUM(rmlA1) == 4) flags |= PARSE_OPTIMICA;
+  int grammarFlag = RML_UNTAGFIXNUM(rmlA2);
+  if(grammarFlag == 2) flags |= PARSE_META_MODELICA;
+  else if(grammarFlag == 3) flags |= PARSE_PARMODELICA;
+  else if(grammarFlag == 4) flags |= PARSE_OPTIMICA;
 
   rmlA0 = parseString(RML_STRINGDATA(rmlA0),RML_STRINGDATA(rmlA1),flags,RML_UNTAGFIXNUM(rmlA3),RML_UNTAGFIXNUM(rmlA4));
   if (rmlA0) {