Move non-tk::Identifier_ CYIdentifiers to grammar.

diff --git a/Cycript.l.in b/Cycript.l.in
index fa27d9f4f790ea229b3d605ca90cc905433d4f7a..ea542c5aadbffb0c340a4b8b958d785fb4821c9d 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -398,14 +398,14 @@ XMLName {XMLNameStart}{XMLNamePart}*
 @end
     /* }}} */
     /* Reserved {{{ */
 @end
     /* }}} */
     /* Reserved {{{ */

-"abstract"        L C /*FII*/ I(identifier, Identifier("abstract"), tk::Abstract, hi::Meta);
-"await"           L C /*II?*/ I(identifier, Identifier("await"), tk::Await, hi::Meta);
-"boolean"         L C /*FII*/ I(identifier, Identifier("boolean"), tk::Boolean, hi::Type);
+"abstract"        L C /*FII*/ F(tk::Abstract, hi::Meta);
+"await"           L C /*II?*/ F(tk::Await, hi::Meta);
+"boolean"         L C /*FII*/ F(tk::Boolean, hi::Type);

 "break"           L R /*KKK*/ F(tk::Break, hi::Control);
 "break"           L R /*KKK*/ F(tk::Break, hi::Control);

-"byte"            L C /*FII*/ I(identifier, Identifier("byte"), tk::Byte, hi::Type);
+"byte"            L C /*FII*/ F(tk::Byte, hi::Type);

 "case"            L C /*KKK*/ F(tk::Case, hi::Control);
 "catch"           L C /*KKK*/ F(tk::Catch, hi::Control);
 "case"            L C /*KKK*/ F(tk::Case, hi::Control);
 "catch"           L C /*KKK*/ F(tk::Catch, hi::Control);

-"char"            L C /*FII*/ I(identifier, Identifier("char"), tk::Char, hi::Type);
+"char"            L C /*FII*/ F(tk::Char, hi::Type);

 "class"           L C /*FFK*/ F(tk::Class, hi::Meta);
 "const"           L C /*FFK*/ F(tk::Const, hi::Meta);
 "continue"        L R /*KKK*/ F(tk::Continue, hi::Control);
 "class"           L C /*FFK*/ F(tk::Class, hi::Meta);
 "const"           L C /*FFK*/ F(tk::Const, hi::Meta);
 "continue"        L R /*KKK*/ F(tk::Continue, hi::Control);


@@ -413,73 +413,73 @@ XMLName {XMLNameStart}{XMLNamePart}*
 "default"         L C /*KKK*/ F(tk::Default, hi::Control);
 "delete"          L C /*KKK*/ F(tk::Delete, hi::Operator);
 "do"              L C /*KKK*/ F(tk::Do, hi::Control);
 "default"         L C /*KKK*/ F(tk::Default, hi::Control);
 "delete"          L C /*KKK*/ F(tk::Delete, hi::Operator);
 "do"              L C /*KKK*/ F(tk::Do, hi::Control);

-"double"          L C /*FII*/ I(identifier, Identifier("double"), tk::Double, hi::Type);
+"double"          L C /*FII*/ F(tk::Double, hi::Type);

 "else"            L C /*KKK*/ F(tk::Else, hi::Control);
 "enum"            L C /*FFF*/ F(tk::Enum, hi::Meta);
 "export"          L C /*FFK*/ F(tk::Export, hi::Meta);
 "extends"         L C /*FFK*/ F(tk::Extends, hi::Meta);
 "false"           L C /*LLL*/ F(tk::False, hi::Constant);
 "else"            L C /*KKK*/ F(tk::Else, hi::Control);
 "enum"            L C /*FFF*/ F(tk::Enum, hi::Meta);
 "export"          L C /*FFK*/ F(tk::Export, hi::Meta);
 "extends"         L C /*FFK*/ F(tk::Extends, hi::Meta);
 "false"           L C /*LLL*/ F(tk::False, hi::Constant);

-"final"           L C /*FII*/ I(identifier, Identifier("final"), tk::Final, hi::Meta);
+"final"           L C /*FII*/ F(tk::Final, hi::Meta);

 "finally"         L C /*KKK*/ F(tk::Finally, hi::Control);
 "finally"         L C /*KKK*/ F(tk::Finally, hi::Control);

