aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-06-13 00:30:58 +0200
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commitdf50e60b1a2f165988f45286f7b0d8e04ddece37 (patch)
tree33f58e4c4b5862a9a306b9ed27e79bcfd5aaf13f
parent4e2b3f449e3ad7b15842067ce4ec5907bb4165b2 (diff)
downloadscummvm-rg350-df50e60b1a2f165988f45286f7b0d8e04ddece37.tar.gz
scummvm-rg350-df50e60b1a2f165988f45286f7b0d8e04ddece37.tar.bz2
scummvm-rg350-df50e60b1a2f165988f45286f7b0d8e04ddece37.zip
DIRECTOR: Lingo: fixed String passing from lexer to parser
-rw-r--r--engines/director/lingo/lingo-lex.cpp2
-rw-r--r--engines/director/lingo/lingo-lex.l2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 1c69d3f23e..534a13cd12 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -831,7 +831,7 @@ YY_RULE_SETUP
case 12:
YY_RULE_SETUP
#line 58 "engines/director/lingo/lingo-lex.l"
-{ yylval.s = new Common::String(yytext); return STRING; }
+{ yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 13:
YY_RULE_SETUP
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 7eb3810e28..6d97d17990 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -55,7 +55,7 @@ to { return OP_TO; }
{constinteger} { yylval.i = strtol(yytext, NULL, 10); return INT; }
{operator} { return *yytext; }
{newline} { return '\n'; }
-{conststring} { yylval.s = new Common::String(yytext); return STRING; }
+{conststring} { yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
%%