Move FunctionInstance_ into alphabetical order.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 866127e4b8bc1d5afae5742f105909ffc3c32a42..3f240e40651a809119b939539255d9c3afb573ed 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -39,8 +39,11 @@
 #include "E4X/Syntax.hpp"
 @end
 
+#include "Highlight.hpp"
+
 typedef struct {
     bool newline_;
+    hi::Value highlight_;
 
     union {
         bool bool_;
@@ -532,15 +535,15 @@ LexSetRegExp
     ;
 
 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
-    : { 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 == token::AtImplementation) yychar = token::AtImplementation_; }
+    : { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
     ;
 
 LexSetStatement