Mercurial Hosting > luan
diff src/luan/interp/GenericForStmt.java @ 111:2428ecfed375
change LuanFunction.call() from returning Object[] to returning Object, to reduce garbage collection
git-svn-id: https://luan-java.googlecode.com/svn/trunk@112 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Fri, 23 May 2014 20:40:05 +0000 |
| parents | 219e05867366 |
| children |
line wrap: on
line diff
--- a/src/luan/interp/GenericForStmt.java Fri May 23 04:36:47 2014 +0000 +++ b/src/luan/interp/GenericForStmt.java Fri May 23 20:40:05 2014 +0000 @@ -27,11 +27,21 @@ String name = iterExpr.se().text(); try { while(true) { - Object[] vals = bit.call(iter,name); - if( vals.length==0 || vals[0]==null ) + Object vals = bit.call(iter,name); + if( vals==null ) break; - for( int i=0; i<nVars; i++ ) { - luan.stackSet( iVars+i, i < vals.length ? vals[i] : null ); + if( vals instanceof Object[] ) { + Object[] a = (Object[])vals; + if( a.length==0 ) + break; + for( int i=0; i<nVars; i++ ) { + luan.stackSet( iVars+i, i < a.length ? a[i] : null ); + } + } else { + luan.stackSet( iVars, vals ); + for( int i=1; i<nVars; i++ ) { + luan.stackSet( iVars+i, null ); + } } block.eval(luan); }