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

1. renamed DebugResponseStack to DebugResponseVariables

Browse Source 
2. added getGlobal to DebugStackState for supporting the Globals view
3. converted tabs to 4 whitespaces in some files
This commit is contained in:
Shu Lei
2007-11-07 19:33:06 +00:00
parent d6a3525357
commit 3bf2fc2958
6 changed files with 214 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/lua/debug/DebugStackState.java
View File

@@ -43,7 +43,7 @@ import lua.debug.request.DebugRequestType;
import lua.debug.response.DebugResponse;
import lua.debug.response.DebugResponseCallgraph;
import lua.debug.response.DebugResponseSimple;
import lua.debug.response.DebugResponseStack;
import lua.debug.response.DebugResponseVariables;
import lua.io.LocVars;
import lua.io.Proto;
import lua.value.LTable;
@@ -328,7 +328,9 @@ public class DebugStackState extends StackState implements DebugRequestListener
} else if (DebugRequestType.stack == requestType) {
DebugRequestStack stackRequest = (DebugRequestStack) request;
int index = stackRequest.getIndex();
return new DebugResponseStack(getStack(index));
return new DebugResponseVariables(getStack(index));
} else if (DebugRequestType.global == requestType) {
return new DebugResponseVariables(getGlobals());
} else if (DebugRequestType.stepInto == requestType) {
DebugEvent event = new DebugEvent(
DebugEventType.resumedOnSteppingInto);
@@ -485,6 +487,26 @@ public class DebugStackState extends StackState implements DebugRequestListener
return result;
}
/**
* Returns the visible globals to the current VM.
* @return the visible globals.
*/
public Variable[] getGlobals() {
Vector variables = new Vector();
variables.addElement(
new TableVariable(0,
"*Globals*",
Lua.LUA_TTABLE,
(LTable) _G));
Variable[] result = new Variable[variables.size()];
for (int i = 0; i < variables.size(); i++) {
result[i] = (Variable) variables.elementAt(i);
}
return result;
}
private void dumpStack(int index) {
CallInfo callInfo = calls[index];
LocVars[] localVariables = callInfo.closure.p.locvars;

30
src/main/java/lua/debug/SerializationHelper.java
View File

@@ -16,7 +16,7 @@ import lua.debug.request.DebugRequestStack;
import lua.debug.request.DebugRequestType;
import lua.debug.response.DebugResponseCallgraph;
import lua.debug.response.DebugResponseSimple;
import lua.debug.response.DebugResponseStack;
import lua.debug.response.DebugResponseVariables;
public class SerializationHelper {
@@ -46,12 +46,11 @@ public class SerializationHelper {
return object;
}
static final int SERIAL_TYPE_NullableString = 0;
static final int SERIAL_TYPE_TableVariable = 1;
static final int SERIAL_TYPE_Variable = 2;
static final int SERIAL_TYPE_DebugResponseCallgraph = 3;
static final int SERIAL_TYPE_DebugResponseStack = 4;
static final int SERIAL_TYPE_DebugResponseVariables = 4;
static final int SERIAL_TYPE_DebugResponseSimple = 5;
static final int SERIAL_TYPE_StackFrame = 6;
static final int SERIAL_TYPE_DebugRequestType = 7;
@@ -80,12 +79,13 @@ public class SerializationHelper {
} else if (object instanceof DebugResponseSimple) {
dout.writeInt(SERIAL_TYPE_DebugResponseSimple);
DebugResponseSimple.serialize(dout, (DebugResponseSimple) object);
} else if (object instanceof DebugResponseStack) {
dout.writeInt(SERIAL_TYPE_DebugResponseStack);
DebugResponseStack.serialize(dout, (DebugResponseStack)object);
} else if (object instanceof DebugResponseVariables) {
dout.writeInt(SERIAL_TYPE_DebugResponseVariables);
DebugResponseVariables.serialize(dout, (DebugResponseVariables) object);
} else if (object instanceof DebugResponseCallgraph) {
dout.writeInt(SERIAL_TYPE_DebugResponseCallgraph);
DebugResponseCallgraph.serialize(dout, (DebugResponseCallgraph)object);
DebugResponseCallgraph.serialize(dout,
(DebugResponseCallgraph) object);
} else if (object instanceof DebugRequestType) {
dout.writeInt(SERIAL_TYPE_DebugRequestType);
DebugRequestType.serialize(dout, (DebugRequestType) object);
@@ -94,7 +94,8 @@ public class SerializationHelper {
DebugRequestStack.serialize(dout, (DebugRequestStack) object);
} else if (object instanceof DebugRequestLineBreakpointToggle) {
dout.writeInt(SERIAL_TYPE_DebugRequestLineBreakpointToggle);
DebugRequestLineBreakpointToggle.serialize(dout, (DebugRequestLineBreakpointToggle)object);
DebugRequestLineBreakpointToggle.serialize(dout,
(DebugRequestLineBreakpointToggle) object);
} else if (object instanceof DebugRequest) {
dout.writeInt(SERIAL_TYPE_DebugRequest);
DebugRequest.serialize(dout, (DebugRequest) object);
@@ -111,8 +112,10 @@ public class SerializationHelper {
dout.writeInt(SERIAL_TYPE_DebugEvent);
DebugEvent.serialize(dout, (DebugEvent) object);
} else {
// catch the errors: forgot to implement serialization/deserialization
throw new RuntimeException("serialization operation is not supported");
// catch the errors: forgot to implement
// serialization/deserialization
throw new RuntimeException(
"serialization operation is not supported");
}
}
@@ -139,8 +142,8 @@ public class SerializationHelper {
case SERIAL_TYPE_DebugResponseCallgraph:
object = DebugResponseCallgraph.deserialize(din);
break;
case SERIAL_TYPE_DebugResponseStack:
object = DebugResponseStack.deserialize(din);
case SERIAL_TYPE_DebugResponseVariables:
object = DebugResponseVariables.deserialize(din);
break;
case SERIAL_TYPE_DebugRequestType:
object = DebugRequestType.deserialize(din);
@@ -167,7 +170,8 @@ public class SerializationHelper {
object = DebugEvent.deserialize(din);
break;
default:
throw new RuntimeException("deserialization operation is not supported");
throw new RuntimeException(
"deserialization operation is not supported");
}
return object;

6
src/main/java/lua/debug/request/DebugRequest.java
View File

@@ -52,8 +52,10 @@ public class DebugRequest implements Serializable {
SerializationHelper.serialize(type, out);
}
public static DebugRequest deserialize(DataInputStream in) throws IOException {
DebugRequestType type = (DebugRequestType) SerializationHelper.deserialize(in);
public static DebugRequest deserialize(DataInputStream in)
throws IOException {
DebugRequestType type = (DebugRequestType) SerializationHelper
.deserialize(in);
return new DebugRequest(type);
}
}

4
src/main/java/lua/debug/request/DebugRequestType.java
View File

@@ -41,6 +41,7 @@ public class DebugRequestType extends EnumType {
public static final DebugRequestType stepInto = new DebugRequestType("stepInto", 10);
public static final DebugRequestType stepOver = new DebugRequestType("stepOver", 11);
public static final DebugRequestType stepReturn = new DebugRequestType("stepReturn", 12);
public static final DebugRequestType global = new DebugRequestType("global", 13);
protected static final DebugRequestType[] ENUMS = new DebugRequestType[] {
start,
@@ -55,7 +56,8 @@ public class DebugRequestType extends EnumType {
stack,
stepInto,
stepOver,
stepReturn
stepReturn,
global
};
public DebugRequestType(String name, int ordinal) {

12
src/main/java/lua/debug/response/DebugResponseStack.java → src/main/java/lua/debug/response/DebugResponseVariables.java
View File

@@ -28,10 +28,10 @@ import java.io.IOException;
import lua.debug.SerializationHelper;
import lua.debug.Variable;
public class DebugResponseStack implements DebugResponse {
public class DebugResponseVariables implements DebugResponse {
protected Variable[] variables;
public DebugResponseStack(Variable[] variables) {
public DebugResponseVariables(Variable[] variables) {
if (variables == null) {
this.variables = new Variable[0];
} else {
@@ -54,7 +54,8 @@ public class DebugResponseStack implements DebugResponse {
return buffer.toString();
}
public static void serialize(DataOutputStream out, DebugResponseStack response)
public static void serialize(DataOutputStream out,
DebugResponseVariables response)
throws IOException {
Variable[] variables = response.getVariables();
out.writeInt(variables == null ? 0 : variables.length);
@@ -63,12 +64,13 @@ public class DebugResponseStack implements DebugResponse {
}
}
public static DebugResponseStack deserialize(DataInputStream in) throws IOException {
public static DebugResponseVariables deserialize(DataInputStream in)
throws IOException {
int count = in.readInt();
Variable[] variables = new Variable[count];
for (int i = 0; i < count; i++) {
variables[i] = (Variable) SerializationHelper.deserialize(in);
}
return new DebugResponseStack(variables);
return new DebugResponseVariables(variables);
}
}

8
src/test/java/lua/debug/DebugResponseTest.java
View File

@@ -6,7 +6,7 @@ import junit.framework.TestCase;
import lua.Lua;
import lua.debug.response.DebugResponseCallgraph;
import lua.debug.response.DebugResponseSimple;
import lua.debug.response.DebugResponseStack;
import lua.debug.response.DebugResponseVariables;
public class DebugResponseTest extends TestCase {
public void testDebugResponseSimpleSerialization() {
@@ -46,10 +46,10 @@ public class DebugResponseTest extends TestCase {
private void doTestDebugResponseStackSerialization(Variable[] variables)
throws IOException {
DebugResponseStack stackIn = new DebugResponseStack(variables);
DebugResponseVariables stackIn = new DebugResponseVariables(variables);
byte[] data = SerializationHelper.serialize(stackIn);
DebugResponseStack stackOut
= (DebugResponseStack) SerializationHelper.deserialize(data);
DebugResponseVariables stackOut
= (DebugResponseVariables) SerializationHelper.deserialize(data);
Variable[] variablesIn = stackIn.getVariables();
Variable[] variablesOut = stackOut.getVariables();
assertNotNull(variablesIn);