Merge pull request #403 from perost/nfinst3

[NF] Add scanInteger to known external functions.
OpenModelica · Aug 22, 2019 · 1509b42 · 1509b42
1 parent 1b470a5
commit 1509b42
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo b/OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo
@@ -971,6 +971,13 @@ algorithm
         Expression.TUPLE(Type.TUPLE({Type.INTEGER(), Type.BOOLEAN()}, NONE()),
                          {Expression.INTEGER(i), Expression.REAL(r)});
 
+    case ("ModelicaStrings_scanInteger", {Expression.STRING(s1), Expression.INTEGER(i), Expression.BOOLEAN(b)})
+      algorithm
+        (i, i2) := ModelicaExternalC.Strings_advanced_scanInteger(s1, i, b);
+      then
+        Expression.TUPLE(Type.TUPLE({Type.INTEGER(), Type.INTEGER()}, NONE()),
+                         {Expression.INTEGER(i), Expression.INTEGER(i2)});
+
     case ("ModelicaStrings_skipWhiteSpace", {Expression.STRING(s1), Expression.INTEGER(i)})
       then Expression.INTEGER(ModelicaExternalC.Strings_advanced_skipWhiteSpace(s1, i));
 

diff --git a/OMCompiler/Compiler/Util/ModelicaExternalC.mo b/OMCompiler/Compiler/Util/ModelicaExternalC.mo
@@ -95,6 +95,17 @@ function Strings_advanced_scanReal
   external "C" ModelicaStrings_scanReal(string,startIndex,unsigned,nextIndex,number) annotation(Library = "ModelicaExternalC");
 end Strings_advanced_scanReal;
 
+function Strings_advanced_scanInteger
+  input String string;
+  input Integer startIndex;
+  input Boolean unsigned;
+  output Integer nextIndex;
+  output Integer number;
+
+  external "C"
+  ModelicaStrings_scanInteger(string,startIndex,unsigned,nextIndex,number) annotation(Library = "ModelicaExternalC");
+end Strings_advanced_scanInteger;
+
 function Strings_advanced_skipWhiteSpace
   input String string;
   input Integer startIndex(min = 1) = 1;