-"float"           L C /*FII*/ I(identifier, Identifier("float"), tk::Float, hi::Type);
+"float"           L C /*FII*/ F(tk::Float, hi::Type);

 "for"             L C /*KKK*/ F(tk::For, hi::Control);
 "function"        L C /*KKK*/ F(yyextra->no_.Function ? tk::Function_ : tk::Function, hi::Meta);
 "for"             L C /*KKK*/ F(tk::For, hi::Control);
 "function"        L C /*KKK*/ F(yyextra->no_.Function ? tk::Function_ : tk::Function, hi::Meta);

-"goto"            L C /*FII*/ I(identifier, Identifier("goto"), tk::Goto, hi::Control);
+"goto"            L C /*FII*/ F(tk::Goto, hi::Control);

 "if"              L C /*KKK*/ F(tk::If, hi::Control);
 "if"              L C /*KKK*/ F(tk::If, hi::Control);

-"implements"      L C /*FSS*/ I(identifier, Identifier("implements"), tk::Implements, hi::Meta);
+"implements"      L C /*FSS*/ F(tk::Implements, hi::Meta);

 "import"          L C /*FFK*/ F(tk::Import, hi::Meta);
 "in"              L C /*KKK*/ F(yyextra->in_.top() ? tk::In_ : tk::In, hi::Operator);
 "instanceof"      L C /*KKK*/ F(tk::InstanceOf, hi::Operator);
 "import"          L C /*FFK*/ F(tk::Import, hi::Meta);
 "in"              L C /*KKK*/ F(yyextra->in_.top() ? tk::In_ : tk::In, hi::Operator);
 "instanceof"      L C /*KKK*/ F(tk::InstanceOf, hi::Operator);

-"int"             L C /*FII*/ I(identifier, Identifier("int"), tk::Int, hi::Type);
-"interface"       L C /*FSS*/ I(identifier, Identifier("interface"), tk::Interface, hi::Meta);
-"let"             L C /*IS?*/ I(identifier, Identifier("let"), tk::Let, hi::Meta);
-"long"            L C /*FII*/ I(identifier, Identifier("long"), tk::Long, hi::Type);
-"native"          L C /*FII*/ I(identifier, Identifier("native"), tk::Native, hi::Meta);
+"int"             L C /*FII*/ F(tk::Int, hi::Type);
+"interface"       L C /*FSS*/ F(tk::Interface, hi::Meta);
+"let"             L C /*IS?*/ F(tk::Let, hi::Meta);
+"long"            L C /*FII*/ F(tk::Long, hi::Type);
+"native"          L C /*FII*/ F(tk::Native, hi::Meta);

 "new"             L C /*KKK*/ F(tk::New, hi::Operator);
 "null"            L C /*LLL*/ F(tk::Null, hi::Constant);
 "new"             L C /*KKK*/ F(tk::New, hi::Operator);
 "null"            L C /*LLL*/ F(tk::Null, hi::Constant);

-"package"         L C /*FSS*/ I(identifier, Identifier("package"), tk::Package, hi::Meta);
-"private"         L C /*FSS*/ I(identifier, Identifier("private"), tk::Private, hi::Meta);
-"protected"       L C /*FSS*/ I(identifier, Identifier("protected"), tk::Protected, hi::Meta);
-"public"          L C /*FSS*/ I(identifier, Identifier("public"), tk::Public, hi::Meta);
+"package"         L C /*FSS*/ F(tk::Package, hi::Meta);
+"private"         L C /*FSS*/ F(tk::Private, hi::Meta);
+"protected"       L C /*FSS*/ F(tk::Protected, hi::Meta);
+"public"          L C /*FSS*/ F(tk::Public, hi::Meta);

 "return"          L R /*KKK*/ F(tk::Return, hi::Control);
 "return"          L R /*KKK*/ F(tk::Return, hi::Control);

-"short"           L C /*FII*/ I(identifier, Identifier("short"), tk::Short, hi::Type);
-"static"          L C /*FS?*/ I(identifier, Identifier("static"), tk::Static, hi::Meta);
+"short"           L C /*FII*/ F(tk::Short, hi::Type);
+"static"          L C /*FS?*/ F(tk::Static, hi::Meta);

 "super"           L C /*FFK*/ F(tk::Super, hi::Constant);
 "switch"          L C /*KKK*/ F(tk::Switch, hi::Control);
 "super"           L C /*FFK*/ F(tk::Super, hi::Constant);
 "switch"          L C /*KKK*/ F(tk::Switch, hi::Control);

