open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Lua 5.2 compatibility fixes.

Browse Source
This commit is contained in:
James Roseborough
2012-09-06 04:19:51 +00:00
parent a5fddce465
commit 29e2a3d61f
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/org/luaj/vm2/compiler/DumpState.java
View File

@@ -163,7 +163,7 @@ public class DumpState {
n = f.p.length; n = f.p.length;
dumpInt(n); dumpInt(n);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
dumpFunction(f.p[i], f.source); dumpFunction(f.p[i]);
} }
void dumpUpvalues(final Prototype f) throws IOException { void dumpUpvalues(final Prototype f) throws IOException {
@@ -177,7 +177,10 @@ public class DumpState {
void dumpDebug(final Prototype f) throws IOException { void dumpDebug(final Prototype f) throws IOException {
int i, n; int i, n;
dumpString(strip ? null: f.source); if (strip)
dumpInt(0);
else
dumpString(f.source);
n = strip ? 0 : f.lineinfo.length; n = strip ? 0 : f.lineinfo.length;
dumpInt(n); dumpInt(n);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
@@ -196,11 +199,7 @@ public class DumpState {
dumpString(f.upvalues[i].name); dumpString(f.upvalues[i].name);
} }
void dumpFunction(final Prototype f, final LuaString string) throws IOException { void dumpFunction(final Prototype f) throws IOException {
// if ( f.source == null || f.source.equals(string) || strip )
// dumpInt(0);
// else
// dumpString(f.source);
dumpInt(f.linedefined); dumpInt(f.linedefined);
dumpInt(f.lastlinedefined); dumpInt(f.lastlinedefined);
dumpChar(f.numparams); dumpChar(f.numparams);
@@ -231,7 +230,7 @@ public class DumpState {
public static int dump( Prototype f, OutputStream w, boolean strip ) throws IOException { public static int dump( Prototype f, OutputStream w, boolean strip ) throws IOException {
DumpState D = new DumpState(w,strip); DumpState D = new DumpState(w,strip);
D.dumpHeader(); D.dumpHeader();
D.dumpFunction(f,null); D.dumpFunction(f);
return D.status; return D.status;
} }
@@ -260,7 +259,7 @@ public class DumpState {
D.NUMBER_FORMAT = numberFormat; D.NUMBER_FORMAT = numberFormat;
D.SIZEOF_LUA_NUMBER = (numberFormat==NUMBER_FORMAT_INTS_ONLY? 4: 8); D.SIZEOF_LUA_NUMBER = (numberFormat==NUMBER_FORMAT_INTS_ONLY? 4: 8);
D.dumpHeader(); D.dumpHeader();
D.dumpFunction(f,null); D.dumpFunction(f);
return D.status; return D.status;
} }
} }