From bba4cf9a9961e1896f4a56c80f67e993a89e3042 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Tue, 22 Apr 2008 04:52:24 +0000
Subject: [PATCH] Reconcile C & Java typechecking on table.concat() and string
 .. concat operator

---
 src/core/org/luaj/lib/TableLib.java | 27 +++++++++------------------
 src/core/org/luaj/vm/LNumber.java   |  7 +++++++
 src/core/org/luaj/vm/LString.java   | 21 ++++-----------------
 src/core/org/luaj/vm/LValue.java    |  7 +++++++
 src/core/org/luaj/vm/LuaState.java  |  8 +++-----
 src/test/res/errors.lua             | 27 +++++++++++++++++++++++++++
 version.properties                  |  2 +-
 7 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/core/org/luaj/lib/TableLib.java b/src/core/org/luaj/lib/TableLib.java
index c30a28be..99d0366a 100644
--- a/src/core/org/luaj/lib/TableLib.java
+++ b/src/core/org/luaj/lib/TableLib.java
@@ -98,26 +98,17 @@ public class TableLib extends LFunction {
 			int n = vm.gettop();
 			LTable table = vm.totable(2);
 			LString sep = (n>=3? vm.tolstring(3): null);
-			int i = vm.tointeger(4);
-			int j = vm.tointeger(5);
-			int len = table.luaLength();
-			if ( i == 0 ) 
-				i = 1;
-			if ( j == 0 ) 
-				j = len;
+			int i = (n>=4? vm.tointeger(4): 1);
+			int j = (n>=5? vm.tointeger(5): table.luaLength());
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			try {
-				for ( int k=i; k<=j; k++ ) {
-					LValue v = table.get(k);
-						v.luaAsString().write(baos);
-						if ( k<j && sep!=null )
-							sep.write( baos );
-				}
-				vm.resettop();
-				vm.pushlstring( baos.toByteArray() );
-			} catch (IOException e) {
-				vm.error(e.getMessage());
+			for ( int k=i; k<=j; k++ ) {
+				LValue v = table.get(k);
+				v.luaConcatTo(baos);
+				if ( k<j && sep!=null )
+					sep.luaConcatTo( baos );
 			}
+			vm.resettop();
+			vm.pushlstring( baos.toByteArray() );
 			break;
 		}
 		
diff --git a/src/core/org/luaj/vm/LNumber.java b/src/core/org/luaj/vm/LNumber.java
index ed3fe15f..457064d2 100644
--- a/src/core/org/luaj/vm/LNumber.java
+++ b/src/core/org/luaj/vm/LNumber.java
@@ -21,6 +21,8 @@
 ******************************************************************************/
 package org.luaj.vm;
 
+import java.io.ByteArrayOutputStream;
+
 
 abstract
 public class LNumber extends LValue {
@@ -83,4 +85,9 @@ public class LNumber extends LValue {
 		return this;
 	}
 
+	/** Write as a string */
+	public void luaConcatTo(ByteArrayOutputStream baos) {
+		luaAsString().luaConcatTo( baos );
+	}
+
 }
diff --git a/src/core/org/luaj/vm/LString.java b/src/core/org/luaj/vm/LString.java
index e70e433b..0a278d87 100644
--- a/src/core/org/luaj/vm/LString.java
+++ b/src/core/org/luaj/vm/LString.java
@@ -22,6 +22,7 @@
 package org.luaj.vm;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
@@ -262,23 +263,6 @@ public class LString extends LValue {
 		return new LString( s );
 	}
 	
-	public static LString concat( final LString[] strings ) {
-		int length = 0;
-		for ( int i = 0; i < strings.length; ++i ) {
-			length += strings[i].length();
-		}
-		byte[] bytes = new byte[length];
-		
-		for ( int i = 0, offset = 0; i < strings.length; ++i ) {
-			LString s = strings[i];
-			final int len = s.length();
-			System.arraycopy( s.m_bytes, s.m_offset, bytes, offset, len );
-			offset += len;
-		}
-		
-		return new LString( bytes );
-	}
-	
 	/**
 	 * Write the specified substring of this string to the given output stream.
 	 */
@@ -437,5 +421,8 @@ public class LString extends LValue {
 		return m_bytes[m_offset + index] & 0x0FF;
 	}
 
+	public void luaConcatTo(ByteArrayOutputStream baos) {
+		baos.write( m_bytes, m_offset, m_length );
+	}
 
 }