-"synchronized"    L C /*FII*/ I(identifier, Identifier("synchronized"), tk::Synchronized, hi::Meta);
+"synchronized"    L C /*FII*/ F(tk::Synchronized, hi::Meta);

 "this"            L C /*KKK*/ F(tk::This, hi::Constant);
 "throw"           L R /*KKK*/ F(tk::Throw, hi::Control);
 "this"            L C /*KKK*/ F(tk::This, hi::Constant);
 "throw"           L R /*KKK*/ F(tk::Throw, hi::Control);

-"throws"          L C /*FII*/ I(identifier, Identifier("throws"), tk::Throws, hi::Meta);
-"transient"       L C /*FII*/ I(identifier, Identifier("transient"), tk::Transient, hi::Meta);
+"throws"          L C /*FII*/ F(tk::Throws, hi::Meta);
+"transient"       L C /*FII*/ F(tk::Transient, hi::Meta);

 "true"            L C /*LLL*/ F(tk::True, hi::Constant);
 "try"             L C /*KKK*/ F(tk::Try, hi::Control);
 "typeof"          L C /*KKK*/ F(tk::TypeOf, hi::Operator);
 "var"             L C /*KKK*/ F(tk::Var, hi::Meta);
 "void"            L C /*KKK*/ F(tk::Void, hi::Operator);
 "true"            L C /*LLL*/ F(tk::True, hi::Constant);
 "try"             L C /*KKK*/ F(tk::Try, hi::Control);
 "typeof"          L C /*KKK*/ F(tk::TypeOf, hi::Operator);
 "var"             L C /*KKK*/ F(tk::Var, hi::Meta);
 "void"            L C /*KKK*/ F(tk::Void, hi::Operator);

-"volatile"        L C /*FII*/ I(identifier, Identifier("volatile"), tk::Volatile, hi::Meta);
+"volatile"        L C /*FII*/ F(tk::Volatile, hi::Meta);

 "while"           L C /*KKK*/ F(tk::While, hi::Control);
 "with"            L C /*KKK*/ F(tk::With, hi::Control);
 "while"           L C /*KKK*/ F(tk::While, hi::Control);
 "with"            L C /*KKK*/ F(tk::With, hi::Control);

-"yield"           L R /*IS?*/ I(identifier, Identifier("yield"), tk::Yield, hi::Control);
+"yield"           L R /*IS?*/ F(tk::Yield, hi::Control);

 
 "auto"            L C F(tk::Auto, hi::Meta);
 
 "auto"            L C F(tk::Auto, hi::Meta);

-"each"            L C I(identifier, Identifier("each"), tk::Each, hi::Control);
-"of"              L C I(identifier, Identifier("of"), tk::Of, hi::Operator);
+"each"            L C F(tk::Each, hi::Control);
+"of"              L C F(tk::Of, hi::Operator);

 
 @begin C
 
 @begin C

-"extern"          L C I(identifier, Identifier("extern"), tk::Extern, hi::Type);
-"signed"          L C I(identifier, Identifier("signed"), tk::Signed, hi::Type);
-"typedef"         L C I(identifier, Identifier("typedef"), tk::Typedef, hi::Meta);
-"unsigned"        L C I(identifier, Identifier("unsigned"), tk::Unsigned, hi::Type);
+"extern"          L C F(tk::Extern, hi::Type);
+"signed"          L C F(tk::Signed, hi::Type);
+"typedef"         L C F(tk::Typedef, hi::Meta);
+"unsigned"        L C F(tk::Unsigned, hi::Type);

 @end
 
 @begin ObjectiveC
 @end
 
 @begin ObjectiveC

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

 @end
 
 @begin E4X
 @end
 
 @begin E4X

-"namespace"       L C I(identifier, Identifier("namespace"), tk::Namespace, hi::Meta);
-"xml"             L C I(identifier, Identifier("xml"), tk::XML, hi::Meta);
+"namespace"       L C F(tk::Namespace, hi::Meta);
+"xml"             L C F(tk::XML, hi::Meta);

 @end
     /* }}} */
     /* Identifier {{{ */
 @end
     /* }}} */
     /* Identifier {{{ */

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 8b00100fe3a8371339306010165da79b31f8f19a..97e752ae402bee1be3b03924be99d36539ad29a6 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -235,10 +235,10 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 @end
 
 @begin C
 @end
 
 @begin C

