AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix txtToken, lexerror

Browse Source
This commit is contained in:
gamax92 2014-07-07 21:42:53 -06:00
parent ea4c3c754b
commit d38e08f102
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/luaj/vm3/compiler/LexState.java
View File

@ -252,7 +252,7 @@ public class LexState {
case TK_NAME:
case TK_STRING:
case TK_NUMBER:
return new String( buff, 0, nbuff );
return new String( buff, 0, nbuff ).replace("\0", "");
default:
return token2str( token );
}
@ -260,10 +260,14 @@ public class LexState {
void lexerror( String msg, int token ) {
String cid = Lua.chunkid( source.tojstring() );
// Is the string pushing needed?
L.pushfstring( cid+":"+linenumber+": "+msg );
if ( token != 0 )
L.pushfstring( "syntax error: "+msg+" near "+txtToken(token) );
throw new LuaError(cid+":"+linenumber+": "+msg);
if ( token != 0 )
throw new LuaError(cid+":"+linenumber+": "+msg+" near "+LUA_QS(txtToken(token)));
else
throw new LuaError(cid+":"+linenumber+": "+msg);
}
void syntaxerror( String msg ) {
@ -553,7 +557,7 @@ public class LexState {
continue;
default:
if (!isdigit(current))
syntaxerror("invalid escape sequence near '\\" + ((char) current) + "'");
lexerror("invalid escape sequence near '\\" + ((char) current) + "'", 0);
else { /* \xxx */
int i = 0;
c = 0;
@ -562,7 +566,7 @@ public class LexState {
nextChar();
} while (++i < 3 && isdigit(current));
if (c > UCHAR_MAX)
syntaxerror("decimal escape too large near '\\" + c + "'");
lexerror("decimal escape too large near '\\" + c + "'", 0);
save(c);
}
continue;
@ -1390,7 +1394,7 @@ public class LexState {
return;
}
default: {
this.syntaxerror("unexpected symbol near '" + txtToken(t.token) + "'");
this.syntaxerror("unexpected symbol");
return;
}
}