Fixes to correctly handle reserved JS word "in"

Author: boxgaming

codemirror/qb-lang.js

@@ -28,7 +28,7 @@ CodeMirror.defineMode("qbjs", function(conf, parserConf) {
     var endKeywords = ['next','loop','wend'];
 
     var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'is', 'mod', 'eqv', 'imp']);
-    var commonkeywords = ['dim', 'as', 'redim', 'then', 'until', 'exit', 'in', 'to', 'let',
+    var commonkeywords = ['dim', 'as', 'redim', 'then', 'until', 'exit', 'to', 'let',
                           'const', 'integer', 'single', 'double', 'long', '_?unsigned', '_?float', '_?bit', '_?byte',
                           'string', '_?byte', 'object', '_?offset', '_?integer64', 'call', 'step', '_?preserve'];
 

qb2js.js

@@ -23,7 +23,7 @@ async function main() {
    QB.resizeArray(exportMethods, [{l:0,u: 0}], {line:0,type:'',returnType:'',name:'',uname:'',argc:0,args:'',jsname:'',sync:0,builtin:0,dynamic:0}, false);  /* METHOD */ 
    QB.resizeArray(dataArray, [{l:0,u: 0}], '', false);  /* STRING */ 
    QB.resizeArray(dataLabels, [{l:0,u: 0}], {text:'',index:0}, false);  /* LABEL */ 
-   QB.resizeArray(jsReservedWords, [{l:0,u: 54}], '', false);  /* STRING */ 
+   QB.resizeArray(jsReservedWords, [{l:0,u: 55}], '', false);  /* STRING */ 
    modLevel = 0;  /* INTEGER */ 
    currentMethod = '';  /* STRING */ 
    currentModule = '';  /* STRING */ 
@@ -3899,6 +3899,7 @@ if (QB.halted()) { return; };
    QB.arrayValue(jsReservedWords, [ 52]).value = "prompt";
    QB.arrayValue(jsReservedWords, [ 53]).value = "require";
    QB.arrayValue(jsReservedWords, [ 54]).value = "process";
+   QB.arrayValue(jsReservedWords, [ 55]).value = "in";
 }
 async function sub_InitGX() {
 if (QB.halted()) { return; }; 

tools/qb2js.bas

@@ -89,7 +89,7 @@ ReDim Shared As Variable exportConsts(0)
 ReDim Shared As Method exportMethods(0)
 ReDim Shared As String dataArray(0)
 ReDim Shared As Label dataLabels(0)
-Dim Shared As String jsReservedWords(54)
+Dim Shared As String jsReservedWords(55)
 Dim Shared modLevel As Integer
 Dim Shared As String currentMethod
 Dim Shared As String currentModule
@@ -3983,7 +3983,7 @@ Sub InitJSReservedWords
     jsReservedWords(17) = "finally"
     ' float, for, function, goto, if
     jsReservedWords(18) = "implements"
-    ' import, in
+    ' import
     jsReservedWords(19) = "instanceof"
     ' int
     jsReservedWords(20) = "interface"
@@ -4024,6 +4024,7 @@ Sub InitJSReservedWords
     jsReservedWords(52) = "prompt"
     jsReservedWords(53) = "require"
     jsReservedWords(54) = "process"
+    jsReservedWords(55) = "in"
 End Sub
 
 Sub InitGX