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

added getDebugHost() and getDebugPort() methods to Platform for convenience

Browse Source
This commit is contained in:
Shu Lei
2007-12-01 01:04:34 +00:00
parent 9fd34436fe
commit 3c05880012
4 changed files with 134 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/org/luaj/vm/LuaState.java
View File

@@ -70,9 +70,13 @@ import org.luaj.lib.TableLib;
*/
public class LuaState extends Lua {
public static final String PROPERTY_LUAJ_DEBUG = "Luaj-Debug";
protected static final String DEBUG_CLASS_NAME = "org.luaj.debug.DebugLuaState";
public static final String PROPERTY_LUAJ_DEBUG = "Luaj-Debug";
public static final String PROPERTY_LUAJ_DEBUG_SUSPEND_AT_START = "Luaj-Debug-SuspendAtStart";
public static final String PROPERTY_LUAJ_DEBUG_HOST = "Luaj-Debug-Host";
public static final String PROPERTY_LUAJ_DEBUG_PORT = "Luaj-Debug-Port";
/* thread status; 0 is OK */
private static final int LUA_YIELD = 1;
private static final int LUA_ERRRUN = 2;

199
src/core/org/luaj/vm/Platform.java
View File

@@ -1,24 +1,24 @@
/*******************************************************************************
* Copyright (c) 2007 LuaJ. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
******************************************************************************/
* Copyright (c) 2007 LuaJ. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
******************************************************************************/
package org.luaj.vm;
import java.io.IOException;
@@ -29,81 +29,114 @@ import java.io.Reader;
/**
* Singleton to manage platform-specific behaviors.
*
* @deprecated - will probably be replaced with Config, LuaConfig or something similar.
* @deprecated - will probably be replaced with Config, LuaConfig or something
* similar.
*/
abstract public class Platform {
private static Platform instance;
private static Platform instance;
/**
* Singleton to be used for platform operations.
*
* The default Platform gets files as resources,
* and converts them to characters using the default
* InputStreamReader class.
*/
public static Platform getInstance() {
/**
* Singleton to be used for platform operations.
*
* The default Platform gets files as resources, and converts them to
* characters using the default InputStreamReader class.
*/
public static Platform getInstance() {
if (instance == null) {
instance = new Platform() {
public Reader createReader(InputStream inputStream) {
return new InputStreamReader(inputStream);
}
public Reader createReader(InputStream inputStream) {
return new InputStreamReader(inputStream);
}
public InputStream openFile(String fileName) {
return getClass().getResourceAsStream("/" + fileName);
}
public InputStream openFile(String fileName) {
return getClass().getResourceAsStream("/" + fileName);
}
/**
* Assumes J2SE platform, return the corresponding system property
*/
public String getProperty(String propertyName) {
return System.getProperty(propertyName);
}
/**
* Assumes J2SE platform, return the corresponding system
* property
*/
public String getProperty(String propertyName) {
return System.getProperty(propertyName);
}
/**
* Provides a J2SE DebugSupport instance.
*/
public DebugNetSupport getDebugSupport() throws IOException {
return null;
}
};
}
return instance;
/**
* Provides a J2SE DebugSupport instance.
*/
public DebugNetSupport getDebugSupport() throws IOException {
return null;
}
};
}
return instance;
}
/**
* Set the Platform instance.
*
* This may be useful to define a file search path,
* or custom character encoding conversion properties.
*/
public static void setInstance( Platform platform ) {
instance = platform;
}
/**
* Set the Platform instance.
*
* This may be useful to define a file search path, or custom character
* encoding conversion properties.
*/
public static void setInstance(Platform platform) {
instance = platform;
}
/**
* Return an InputStream or null if not found for a particular file name.
* @param fileName Name of the file to open
* @return InputStream or null if not found.
*/
abstract public InputStream openFile( String fileName );
/**
* Return an InputStream or null if not found for a particular file name.
*
* @param fileName
* Name of the file to open
* @return InputStream or null if not found.
*/
abstract public InputStream openFile(String fileName);
/**
* Create Reader from an InputStream
* @param inputStream InputStream to read from
* @return Reader instance to use for character input
*/
abstract public Reader createReader( InputStream inputStream );
/**
* Create Reader from an InputStream
*
* @param inputStream
* InputStream to read from
* @return Reader instance to use for character input
*/
abstract public Reader createReader(InputStream inputStream);
/**
* Returns the value for the given platform property.
* @param propertyName Property name
* @return Property value
*/
abstract public String getProperty(String propertyName);
/**
* Returns the value for the given platform property.
*
* @param propertyName
* Property name
* @return Property value
*/
abstract public String getProperty(String propertyName);
/**
* Returns an platform dependent DebugSupport instance.
* @return an platform dependent DebugSupport instance.
*/
abstract public DebugNetSupport getDebugSupport() throws IOException;
/**
* Returns an platform dependent DebugSupport instance.
*
* @return an platform dependent DebugSupport instance.
*/
abstract public DebugNetSupport getDebugSupport() throws IOException;
/**
* Convenience method for the subclasses to figure out the debug host.
* @return the debug host property. If it is not present, null is returned.
*/
protected String getDebugHost() {
String host = getProperty(LuaState.PROPERTY_LUAJ_DEBUG_HOST);
return host;
}
/**
* Convenience method for the subclasses to figure out the debug port.
* @return -1 if the port is not found in the platform properties; the port
* as an integer if it is present in the platform properties and valid.
*/
protected int getDebugPort() {
String portStr = getProperty(LuaState.PROPERTY_LUAJ_DEBUG_PORT);
int port = -1;
if (portStr != null) {
try {
port = Integer.parseInt(portStr);
} catch (NumberFormatException e) {}
}
return port;
}
}

4
src/debug/org/luaj/debug/DebugLuaState.java
View File

@@ -50,10 +50,6 @@ import org.luaj.vm.Platform;
public class DebugLuaState extends LuaState implements DebugRequestListener {
public static final String PROPERTY_LUAJ_DEBUG_SUSPEND_AT_START = "Luaj-Debug-SuspendAtStart";
public static final String PROPERTY_LUAJ_DEBUG_HOST = "Luaj-Debug-Host";
public static final String PROPERTY_LUAJ_DEBUG_PORT = "Luaj-Debug-Port";
private static final boolean TRACE = (null != System.getProperty("TRACE"));
// stepping constants and stepping state

18
src/test/java/org/luaj/debug/j2se/LuaJVMTest.java
View File

@@ -66,26 +66,10 @@ public class LuaJVMTest extends TestCase {
* Provides a J2SE DebugSupport instance.
*/
public DebugNetSupport getDebugSupport() throws IOException {
int port = getDebugPortNumber();
int port = getDebugPort();
DebugSupportImpl debugSupport = new DebugSupportImpl(port);
return debugSupport;
}
private int getDebugPortNumber() throws IOException {
String portStr =
getProperty(DebugLuaState.PROPERTY_LUAJ_DEBUG_PORT);
int port = -1;
if (portStr == null) {
throw new IOException("Port number must be specified in the System property");
} else {
try {
port = Integer.parseInt(portStr);
} catch (NumberFormatException e) {
throw new IOException("Bad port number: " + portStr);
}
}
return port;
}
});
}