Changeset 6adae6a0 in OpenModelica

Timestamp:

2021-04-06T08:26:47+02:00 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.16

Parents:

11fcab4

git-author:

Martin Sjölund <martin@…> (04/06/21 08:26:47)

git-committer:

GitHub <noreply@…> (04/06/21 08:26:47)

Message:

Fix artificial limits in the JSON lexer (#7353)

Location:

OMCompiler/Compiler/Lexers

Files:

• LexerJSON.mo (modified) (12 diffs)
• lexerJSON.l (modified) (1 diff)

OMCompiler/Compiler/Lexers/LexerJSON.mo

@@ -237 +237 @@
   output list<Token> errorTokens={};
 protected
-  Integer startSt,numStates,i,r,cTok,cTok2,currSt,pos,sPos,ePos,linenr,contentLen,numBacktrack,buffer,lineNrStart;
+  Integer startSt,i,r,cTok,cTok2,currSt,pos,sPos,ePos,linenr,contentLen,numBacktrack,buffer,lineNrStart;
   list<Integer> cProg,cProg2;
   list<String> chars;
-  array<Integer> states;
+  list<Integer> states;
   String s1,s2;
   import MetaModelica.Dangerous.listReverseInPlace;
@@ -257 +257 @@
   buffer := 0;
 
-  states := arrayCreate(128,1);
-  numStates := 1;
+  states := {};
 
   if (debug==true) then
@@ -274 +273 @@
   while i <= contentLen loop
      cTok := stringGet(contents,i);
-     (tokens,numBacktrack,startSt,currSt,pos,sPos,ePos,linenr,lineNrStart,buffer,states,numStates,errorTokens) := consume(cTok,tokens,contents,startSt,currSt,pos,sPos,ePos,linenr,lineNrStart,buffer,states,numStates,fileName,errorTokens);
+     (tokens,numBacktrack,startSt,currSt,pos,sPos,ePos,linenr,lineNrStart,buffer,states,errorTokens) := consume(cTok,tokens,contents,startSt,currSt,pos,sPos,ePos,linenr,lineNrStart,buffer,states,fileName,errorTokens);
      i := i - numBacktrack + 1;
   end while;
@@ -288 +287 @@
   input Integer currSt,pos,sPos,ePos,linenr,inLineNrStart;
   input Integer inBuffer;
-  input array<Integer> inStates;
-  input Integer inNumStates;
+  input list<Integer> inStates;
   input String fileName;
   input list<Token> inErrorTokens;
@@ -297 +295 @@
   output Integer mm_currSt,mm_pos,mm_sPos,mm_ePos,mm_linenr,lineNrStart;
   output Integer buffer;
-  output array<Integer> states;
-  output Integer numStates;
+  output list<Integer> states;
   output list<Token> errorTokens=inErrorTokens;
 protected
@@ -314 +311 @@
   buffer := inBuffer;
   states := inStates;
-  numStates := inNumStates;
 
   baseCond := LexTable.yy_base[mm_currSt];
@@ -352 +348 @@
     mm_currSt := LexTable.yy_nxt[c];
   end if;
-  numStates := numStates+1; // TODO: BAD BAD BAD. At least arrayUpdate should be a safe operation... We need to grow the number of states on demand though.
-  arrayUpdate(states,numStates,mm_currSt);
+  states := mm_currSt::states;
 
   baseCond := LexTable.yy_base[mm_currSt];
@@ -361 +356 @@
     end if;
 
-    (act, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states, numStates) := findRule(fileContents, mm_currSt, mm_pos, mm_sPos, mm_ePos, mm_linenr, buffer, bkBuffer, states, numStates);
+    (act, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states) := findRule(fileContents, mm_currSt, mm_pos, mm_sPos, mm_ePos, mm_linenr, buffer, bkBuffer, states);
 
     if (debug==true) then
@@ -374 +369 @@
 
     mm_currSt := mm_startSt;
-    arrayUpdate(states,1,mm_startSt);
-    numStates := 1;
+    states := {};
 
     /* Either a token was output (get new positions for next token). Or a whitespace was emitted. */
@@ -408 +402 @@
   input Integer inBuffer;
   input Integer inBkBuffer;
-  input array<Integer> inStates;
-  input Integer inNumStates;
+  input list<Integer> inStates;
   output Integer action;
   output Integer mm_currSt;
@@ -417 +410 @@
   output Integer buffer;
   output Integer bkBuffer;
-  output array<Integer> states;
-  output Integer numStates;
+  output list<Integer> states;
 protected
   array<Integer> mm_accept,mm_ec,mm_meta,mm_base,mm_def,mm_nxt,mm_chk,mm_acclist;
-  Integer lp,lp1,stCmp;
+  Integer lp,lp1,stCmp,cp;
   Boolean st;
   import arrayGet = MetaModelica.Dangerous.arrayGetNoBoundsChecking; // Bounds checked with debug=true
@@ -433 +425 @@
   bkBuffer := inBkBuffer;
   states := inStates;
-  numStates := inNumStates;
-
-  stCmp := arrayGet(states,numStates);
+
+  stCmp := listGet(states, 1);
   lp := LexTable.yy_accept[stCmp];
   lp1 := LexTable.yy_accept[stCmp+1];
 
   st := intGt(lp,0) and intLt(lp,lp1);
-  (action, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states, numStates) := match(numStates,st)
-    local
-      Integer act,cp;
-      list<Integer> restBuff;
-    case (_,true)
-      algorithm
-        if debug then
-          checkArrayModelica(LexTable.yy_accept,stCmp,sourceInfo());
-          checkArrayModelica(LexTable.yy_acclist,lp,sourceInfo());
-        end if;
-        lp := LexTable.yy_accept[stCmp];
-        act := LexTable.yy_acclist[lp];
-      then (act, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states, numStates);
-    case (_,false)
-      algorithm
-        cp := stringGet(fileContents,mm_pos-1);
-        buffer := buffer-1;
-        bkBuffer := bkBuffer+1;
-        mm_pos := mm_pos - 1;
-        mm_sPos := mm_sPos -1;
-        if (cp==10) then
-          mm_sPos := mm_ePos;
-          mm_linenr := mm_linenr-1;
-        end if;
-        if debug then
-          checkArray(states,numStates,sourceInfo());
-        end if;
-        mm_currSt := arrayGet(states,numStates);
-        numStates := numStates - 1;
-        (act, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states, numStates) := findRule(fileContents, mm_currSt, mm_pos, mm_sPos, mm_ePos, mm_linenr, buffer, bkBuffer, states, numStates);
-      then (act, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states, numStates);
-
-  end match;
+  if st then
+    if debug then
+      checkArrayModelica(LexTable.yy_accept,stCmp,sourceInfo());
+      checkArrayModelica(LexTable.yy_acclist,lp,sourceInfo());
+    end if;
+    lp := LexTable.yy_accept[stCmp];
+    action := LexTable.yy_acclist[lp];
+  else
+    cp := stringGet(fileContents,mm_pos-1);
+    buffer := buffer-1;
+    bkBuffer := bkBuffer+1;
+    mm_pos := mm_pos - 1;
+    mm_sPos := mm_sPos -1;
+    if (cp==10) then
+      mm_sPos := mm_ePos;
+      mm_linenr := mm_linenr-1;
+    end if;
+    mm_currSt::states := states;
+    (action, mm_currSt, mm_pos, mm_sPos, mm_linenr, buffer, bkBuffer, states) := findRule(fileContents, mm_currSt, mm_pos, mm_sPos, mm_ePos, mm_linenr, buffer, bkBuffer, states);
+  end if;
 end findRule;
 

OMCompiler/Compiler/Lexers/lexerJSON.l

@@ -4 +4 @@
 protected
 import Error;
-import StringUtil;
 public
 %}