diff --git a/src/core/org/luaj/vm/LValue.java b/src/core/org/luaj/vm/LValue.java
index b40354af..4c0952fa 100644
--- a/src/core/org/luaj/vm/LValue.java
+++ b/src/core/org/luaj/vm/LValue.java
@@ -21,6 +21,8 @@
 ******************************************************************************/
 package org.luaj.vm;
 
+import java.io.ByteArrayOutputStream;
+
 
 abstract
 public class LValue {
@@ -322,4 +324,9 @@ public class LValue {
 	public LValue toStrongReference() {
 		return this;
 	}
+
+	/** Concatenate this value to a ByteArrayOutputStream */
+	public void luaConcatTo(ByteArrayOutputStream baos) {
+		throw new LuaErrorException( "attempt to concat ? (a "+luaGetTypeName()+" value)");
+	}
 }
diff --git a/src/core/org/luaj/vm/LuaState.java b/src/core/org/luaj/vm/LuaState.java
index a63e4938..dd8c747c 100644
--- a/src/core/org/luaj/vm/LuaState.java
+++ b/src/core/org/luaj/vm/LuaState.java
@@ -639,13 +639,11 @@ public class LuaState extends Lua {
                 b = LuaState.GETARG_B(i);
                 c = LuaState.GETARG_C(i);
                 int numValues = c - b + 1;
-                LString[] strings = new LString[numValues];
-                
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 for (int j = b, l = 0; j <= c; j++, l++) {
-                    LString s = this.stack[base + j].luaAsString();
-                    strings[l] = s;
+                    this.stack[base + j].luaConcatTo( baos );
                 }
-                this.stack[base + a] = LString.concat( strings );
+                this.stack[base + a] = new LString( baos.toByteArray() );
                 continue;
             }
             case LuaState.OP_JMP: {
diff --git a/src/test/res/errors.lua b/src/test/res/errors.lua
index eccf982a..4f285b33 100644
--- a/src/test/res/errors.lua
+++ b/src/test/res/errors.lua
@@ -60,6 +60,33 @@ print( 'a(-a)  ', a(function() return -a end) )
 print( 'a(-s)  ', a(function() return -s end) )
 print( 'a(-true)', a(function() local b = true; return -b end) )
 
+-- string concatenation
+local function concatsuite(comparefunc) 
+	print( '"a".."b"', comparefunc("a","b") )
+	print( '"a"..nil', comparefunc("a",nil) )
+	print( 'nil.."b"', comparefunc(nil,"b") )
+	print( '"a"..{}', comparefunc("a",{}) )
+	print( '{}.."b"', comparefunc({},"b") )
+	print( '"a"..2', comparefunc("a",2) )
+	print( '2.."b"', comparefunc(2,"b") )
+	print( '"a"..print', comparefunc("a",print) )
+	print( 'print.."b"', comparefunc(print,"b") )
+	print( '"a"..true', comparefunc("a",true) )
+	print( 'true.."b"', comparefunc(true,"b") )
+	print( 'nil..true', comparefunc(nil,true) )
+	print( '"a"..3.5', comparefunc("a",3.5) )
+	print( '3.5.."b"', comparefunc(3.5,"b") )
+end
+local function strconcat(a,b)
+	return pcall( function() return a..b end ) 
+end
+local function tblconcat(a,b) 
+	local t={a,b}
+	return pcall( function() return table.concat(t,'-') end )
+end
+-- concatsuite(strconcat)
+concatsuite(tblconcat)
+
 -- pairs
 print( 'a(pairs(nil))', a(function() return id(pairs(nil,{})) end) )
 print( 'a(pairs(a))  ', a(function() return id(pairs(a,{})) end) )
diff --git a/version.properties b/version.properties
index 01cfb0e6..9ac0591d 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-version: 0.26
+version: 0.27