From 462f95bd7f4f8ac8acb50acbeae72857645bbc46 Mon Sep 17 00:00:00 2001 From: James Roseborough Date: Tue, 20 Apr 2010 14:26:19 +0000 Subject: [PATCH] Improve compatibility with luaj 1.0 --- src/core/org/luaj/vm2/lib/StringLib.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/core/org/luaj/vm2/lib/StringLib.java b/src/core/org/luaj/vm2/lib/StringLib.java index 1ad85d59..29edeaf5 100644 --- a/src/core/org/luaj/vm2/lib/StringLib.java +++ b/src/core/org/luaj/vm2/lib/StringLib.java @@ -203,8 +203,7 @@ public class StringLib extends OneArgFunction { for ( int i = 0; i < n; ) { switch ( c = fmt.luaByte( i++ ) ) { case '\n': - // TODO: dos only? - result.append( "\r\n" ); + result.append( "\n" ); break; default: result.append( (byte) c ); @@ -267,14 +266,10 @@ public class StringLib extends OneArgFunction { buf.append( (byte) '"' ); for ( int i = 0, n = s.length(); i < n; i++ ) { switch ( c = s.luaByte( i ) ) { - case '"': case '\\': + case '"': case '\\': case '\n': buf.append( (byte)'\\' ); buf.append( (byte)c ); break; - case '\n': - // TODO: dos only? - buf.append( "\\\r\n" ); - break; case '\r': buf.append( "\\r" ); break;