Improve isolation of ObjectiveC syntax filter code.

diff --git a/Cycript.l.in b/Cycript.l.in
index 0397b14513dae62809821aac3a49120bc397d8a7..ea140a851728949901fa63ddfc8960e1fce01f67 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -33,7 +33,9 @@ typedef cy::parser::token tk;
 // do /not/ fold token to the return: this is a macro and the ordering is dependent
 #define F(value, highlight) do { \
     int token(value); \
 // do /not/ fold token to the return: this is a macro and the ordering is dependent
 #define F(value, highlight) do { \
     int token(value); \

+@begin ObjectiveC

     yyextra->no_.AtImplementation = false; \
     yyextra->no_.AtImplementation = false; \

+@end

     yyextra->no_.Function = false; \
     yyextra->no_.OpenBrace = false; \
     yylval->highlight_ = highlight; \
     yyextra->no_.Function = false; \
     yyextra->no_.OpenBrace = false; \
     yylval->highlight_ = highlight; \

diff --git a/Cycript.yy.in b/Cycript.yy.in
index aab5160c0a6e3299e3999a0e0610e06b4216b7a8..62cdca23e346701ab6b54f86f9a3f0a3eb4f4b8b 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -81,9 +81,6 @@ typedef struct {
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;

-        CYTypeModifier *type_;
-        CYTypedIdentifier *typedIdentifier_;
-        CYTypedParameter *typedParameter_;

         CYWord *word_;
 
 @begin ObjectiveC
         CYWord *word_;
 
 @begin ObjectiveC


@@ -93,6 +90,9 @@ typedef struct {
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYSelectorPart *selector_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYSelectorPart *selector_;

+        CYTypeModifier *type_;
+        CYTypedIdentifier *typedIdentifier_;
+        CYTypedParameter *typedParameter_;

 @end
 
 @begin E4X
 @end
 
 @begin E4X


@@ -557,8 +557,10 @@ LexNoFunction
     : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
     ;
 
     : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
     ;
 

-LexNoAtImplementation
-    : { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+LexNoAtImplementation :
+@begin ObjectiveC
+    { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+@end

     ;
 
 LexSetStatement
     ;
 
 LexSetStatement