diff --git a/README.html b/README.html
index 25f6a7fa..23febac1 100644
--- a/README.html
+++ b/README.html
@@ -142,7 +142,7 @@ The following pattern is used within Java SE
import org.luaj.vm2.*;
- import org.luaj.vm2.lib.*;
+ import org.luaj.vm2.lib.jse.*;
String script = "examples/lua/hello.lua";
LuaValue _G = JsePlatform.standardGlobals();
@@ -165,7 +165,7 @@ The for MIDlets the JmePlatform is used instead:
import org.luaj.vm2.*;
- import org.luaj.vm2.lib.*;
+ import org.luaj.vm2.lib.jme.*;
String script = "examples/lua/hello.lua";
LuaValue _G = JmePlatform.standardGlobals();
diff --git a/examples/jme/SampleMIDlet.java b/examples/jme/SampleMIDlet.java
index 70060fd7..19fd4734 100644
--- a/examples/jme/SampleMIDlet.java
+++ b/examples/jme/SampleMIDlet.java
@@ -5,6 +5,7 @@ import javax.microedition.midlet.MIDletStateChangeException;
import org.luaj.vm2.*;
import org.luaj.vm2.lib.*;
+import org.luaj.vm2.lib.jme.JmePlatform;
import org.luaj.vm2.compiler.LuaC;
diff --git a/examples/jse/SampleJseMain.java b/examples/jse/SampleJseMain.java
index 61ab10b2..95610081 100644
--- a/examples/jse/SampleJseMain.java
+++ b/examples/jse/SampleJseMain.java
@@ -1,7 +1,7 @@
import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
public class SampleJseMain {
diff --git a/src/core/org/luaj/vm2/lib/DebugLib.java b/src/core/org/luaj/vm2/lib/DebugLib.java
index eb1689ac..bddb1909 100644
--- a/src/core/org/luaj/vm2/lib/DebugLib.java
+++ b/src/core/org/luaj/vm2/lib/DebugLib.java
@@ -312,8 +312,11 @@ public class DebugLib extends VarArgFunction {
ds.nextInfo().setargs( args, stack );
}
- /** Called by Closures and recursing java functions on entry
- * @param calls */
+ /** Called by Closures and recursing java functions on entry
+ * @param thread the thread for the call
+ * @param calls the number of calls in the call stack
+ * @param func the function called
+ */
public static void debugOnCall(LuaThread thread, int calls, LuaFunction func) {
DebugState ds = getDebugState();
if ( ds.inhook )
@@ -326,8 +329,9 @@ public class DebugLib extends VarArgFunction {
}
/** Called by Closures and recursing java functions on return
- * @param running_calls
- * @param thread */
+ * @param thread the thread for the call
+ * @param calls the number of calls in the call stack
+ */
public static void debugOnReturn(LuaThread thread, int calls) {
DebugState ds = getDebugState(thread);
if ( ds.inhook )
@@ -668,7 +672,7 @@ public class DebugLib extends VarArgFunction {
* Get file and line for a particular level, even if it is a java function.
*
* @param level 0-based index of level to get
- * @return
+ * @return String containing file and line info if available
*/
public static String fileline(int level) {
DebugState ds = getDebugState(LuaThread.getRunning());
diff --git a/src/core/org/luaj/vm2/lib/IoLib.java b/src/core/org/luaj/vm2/lib/IoLib.java
index 7aab7c92..45b1042c 100644
--- a/src/core/org/luaj/vm2/lib/IoLib.java
+++ b/src/core/org/luaj/vm2/lib/IoLib.java
@@ -91,7 +91,10 @@ public class IoLib extends OneArgFunction {
/**
* Open a file in a particular mode.
* @param filename
- * @param mode
+ * @param readMode true if opening in read mode
+ * @param appendMode true if opening in append mode
+ * @param updateMode true if opening in update mode
+ * @param binaryMode true if opening in binary mode
* @return File object if successful
* @throws IOException if could not be opened
*/
diff --git a/src/jme/org/luaj/vm2/lib/JmePlatform.java b/src/jme/org/luaj/vm2/lib/jme/JmePlatform.java
similarity index 87%
rename from src/jme/org/luaj/vm2/lib/JmePlatform.java
rename to src/jme/org/luaj/vm2/lib/jme/JmePlatform.java
index 5f5a84ee..fbd648ae 100644
--- a/src/jme/org/luaj/vm2/lib/JmePlatform.java
+++ b/src/jme/org/luaj/vm2/lib/jme/JmePlatform.java
@@ -19,12 +19,19 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
******************************************************************************/
-package org.luaj.vm2.lib;
+package org.luaj.vm2.lib.jme;
import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaThread;
-import org.luaj.vm2.lib.jme.JmeIoLib;
+import org.luaj.vm2.lib.BaseLib;
+import org.luaj.vm2.lib.CoroutineLib;
+import org.luaj.vm2.lib.DebugLib;
+import org.luaj.vm2.lib.MathLib;
+import org.luaj.vm2.lib.OsLib;
+import org.luaj.vm2.lib.PackageLib;
+import org.luaj.vm2.lib.StringLib;
+import org.luaj.vm2.lib.TableLib;
public class JmePlatform {
diff --git a/src/jse/lua.java b/src/jse/lua.java
index fe5eea3b..bd585a0a 100644
--- a/src/jse/lua.java
+++ b/src/jse/lua.java
@@ -32,7 +32,7 @@ import org.luaj.vm2.Lua;
import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.luajc.LuaJC;
diff --git a/src/jse/lua2java.java b/src/jse/lua2java.java
index e85fda51..bde80ee4 100644
--- a/src/jse/lua2java.java
+++ b/src/jse/lua2java.java
@@ -30,7 +30,7 @@ import java.util.List;
import org.luaj.vm2.Lua;
import org.luaj.vm2.ast.Chunk;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.lua2java.JavaCodeGen;
import org.luaj.vm2.parser.LuaParser;
diff --git a/src/jse/luajc.java b/src/jse/luajc.java
index b98963e5..1525f221 100644
--- a/src/jse/luajc.java
+++ b/src/jse/luajc.java
@@ -32,7 +32,7 @@ import java.util.List;
import org.luaj.vm2.Lua;
import org.luaj.vm2.compiler.DumpState;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.luajc.LuaJC;
/**
diff --git a/src/jse/org/luaj/vm2/lib/JsePlatform.java b/src/jse/org/luaj/vm2/lib/jse/JsePlatform.java
similarity index 90%
rename from src/jse/org/luaj/vm2/lib/JsePlatform.java
rename to src/jse/org/luaj/vm2/lib/jse/JsePlatform.java
index 135b9d80..01c0f0ff 100644
--- a/src/jse/org/luaj/vm2/lib/JsePlatform.java
+++ b/src/jse/org/luaj/vm2/lib/jse/JsePlatform.java
@@ -19,16 +19,16 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
******************************************************************************/
-package org.luaj.vm2.lib;
+package org.luaj.vm2.lib.jse;
import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaThread;
-import org.luaj.vm2.lib.jse.JseBaseLib;
-import org.luaj.vm2.lib.jse.JseIoLib;
-import org.luaj.vm2.lib.jse.JseMathLib;
-import org.luaj.vm2.lib.jse.JseOsLib;
-import org.luaj.vm2.lib.jse.LuajavaLib;
+import org.luaj.vm2.lib.CoroutineLib;
+import org.luaj.vm2.lib.DebugLib;
+import org.luaj.vm2.lib.PackageLib;
+import org.luaj.vm2.lib.StringLib;
+import org.luaj.vm2.lib.TableLib;
public class JsePlatform {
diff --git a/src/jse/org/luaj/vm2/script/LuaScriptEngine.java b/src/jse/org/luaj/vm2/script/LuaScriptEngine.java
index 83ab7fce..72fc3f4e 100644
--- a/src/jse/org/luaj/vm2/script/LuaScriptEngine.java
+++ b/src/jse/org/luaj/vm2/script/LuaScriptEngine.java
@@ -46,7 +46,7 @@ import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Prototype;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
/**
*
diff --git a/test/java/org/luaj/luajc/TestLuaJ.java b/test/java/org/luaj/luajc/TestLuaJ.java
index 4d9b9ab3..04edb2a9 100644
--- a/test/java/org/luaj/luajc/TestLuaJ.java
+++ b/test/java/org/luaj/luajc/TestLuaJ.java
@@ -30,7 +30,7 @@ import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Print;
import org.luaj.vm2.Prototype;
import org.luaj.vm2.compiler.LuaC;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
/** Test the plain old bytecode interpreter */
public class TestLuaJ {
diff --git a/test/java/org/luaj/luajc/TestLuaJC.java b/test/java/org/luaj/luajc/TestLuaJC.java
index 51e81767..b8a9ff52 100644
--- a/test/java/org/luaj/luajc/TestLuaJC.java
+++ b/test/java/org/luaj/luajc/TestLuaJC.java
@@ -30,7 +30,7 @@ import java.util.Hashtable;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.luajc.LuaJC;
public class TestLuaJC {
diff --git a/test/junit/org/luaj/vm2/FragmentsTest.java b/test/junit/org/luaj/vm2/FragmentsTest.java
index 569732f0..cb7b7305 100644
--- a/test/junit/org/luaj/vm2/FragmentsTest.java
+++ b/test/junit/org/luaj/vm2/FragmentsTest.java
@@ -71,7 +71,7 @@ public class FragmentsTest extends TestSuite {
public void runFragment( Varargs expected, String script ) {
try {
String name = getName();
- LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
+ LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
InputStream is = new ByteArrayInputStream(script.getBytes("UTF-8"));
LuaValue chunk ;
switch ( TEST_TYPE ) {
diff --git a/test/junit/org/luaj/vm2/LuaOperationsTest.java b/test/junit/org/luaj/vm2/LuaOperationsTest.java
index 29b465bc..7945fdc3 100644
--- a/test/junit/org/luaj/vm2/LuaOperationsTest.java
+++ b/test/junit/org/luaj/vm2/LuaOperationsTest.java
@@ -179,7 +179,7 @@ public class LuaOperationsTest extends TestCase {
public Prototype createPrototype( String script, String name ) {
try {
- LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
+ LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
InputStream is = new ByteArrayInputStream(script.getBytes("UTF-8"));
return LuaC.instance.compile(is, name);
} catch (Exception e) {
@@ -195,7 +195,7 @@ public class LuaOperationsTest extends TestCase {
// set up suitable environments for execution
LuaValue aaa = LuaValue.valueOf("aaa");
LuaValue eee = LuaValue.valueOf("eee");
- LuaTable _G = org.luaj.vm2.lib.JsePlatform.standardGlobals();
+ LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.standardGlobals();
LuaTable newenv = LuaValue.tableOf( new LuaValue[] {
LuaValue.valueOf("a"), LuaValue.valueOf("aaa"),
LuaValue.valueOf("b"), LuaValue.valueOf("bbb"), } );
diff --git a/test/junit/org/luaj/vm2/MathLibTest.java b/test/junit/org/luaj/vm2/MathLibTest.java
index df34a8f2..47e34238 100644
--- a/test/junit/org/luaj/vm2/MathLibTest.java
+++ b/test/junit/org/luaj/vm2/MathLibTest.java
@@ -2,9 +2,9 @@ package org.luaj.vm2;
import junit.framework.TestCase;
-import org.luaj.vm2.lib.JsePlatform;
import org.luaj.vm2.lib.MathLib;
import org.luaj.vm2.lib.jse.JseMathLib;
+import org.luaj.vm2.lib.jse.JsePlatform;
public class MathLibTest extends TestCase {
diff --git a/test/junit/org/luaj/vm2/RequireClassTest.java b/test/junit/org/luaj/vm2/RequireClassTest.java
index 38260ed4..3f074354 100644
--- a/test/junit/org/luaj/vm2/RequireClassTest.java
+++ b/test/junit/org/luaj/vm2/RequireClassTest.java
@@ -2,7 +2,7 @@ package org.luaj.vm2;
import junit.framework.TestCase;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
import org.luaj.vm2.require.RequireSampleClassCastExcep;
import org.luaj.vm2.require.RequireSampleLoadLuaError;
import org.luaj.vm2.require.RequireSampleLoadRuntimeExcep;
diff --git a/test/junit/org/luaj/vm2/ScriptDrivenTest.java b/test/junit/org/luaj/vm2/ScriptDrivenTest.java
index ca0f4cfa..ed6de2e2 100644
--- a/test/junit/org/luaj/vm2/ScriptDrivenTest.java
+++ b/test/junit/org/luaj/vm2/ScriptDrivenTest.java
@@ -58,10 +58,10 @@ public class ScriptDrivenTest extends TestCase {
case JSE:
case LUAJIT:
case LUA2JAVA:
- _G = org.luaj.vm2.lib.JsePlatform.debugGlobals();
+ _G = org.luaj.vm2.lib.jse.JsePlatform.debugGlobals();
break;
case JME:
- _G = org.luaj.vm2.lib.JmePlatform.debugGlobals();
+ _G = org.luaj.vm2.lib.jme.JmePlatform.debugGlobals();
break;
}
}
diff --git a/test/junit/org/luaj/vm2/StringTest.java b/test/junit/org/luaj/vm2/StringTest.java
index a158679b..b2b2f612 100644
--- a/test/junit/org/luaj/vm2/StringTest.java
+++ b/test/junit/org/luaj/vm2/StringTest.java
@@ -6,7 +6,7 @@ import java.io.UnsupportedEncodingException;
import junit.framework.TestCase;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
public class StringTest extends TestCase {
diff --git a/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java b/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java
index 5c6e430f..292a7e41 100644
--- a/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java
+++ b/test/junit/org/luaj/vm2/compiler/AbstractUnitTests.java
@@ -15,7 +15,7 @@ import org.luaj.vm2.LoadState;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.Print;
import org.luaj.vm2.Prototype;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
abstract public class AbstractUnitTests extends TestCase {
diff --git a/test/junit/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java b/test/junit/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java
index e9781c66..119d0ea5 100644
--- a/test/junit/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java
+++ b/test/junit/org/luaj/vm2/compiler/DumpLoadEndianIntTest.java
@@ -15,7 +15,7 @@ import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Prototype;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
public class DumpLoadEndianIntTest extends TestCase {
diff --git a/test/junit/org/luaj/vm2/compiler/SimpleTests.java b/test/junit/org/luaj/vm2/compiler/SimpleTests.java
index f4182066..e8b2ae1f 100644
--- a/test/junit/org/luaj/vm2/compiler/SimpleTests.java
+++ b/test/junit/org/luaj/vm2/compiler/SimpleTests.java
@@ -10,7 +10,7 @@ import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaInteger;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.JsePlatform;
+import org.luaj.vm2.lib.jse.JsePlatform;
public class SimpleTests extends TestCase {
diff --git a/test/junit/org/luaj/vm2/lib/jse/LuaJavaCoercionTest.java b/test/junit/org/luaj/vm2/lib/jse/LuaJavaCoercionTest.java
index bc867b86..a555c4e9 100644
--- a/test/junit/org/luaj/vm2/lib/jse/LuaJavaCoercionTest.java
+++ b/test/junit/org/luaj/vm2/lib/jse/LuaJavaCoercionTest.java
@@ -10,7 +10,6 @@ import org.luaj.vm2.LuaUserdata;
import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Varargs;
import org.luaj.vm2.compiler.LuaC;
-import org.luaj.vm2.lib.JsePlatform;
public class LuaJavaCoercionTest extends TestCase {
diff --git a/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java b/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java
index 84de6261..825ca3ff 100644
--- a/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java
+++ b/test/junit/org/luaj/vm2/vm1/Luajvm1CompatibilityTest.java
@@ -129,7 +129,7 @@ public class Luajvm1CompatibilityTest extends TestCase {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PrintStream printStream = new PrintStream( outputStream );
try {
- org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.JsePlatform.debugGlobals();
+ org.luaj.vm2.LuaTable _G = org.luaj.vm2.lib.jse.JsePlatform.debugGlobals();
LuaThread.getRunning().setfenv(_G);
LuaValue loader = new org.luaj.vm2.lib.OneArgFunction(_G) {
public LuaValue call(LuaValue arg) {