- Check Absyn->SCode before accepting a string or file as valid abstr…

…act syntax git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11724 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 11, 2012 · 4529c6e · 4529c6e
1 parent 5e1236c
commit 4529c6e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Compiler/FrontEnd/Builtin.mo b/Compiler/FrontEnd/Builtin.mo
@@ -618,7 +618,7 @@ algorithm
         fileMetaModelica = Settings.getInstallationDirectoryPath() +& "/lib/omc/MetaModelicaBuiltin.mo";
         initialFunctionStr = System.readFile(fileModelica);
         initialFunctionStrMM = Debug.bcallret1(b, System.readFile, fileMetaModelica, "");
-        initialProgram = Parser.parsestring(initialFunctionStr +& initialFunctionStrMM, fileModelica);
+        initialProgram = Parser.parsebuiltinstring(initialFunctionStr +& initialFunctionStrMM, fileModelica);
         assocLst = getGlobalRoot(Global.builtinIndex);
         setGlobalRoot(Global.builtinIndex, (b,initialProgram)::assocLst);
       then initialProgram;

diff --git a/Compiler/FrontEnd/Parser.mo b/Compiler/FrontEnd/Parser.mo
@@ -43,13 +43,16 @@ public import Absyn;
 public import Interactive;
 protected import Config;
 protected import ParserExt;
+protected import SCodeUtil;
 
 public function parse "Parse a mo-file"
   input String filename;
   input String encoding;
   output Absyn.Program outProgram;
 algorithm
   outProgram := ParserExt.parse(filename, Config.acceptedGrammar(), encoding, Config.getRunningTestsuite());
+  /* Check that the program is not totally off the charts */
+  _ := SCodeUtil.translateAbsyn2SCode(outProgram);
 end parse;
 
 public function parseexp "Parse a mos-file"
@@ -63,12 +66,23 @@ end parseexp;
 public function parsestring "Parse a string as if it were a stored definition"
   input String str;
   input String infoFilename := "<interactive>";
+  input Boolean skipScodeCheck "Would cause ModelicaBuiltin.mo to run into an infinite loop";
   output Absyn.Program outProgram;
 algorithm
-  outProgram := ParserExt.parsestring(str,infoFilename,
-    Config.acceptedGrammar(), Config.getRunningTestsuite());
+  outProgram := parsebuiltinstring(str,infoFilename);
+  /* Check that the program is not totally off the charts */
+  _ := SCodeUtil.translateAbsyn2SCode(outProgram);
 end parsestring;
 
+public function parsebuiltinstring "Parse a string as if it were a stored definition. Skips the SCode check to avoid infinite loops for ModelicaBuiltin.mo."
+  input String str;
+  input String infoFilename := "<interactive>";
+  output Absyn.Program outProgram;
+  annotation(__OpenModelica_EarlyInline = true);
+algorithm
+  outProgram := ParserExt.parsestring(str,infoFilename, Config.acceptedGrammar(), Config.getRunningTestsuite());
+end parsebuiltinstring;
+
 public function parsestringexp "Parse a string as if it was a sequence of statements"
   input String str;
   input String infoFilename := "<interactive>";