Support @YES/@NO (to better support @true/@false).

diff --git a/Cycript.l.in b/Cycript.l.in
index 5915fc95272fb34a4d7f61fa74b6c9e641bb6cb1..61a0c0920a7df8950a8b08785ed2d9c952193ad1 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -270,8 +270,8 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 "NULL"         L C I(identifier, Identifier("NULL"), tk::Identifier_, hi::Constant);
 "nil"          L C I(identifier, Identifier("nil"), tk::Identifier_, hi::Constant);
 
 "NULL"         L C I(identifier, Identifier("NULL"), tk::Identifier_, hi::Constant);
 "nil"          L C I(identifier, Identifier("nil"), tk::Identifier_, hi::Constant);

-"YES"          L C I(identifier, Identifier("YES"), tk::Identifier_, hi::Constant);
-"NO"           L C I(identifier, Identifier("NO"), tk::Identifier_, hi::Constant);
+"YES"          L C I(identifier, Identifier("YES"), tk::Yes, hi::Constant);
+"NO"           L C I(identifier, Identifier("NO"), tk::No, hi::Constant);

 
 "bool"         L C I(identifier, Identifier("bool"), tk::Identifier_, hi::Type);
 "BOOL"         L C I(identifier, Identifier("BOOL"), tk::Identifier_, hi::Type);
 
 "bool"         L C I(identifier, Identifier("bool"), tk::Identifier_, hi::Type);
 "BOOL"         L C I(identifier, Identifier("BOOL"), tk::Identifier_, hi::Type);

diff --git a/Cycript.yy.in b/Cycript.yy.in
index c4af37250847f0a1d50ebd0b700f986f716495bf..94d804bea62ffddd5677b9ee721a66b0bd46b608 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -241,6 +241,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token AtEncode "@encode"
 %token AtEnd "@end"
 %token AtSelector "@selector"
 %token AtEncode "@encode"
 %token AtEnd "@end"
 %token AtSelector "@selector"

+%token <identifier_> Yes "YES"
+%token <identifier_> No "NO"

 @end
 
 %token <false_> False "false"
 @end
 
 %token <false_> False "false"


@@ -657,6 +659,8 @@ Identifier
 
 @begin C
     | "typedef" { $$ = $1; }
 
 @begin C
     | "typedef" { $$ = $1; }

+    | "YES" { $$ = $1; }
+    | "NO" { $$ = $1; }

 @end
 
     | "implements" { $$ = $1; }
 @end
 
     | "implements" { $$ = $1; }


@@ -1609,6 +1613,8 @@ BoxableExpression
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
     | Parenthetical { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
     | Parenthetical { $$ = $1; }

+    | "YES" { $$ = CYNew CYTrue(); }
+    | "NO" { $$ = CYNew CYFalse(); }

     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression