Mercurial Hosting > luan
diff src/luan/CmdLine.java @ 36:2a35154aec14
implement more basic lib functions
git-svn-id: https://luan-java.googlecode.com/svn/trunk@37 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Tue, 18 Dec 2012 09:53:42 +0000 |
| parents | e51906de0f11 |
| children | 8a57ebfdfd78 |
line wrap: on
line diff
--- a/src/luan/CmdLine.java Tue Dec 18 07:05:58 2012 +0000 +++ b/src/luan/CmdLine.java Tue Dec 18 09:53:42 2012 +0000 @@ -1,6 +1,5 @@ package luan; -import java.io.InputStreamReader; import java.util.Arrays; import java.util.Scanner; import luan.lib.BasicLib; @@ -39,10 +38,8 @@ System.exit(-1); } } else if( arg.equals("-") ) { - String cmd = BasicLib.readAll(new InputStreamReader(System.in)); try { - LuaFunction fn = BasicLib.load(lua,cmd); - fn.call(lua); + BasicLib.dofile(lua,null); } catch(LuaException e) { System.err.println(e.getMessage()); System.exit(-1); @@ -100,7 +97,7 @@ LuaFunction fn = BasicLib.load(lua,input); Object[] rtn = fn.call(lua); if( rtn.length > 0 ) - BasicLib.print(rtn); + BasicLib.print(lua,rtn); } catch(LuaException e) { System.out.println(e.getMessage()); }