Assume we do /not/ have lookahead tokens for lexer.

diff --git a/Cycript.l.in b/Cycript.l.in
index f311c69d4725664eb36beff6b44d62e683d385a3..d63784e91110ffc9b124f09ed50b859b3b3ec65a 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -30,7 +30,9 @@ typedef cy::parser::token tk;
 
 #define F(value) do { \
     int token(value); \
 
 #define F(value) do { \
     int token(value); \

-    yyextra->nobrace_ = false; \
+    yyextra->no_.AtImplementation = false; \
+    yyextra->no_.Function = false; \
+    yyextra->no_.OpenBrace = false; \

     return token; \
 } while (false)
 
     return token; \
 } while (false)
 


@@ -237,7 +239,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
 "("    L C F(tk::OpenParen);
 ")"    L C F(tk::CloseParen);
 
 "("    L C F(tk::OpenParen);
 ")"    L C F(tk::CloseParen);
 

-"{"    L C F(yyextra->nobrace_ ? tk::OpenBrace__ : yylval->newline_ ? tk::OpenBrace_ : tk::OpenBrace);
+"{"    L C F(yyextra->no_.OpenBrace ? tk::OpenBrace__ : yylval->newline_ ? tk::OpenBrace_ : tk::OpenBrace);

 "}"    L C F(tk::CloseBrace);
 
 "["    L C F(tk::OpenBracket);
 "}"    L C F(tk::CloseBrace);
 
 "["    L C F(tk::OpenBracket);


@@ -249,7 +251,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 @begin ObjectiveC
 "@end"            L C F(tk::AtEnd);
 
 @begin ObjectiveC
 "@end"            L C F(tk::AtEnd);

-"@implementation" L C F(tk::AtImplementation);
+"@implementation" L C F(yyextra->no_.AtImplementation ? tk::AtImplementation_ : tk::AtImplementation);

 "@import"         L C F(tk::AtImport);
 "@selector"       L C F(tk::AtSelector);
 @end
 "@import"         L C F(tk::AtImport);
 "@selector"       L C F(tk::AtSelector);
 @end


@@ -269,7 +271,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
 "else"         L C I(word, Word("else"), tk::Else);
 "finally"      L C I(word, Word("finally"), tk::Finally);
 "for"          L C I(word, Word("for"), tk::For);
 "else"         L C I(word, Word("else"), tk::Else);
 "finally"      L C I(word, Word("finally"), tk::Finally);
 "for"          L C I(word, Word("for"), tk::For);

-"function"     L C I(word, Word("function"), tk::Function);
+"function"     L C I(word, Word("function"), yyextra->no_.Function ? tk::Function_ : tk::Function);

 "if"           L C I(word, Word("if"), tk::If);
 "in"           L C I(word, Word("in"), yyextra->in_.top() ? tk::In_ : tk::In);
 "instanceof"   L C I(word, Word("instanceof"), tk::InstanceOf);
 "if"           L C I(word, Word("if"), tk::If);
 "in"           L C I(word, Word("in"), yyextra->in_.top() ? tk::In_ : tk::In);
 "instanceof"   L C I(word, Word("instanceof"), tk::InstanceOf);

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 866127e4b8bc1d5afae5742f105909ffc3c32a42..1345060c783790e236b99787affc9410cf1cd119 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -532,15 +532,15 @@ LexSetRegExp
     ;
 
 LexNoBrace
     ;
 
 LexNoBrace

-    : { if (yychar == yyempty_) driver.nobrace_ = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }
+    : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }

     ;
 
 LexNoFunction
     ;
 
 LexNoFunction

-    : { if (yychar == token::Function) yychar = token::Function_; }
+    : { driver.no_.Function = true; }

     ;
 
 LexNoAtImplementation
     ;
 
 LexNoAtImplementation

-    : { if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+    : { driver.no_.AtImplementation = true; }

     ;
 
 LexSetStatement
     ;
 
 LexSetStatement

diff --git a/Parser.cpp b/Parser.cpp
index 32d3d0a7b969f969da5cafbd428f98291c3bdb5b..f2d3ad14d42e0171b618de80fd31a7821f0ed3a5 100644 (file)
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -28,7 +28,6 @@ CYRange WordEndRange_  (0x3ff001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
 
 CYDriver::CYDriver(const std::string &filename) :
     state_(CYClear),
 
 CYDriver::CYDriver(const std::string &filename) :
     state_(CYClear),

-    nobrace_(false),

     data_(NULL),
     size_(0),
     file_(NULL),
     data_(NULL),
     size_(0),
     file_(NULL),


@@ -39,6 +38,7 @@ CYDriver::CYDriver(const std::string &filename) :
     context_(NULL),
     mode_(AutoNone)
 {
     context_(NULL),
     mode_(AutoNone)
 {

+    memset(&no_, 0, sizeof(no_));

     in_.push(false);
     ScannerInit();
 }
     in_.push(false);
     ScannerInit();
 }

diff --git a/Parser.hpp b/Parser.hpp
index afb2c6635e261ac5642b4f7fd8d5667c5bc5eb27..ba896b7db8299773de98d0b772d42bac4794f08b 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -474,9 +474,14 @@ class CYDriver {
     void *scanner_;
 
     CYState state_;
     void *scanner_;
 
     CYState state_;

-    bool nobrace_;

     std::stack<bool> in_;
 
     std::stack<bool> in_;
 

+    struct {
+        bool AtImplementation;
+        bool Function;
+        bool OpenBrace;
+    } no_;
+

     const char *data_;
     size_t size_;
     FILE *file_;
     const char *data_;
     size_t size_;
     FILE *file_;