-%token <identifier_> Typedef "typedef"
-%token <identifier_> Unsigned "unsigned"
-%token <identifier_> Signed "signed"
-%token <identifier_> Extern "extern"
+%token Typedef "typedef"
+%token Unsigned "unsigned"
+%token Signed "signed"
+%token Extern "extern"

 @end
 
 @begin C
 @end
 
 @begin C


@@ -256,8 +256,8 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 %token AtNo "@NO"
 %token AtTrue "@true"
 %token AtFalse "@false"
 %token AtNo "@NO"
 %token AtTrue "@true"
 %token AtFalse "@false"

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

 @end
 
 %token False "false"
 @end
 
 %token False "false"


@@ -300,40 +300,40 @@ int cylex(YYSTYPE *, CYLocation *, void *);
 %token While "while"
 %token With "with"
 
 %token While "while"
 %token With "with"
 

-%token <identifier_> Abstract "abstract"
-%token <identifier_> Await "await"
-%token <identifier_> Boolean "boolean"
-%token <identifier_> Byte "byte"
-%token <identifier_> Char "char"
-%token <identifier_> Double "double"
-%token <identifier_> Final "final"
-%token <identifier_> Float "float"
-%token <identifier_> Goto "goto"
-%token <identifier_> Implements "implements"
-%token <identifier_> Int "int"
-%token <identifier_> Interface "interface"
-%token <identifier_> Let "let"
-%token <identifier_> Long "long"
-%token <identifier_> Native "native"
-%token <identifier_> Package "package"
-%token <identifier_> Private "private"
-%token <identifier_> Protected "protected"
-%token <identifier_> Public "public"
-%token <identifier_> Short "short"
-%token <identifier_> Static "static"
-%token <identifier_> Synchronized "synchronized"
-%token <identifier_> Throws "throws"
-%token <identifier_> Transient "transient"
-%token <identifier_> Volatile "volatile"
-%token <identifier_> Yield "yield"
+%token Abstract "abstract"
+%token Await "await"
+%token Boolean "boolean"
+%token Byte "byte"
+%token Char "char"
+%token Double "double"
+%token Final "final"
+%token Float "float"
+%token Goto "goto"
+%token Implements "implements"
+%token Int "int"
+%token Interface "interface"
+%token Let "let"
+%token Long "long"
+%token Native "native"
+%token Package "package"
+%token Private "private"
+%token Protected "protected"
+%token Public "public"
+%token Short "short"
+%token Static "static"
+%token Synchronized "synchronized"
+%token Throws "throws"
+%token Transient "transient"
+%token Volatile "volatile"
+%token Yield "yield"

 
 %token Auto "auto"
 
 %token Auto "auto"

-%token <identifier_> Each "each"
-%token <identifier_> Of "of"
+%token Each "each"
+%token Of "of"

 
 @begin E4X
 
 @begin E4X

-%token <identifier_> Namespace "namespace"
-%token <identifier_> XML "xml"
+%token Namespace "namespace"
+%token XML "xml"

 @end
 
 %token AutoComplete
 @end
 
 %token AutoComplete


@@ -635,7 +635,7 @@ Word
     /* XXX: | "instanceof" { $$ = CYNew CYWord("instanceof"); } */
 
     // XXX: as it currently is not an Identifier
     /* XXX: | "instanceof" { $$ = CYNew CYWord("instanceof"); } */
 
     // XXX: as it currently is not an Identifier

-    | "let" { $$ = $1; }
+    | "let" { $$ = CYNew CYIdentifier("let"); }

 
     | "new" LexSetRegExp { $$ = CYNew CYWord("new"); }
     | "null" { $$ = CYNew CYWord("null"); }
 
     | "new" LexSetRegExp { $$ = CYNew CYWord("new"); }
     | "null" { $$ = CYNew CYWord("null"); }


@@ -663,51 +663,51 @@ WordOpt
 IdentifierType
     : Identifier_ { $$ = $1; }
 
 IdentifierType
     : Identifier_ { $$ = $1; }
 

