Generalize and centralize cpr flag conflict check.

[cycript.git] / Cycript.l.in

diff --git a/Cycript.l.in b/Cycript.l.in
index 44d36f347755c8f7a4c18c76a1d5ea7a9af65ef2..73721e27ccf7c56a67c3e27a59a16fb357975224 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -193,7 +193,6 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 @begin E4X ObjectiveC
 "@"    L C F(tk::At, hi::Operator);
-"#"    L C F(tk::Pound, hi::Operator);
 @end
 
 "&"    L C F(tk::Ampersand, hi::Operator);
@@ -260,8 +259,8 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 @begin C
 "typedef"         L C I(identifier, Identifier("typedef"), tk::Typedef, hi::Meta);
-"unsigned"        L C I(identifier, Identifier("unsigned"), tk::Unsigned, hi::Meta);
-"signed"          L C I(identifier, Identifier("signed"), tk::Signed, hi::Meta);
+"unsigned"        L C I(identifier, Identifier("unsigned"), tk::Unsigned, hi::Type);
+"signed"          L C I(identifier, Identifier("signed"), tk::Signed, hi::Type);
 @end
 
 @begin ObjectiveC