Mercurial Hosting > luan

comparison core/src/luan/modules/PackageLuan.java @ 411:23b99a5039b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove Luan.newTable()
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 29 Apr 2015 16:05:02 -0600
parents 673eebd83b74
children 23a93c118042
comparison
equal deleted inserted replaced
410:0d6098a29b3e 411:23b99a5039b5
24 } 24 }
25 25
26 public static LuanTable loaded(LuanState luan) { 26 public static LuanTable loaded(LuanState luan) {
27 LuanTable tbl = (LuanTable)luan.registry().get("Package.loaded"); 27 LuanTable tbl = (LuanTable)luan.registry().get("Package.loaded");
28 if( tbl == null ) { 28 if( tbl == null ) {
29 tbl = Luan.newTable(); 29 tbl = new LuanTable();
30 luan.registry().put("Package.loaded",tbl); 30 luan.registry().put("Package.loaded",tbl);
31 } 31 }
32 return tbl; 32 return tbl;
33 } 33 }
34 34
47 mod = JavaLuan.load(luan,modName.substring(5)); 47 mod = JavaLuan.load(luan,modName.substring(5));
48 } else { 48 } else {
49 String src = read(luan,modName+".luan"); 49 String src = read(luan,modName+".luan");
50 if( src == null ) 50 if( src == null )
51 return null; 51 return null;
52 LuanTable env = Luan.newTable(); 52 LuanTable env = new LuanTable();
53 LuanFunction loader = BasicLuan.load(luan,src,modName,env,false); 53 LuanFunction loader = BasicLuan.load(luan,src,modName,env,false);
54 Object result = Luan.first( 54 Object result = Luan.first(
55 luan.call(loader,"<require \""+modName+"\">",new Object[]{modName}) 55 luan.call(loader,"<require \""+modName+"\">",new Object[]{modName})
56 ); 56 );
57 mod = result!=null ? result : env; 57 mod = result!=null ? result : env;