-    | "abstract" { $$ = $1; }
-    | "await" { $$ = $1; }
-    | "boolean" { $$ = $1; }
-    | "byte" { $$ = $1; }
-    | "double" { $$ = $1; }
-    | "final" { $$ = $1; }
-    | "float" { $$ = $1; }
-    | "goto" { $$ = $1; }
-    | "implements" { $$ = $1; }
-    | "interface" { $$ = $1; }
-    | "native" { $$ = $1; }
-    | "package" { $$ = $1; }
-    | "private" { $$ = $1; }
-    | "protected" { $$ = $1; }
-    | "public" { $$ = $1; }
-    | "static" { $$ = $1; }
-    | "synchronized" { $$ = $1; }
-    | "throws" { $$ = $1; }
-    | "transient" { $$ = $1; }
+    | "abstract" { $$ = CYNew CYIdentifier("abstract"); }
+    | "await" { $$ = CYNew CYIdentifier("await"); }
+    | "boolean" { $$ = CYNew CYIdentifier("boolean"); }
+    | "byte" { $$ = CYNew CYIdentifier("byte"); }
+    | "double" { $$ = CYNew CYIdentifier("double"); }
+    | "final" { $$ = CYNew CYIdentifier("final"); }
+    | "float" { $$ = CYNew CYIdentifier("float"); }
+    | "goto" { $$ = CYNew CYIdentifier("goto"); }
+    | "implements" { $$ = CYNew CYIdentifier("implements"); }
+    | "interface" { $$ = CYNew CYIdentifier("interface"); }
+    | "native" { $$ = CYNew CYIdentifier("native"); }
+    | "package" { $$ = CYNew CYIdentifier("package"); }
+    | "private" { $$ = CYNew CYIdentifier("private"); }
+    | "protected" { $$ = CYNew CYIdentifier("protected"); }
+    | "public" { $$ = CYNew CYIdentifier("public"); }
+    | "static" { $$ = CYNew CYIdentifier("static"); }
+    | "synchronized" { $$ = CYNew CYIdentifier("synchronized"); }
+    | "throws" { $$ = CYNew CYIdentifier("throws"); }
+    | "transient" { $$ = CYNew CYIdentifier("transient"); }

 
     // XXX: currently I only have this as Word
 
     // XXX: currently I only have this as Word

-    // | "let" { $$ = $1; }
+    // | "let" { $$ = CYNew CYIdentifier("let"); }

 
 

-    | "yield" NewLineOpt { $$ = $1; }
+    | "yield" NewLineOpt { $$ = CYNew CYIdentifier("yield"); }

 
 

-    | "each" { $$ = $1; }
-    | "of" { $$ = $1; }
+    | "each" { $$ = CYNew CYIdentifier("each"); }
+    | "of" { $$ = CYNew CYIdentifier("of"); }

     ;
 
 Identifier
     : IdentifierType
     ;
 
 Identifier
     : IdentifierType

-    | "char" { $$ = $1; }
-    | "int" { $$ = $1; }
-    | "long" { $$ = $1; }
-    | "short" { $$ = $1; }
-    | "volatile" { $$ = $1; }
+    | "char" { $$ = CYNew CYIdentifier("char"); }
+    | "int" { $$ = CYNew CYIdentifier("int"); }
+    | "long" { $$ = CYNew CYIdentifier("long"); }
+    | "short" { $$ = CYNew CYIdentifier("short"); }
+    | "volatile" { $$ = CYNew CYIdentifier("volatile"); }

 @begin C
 @begin C

-    | "extern" { $$ = $1; }
-    | "signed" { $$ = $1; }
-    | "typedef" { $$ = $1; }
-    | "unsigned" { $$ = $1; }
+    | "extern" { $$ = CYNew CYIdentifier("extern"); }
+    | "signed" { $$ = CYNew CYIdentifier("signed"); }
+    | "typedef" { $$ = CYNew CYIdentifier("typedef"); }
+    | "unsigned" { $$ = CYNew CYIdentifier("unsigned"); }

 @end
 @begin ObjectiveC
 @end
 @begin ObjectiveC

-    | "NO" { $$ = $1; }
-    | "YES" { $$ = $1; }
+    | "NO" { $$ = CYNew CYIdentifier("NO"); }
+    | "YES" { $$ = CYNew CYIdentifier("YES"); }

 @end
     ;
 
 @end
     ;
 


@@ -1749,8 +1749,8 @@ XMLWhitespaceOpt
 
 /* 8.1 Context Keywords {{{ */
 Identifier
 
 /* 8.1 Context Keywords {{{ */
 Identifier

-    : "namespace" { $$ = $1; }
-    | "xml" { $$ = $1; }
+    : "namespace" { $$ = CYNew CYIdentifier("namespace"); }
+    | "xml" { $$ = CYNew CYIdentifier("xml"); }

     ;
 /* }}} */
 /* 8.3 XML Initialiser Input Elements {{{ */
     ;
 /* }}} */
 /* 8.3 XML Initialiser Input Elements {{{ */