diff src/luan/lib/BasicLib.java @ 42:786699c78837

implement try-catch git-svn-id: https://luan-java.googlecode.com/svn/trunk@43 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Sun, 23 Dec 2012 06:36:56 +0000
parents c53dc854e6cc
children 80b67b1a653c
line wrap: on
line diff
--- a/src/luan/lib/BasicLib.java	Fri Dec 21 19:34:50 2012 +0000
+++ b/src/luan/lib/BasicLib.java	Sun Dec 23 06:36:56 2012 +0000
@@ -26,7 +26,7 @@
 		LuaTable global = lua.global();
 		global.put( "_G", global );
 		add( global, "do_file", LuaState.class, String.class );
-		add( global, "error", LuaState.class, String.class );
+		add( global, "error", LuaState.class, Object.class );
 		add( global, "get_metatable", LuaState.class, Object.class );
 		add( global, "ipairs", LuaTable.class );
 		add( global, "load", LuaState.class, String.class, String.class );
@@ -225,7 +225,7 @@
 		return lua.toString(LuaElement.JAVA,v);
 	}
 
-	public static void error(LuaState lua,String msg) throws LuaException {
+	public static void error(LuaState lua,Object msg) throws LuaException {
 		throw new LuaException(lua,LuaElement.JAVA,msg);
 	}