mirror of
https://github.com/boxgaming/qbjs.git
synced 2024-05-12 08:00:12 +00:00
Fixed issue with export causing collisions between muliple imported libraries
This commit is contained in:
parent
0187c6ce84
commit
37aa78a7c9
14
qb2js.js
14
qb2js.js
|
@ -769,7 +769,7 @@ if (QB.halted()) { return; };
|
||||||
var esize = 0; /* SINGLE */
|
var esize = 0; /* SINGLE */
|
||||||
esize = (QB.func_UBound( exportLines)) + 1;
|
esize = (QB.func_UBound( exportLines)) + 1;
|
||||||
QB.resizeArray(exportLines, [{l:0,u:esize}], '', true); /* STRING */
|
QB.resizeArray(exportLines, [{l:0,u:esize}], '', true); /* STRING */
|
||||||
QB.arrayValue(exportLines, [ esize]).value = "this." + exportName + " = " + exportedItem + ";";
|
QB.arrayValue(exportLines, [ esize]).value = exportName + ": " + exportedItem + ",";
|
||||||
}
|
}
|
||||||
async function func_ConvertSub(m/*METHOD*/,args/*STRING*/,lineNumber/*INTEGER*/) {
|
async function func_ConvertSub(m/*METHOD*/,args/*STRING*/,lineNumber/*INTEGER*/) {
|
||||||
if (QB.halted()) { return; };
|
if (QB.halted()) { return; };
|
||||||
|
@ -2157,10 +2157,14 @@ if (QB.halted()) { return; };
|
||||||
await sub_AddJSLine( lastLine, "}");
|
await sub_AddJSLine( lastLine, "}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var ___v4048342 = 0; ___l3534726: for ( i= 1; i <= (QB.func_UBound( exportLines)); i= i + 1) { if (QB.halted()) { return; } ___v4048342++; if (___v4048342 % 100 == 0) { await QB.autoLimit(); }
|
if ((QB.func_UBound( exportLines)) > 0) {
|
||||||
await sub_AddJSLine( i, QB.arrayValue(exportLines, [ i]).value);
|
await sub_AddJSLine( 0, "return {");
|
||||||
}
|
var ___v4048342 = 0; ___l3534726: for ( i= 1; i <= (QB.func_UBound( exportLines)); i= i + 1) { if (QB.halted()) { return; } ___v4048342++; if (___v4048342 % 100 == 0) { await QB.autoLimit(); }
|
||||||
QB.resizeArray(exportLines, [{l:0,u:0}], '', false); /* STRING */
|
await sub_AddJSLine( i, QB.arrayValue(exportLines, [ i]).value);
|
||||||
|
}
|
||||||
|
await sub_AddJSLine( 0, "};");
|
||||||
|
QB.resizeArray(exportLines, [{l:0,u:0}], '', false); /* STRING */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
async function sub_ReadLinesFromFile(filename/*STRING*/) {
|
async function sub_ReadLinesFromFile(filename/*STRING*/) {
|
||||||
if (QB.halted()) { return; };
|
if (QB.halted()) { return; };
|
||||||
|
|
|
@ -876,7 +876,7 @@ Sub RegisterExport (exportName As String, exportedItem As String)
|
||||||
Dim esize
|
Dim esize
|
||||||
esize = UBound(exportLines) + 1
|
esize = UBound(exportLines) + 1
|
||||||
ReDim _Preserve exportLines(esize) As String
|
ReDim _Preserve exportLines(esize) As String
|
||||||
exportLines(esize) = "this." + exportName + " = " + exportedItem + ";"
|
exportLines(esize) = exportName + ": " + exportedItem + ","
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Function ConvertSub$ (m As Method, args As String, lineNumber As Integer)
|
Function ConvertSub$ (m As Method, args As String, lineNumber As Integer)
|
||||||
|
@ -2300,10 +2300,14 @@ Sub ConvertMethods ()
|
||||||
Next i
|
Next i
|
||||||
|
|
||||||
' Add the export lines
|
' Add the export lines
|
||||||
For i = 1 To UBound(exportLines)
|
If UBound(exportLines) > 0 Then
|
||||||
AddJSLine i, exportLines(i)
|
AddJSLine 0, "return {"
|
||||||
Next i
|
For i = 1 To UBound(exportLines)
|
||||||
ReDim exportLines(0) As String
|
AddJSLine i, exportLines(i)
|
||||||
|
Next i
|
||||||
|
AddJSLine 0, "};"
|
||||||
|
ReDim exportLines(0) As String
|
||||||
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue