aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo/lingo-lex.l
diff options
context:
space:
mode:
authorEugene Sandulenko2016-07-11 15:57:23 +0200
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commit8136267ada2c346510baa1258cd12dd436974365 (patch)
treeafb764bc4f1a66e5114b58b7df174f244701fa64 /engines/director/lingo/lingo-lex.l
parent3a4fbc936793d6e70f9a2eb2e1f8100895dc8dfa (diff)
downloadscummvm-rg350-8136267ada2c346510baa1258cd12dd436974365.tar.gz
scummvm-rg350-8136267ada2c346510baa1258cd12dd436974365.tar.bz2
scummvm-rg350-8136267ada2c346510baa1258cd12dd436974365.zip
DIRECTOR: Lingo: Use namespace in lexer
Diffstat (limited to 'engines/director/lingo/lingo-lex.l')
-rw-r--r--engines/director/lingo/lingo-lex.l10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 6b14bfccd9..40f66a6e34 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -30,9 +30,11 @@
#include "director/lingo/lingo.h"
#include "director/lingo/lingo-gr.h"
+using namespace Director;
+
int yyparse();
static void count() {
- Director::g_lingo->_colnumber += strlen(yytext);
+ g_lingo->_colnumber += strlen(yytext);
}
static void countnl() {
@@ -41,8 +43,8 @@ static void countnl() {
while(*p == '\n' || *p == '\r')
p++;
- Director::g_lingo->_linenumber++;
- Director::g_lingo->_colnumber = strlen(p);
+ g_lingo->_linenumber++;
+ g_lingo->_colnumber = strlen(p);
}
%}
@@ -111,7 +113,7 @@ whitespace [\t ]
count();
yylval.s = new Common::String(yytext);
- if (Director::g_lingo->_builtins.contains(yytext))
+ if (g_lingo->_builtins.contains(yytext))
return BLTIN;
return ID;