Let's reserve # entirely for the pre-processor.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index a11643f13e89573e01cd27a71c9538af67afaaf4..2c8125ea37c1a0d663f4968f62082dfbc1ac1af5 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -79,6 +79,7 @@ typedef struct {
         CYProperty *property_;
         CYPropertyName *propertyName_;
         CYRubyProc *rubyProc_;
         CYProperty *property_;
         CYPropertyName *propertyName_;
         CYRubyProc *rubyProc_;

+        CYTypeSpecifier *specifier_;

         CYStatement *statement_;
         CYString *string_;
         CYThis *this_;
         CYStatement *statement_;
         CYString *string_;
         CYThis *this_;


@@ -160,7 +161,6 @@ int cylex(YYSTYPE *, cy::location *, void *);
 
 @begin E4X ObjectiveC
 %token At "@"
 
 @begin E4X ObjectiveC
 %token At "@"

-%token Pound "#"

 @end
 
 %token Ampersand "&"
 @end
 
 %token Ampersand "&"


@@ -234,6 +234,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 
 @begin C
 %token <identifier_> Typedef "typedef"
 
 @begin C
 %token <identifier_> Typedef "typedef"

+%token <identifier_> Unsigned "unsigned"
+%token <identifier_> Signed "signed"

 @end
 
 @begin ObjectiveC
 @end
 
 @begin ObjectiveC


@@ -406,6 +408,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> FunctionExpression
 %type <identifier_> Identifier
 %type <identifier_> IdentifierOpt
 %type <expression_> FunctionExpression
 %type <identifier_> Identifier
 %type <identifier_> IdentifierOpt

+%type <identifier_> IdentifierType

 %type <word_> IdentifierName
 %type <statement_> IfStatement
 %type <expression_> Initialiser
 %type <word_> IdentifierName
 %type <statement_> IfStatement
 %type <expression_> Initialiser


@@ -486,6 +489,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <protocol_> ClassProtocolsOpt
 %type <expression_> EncodedType
 %type <modifier_> FunctionedType
 %type <protocol_> ClassProtocolsOpt
 %type <expression_> EncodedType
 %type <modifier_> FunctionedType

+%type <specifier_> IntegerType
+%type <specifier_> IntegerTypeOpt

 %type <expression_> MessageExpression
 %type <messageParameter_> MessageParameter
 %type <messageParameter_> MessageParameters
 %type <expression_> MessageExpression
 %type <messageParameter_> MessageParameter
 %type <messageParameter_> MessageParameters


@@ -495,7 +500,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <typedIdentifier_> ModifiedType
 %type <module_> Module
 %type <typedIdentifier_> PrefixedType
 %type <typedIdentifier_> ModifiedType
 %type <module_> Module
 %type <typedIdentifier_> PrefixedType

-%type <expression_> PrimitiveType
+%type <specifier_> PrimitiveType

 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_
 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_


@@ -656,15 +661,9 @@ WordOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-Identifier
+IdentifierType

     : Identifier_ { $$ = $1; }
 
     : Identifier_ { $$ = $1; }
 

-@begin C
-    | "typedef" { $$ = $1; }
-    | "YES" { $$ = $1; }
-    | "NO" { $$ = $1; }
-@end
-

     | "implements" { $$ = $1; }
     | "interface" { $$ = $1; }
     | "package" { $$ = $1; }
     | "implements" { $$ = $1; }
     | "interface" { $$ = $1; }
     | "package" { $$ = $1; }


@@ -676,19 +675,14 @@ Identifier
     | "abstract" { $$ = $1; }
     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }
     | "abstract" { $$ = $1; }
     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }

-    | "char" { $$ = $1; }

     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }
     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }

-    | "int" { $$ = $1; }
-    | "long" { $$ = $1; }

     | "native" { $$ = $1; }
     | "native" { $$ = $1; }

-    | "short" { $$ = $1; }

     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }
     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }

-    | "volatile" { $$ = $1; }

 
     // XXX: currently I only have this as Word
     // | "let" { $$ = $1; }
 
     // XXX: currently I only have this as Word
     // | "let" { $$ = $1; }


@@ -699,6 +693,22 @@ Identifier
     | "of" { $$ = $1; }
     ;
 
     | "of" { $$ = $1; }
     ;
 

+Identifier
+    : IdentifierType
+    | "char" { $$ = $1; }
+    | "int" { $$ = $1; }
+    | "long" { $$ = $1; }
+    | "short" { $$ = $1; }
+    | "volatile" { $$ = $1; }
+@begin C
+    | "typedef" { $$ = $1; }
+    | "unsigned" { $$ = $1; }
+    | "signed" { $$ = $1; }
+    | "YES" { $$ = $1; }
+    | "NO" { $$ = $1; }
+@end
+    ;
+

 IdentifierOpt
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
 IdentifierOpt
     : Identifier { $$ = $1; }
     | { $$ = NULL; }


@@ -1019,6 +1029,7 @@ LogicalORExpression
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }
     | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); }
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }
     | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); }

+    | LogicalORExpression "?" LexPushInOff LexSetRegExp ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $1, $7); }

     ;
 /* }}} */
 /* 11.13 Assignment Operators {{{ */
     ;
 /* }}} */
 /* 11.13 Assignment Operators {{{ */


@@ -1042,11 +1053,11 @@ AssignmentExpression
 /* 11.14 Comma Operator {{{ */
 Expression_
     : "," Expression { $$ = $2; }
 /* 11.14 Comma Operator {{{ */
 Expression_
     : "," Expression { $$ = $2; }

-    | { $$ = CYNew CYCompound(); }
+    | { $$ = NULL; }

     ;
 
 Expression
     ;
 
 Expression

-    : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; }
+    : AssignmentExpression Expression_ { $$ = CYNew CYCompound($1, $2); }

     ;
 
 ExpressionOpt
     ;
 
 ExpressionOpt


@@ -1389,7 +1400,7 @@ TypeParenthetical
     ;
 
 TypeSignifier
     ;
 
 TypeSignifier

-    : Identifier { $$ = CYNew CYTypedIdentifier($1); }
+    : IdentifierType { $$ = CYNew CYTypedIdentifier($1); }

     | TypeParenthetical { $$ = $1; }
     ;
 
     | TypeParenthetical { $$ = $1; }
     ;
 


@@ -1415,24 +1426,42 @@ PrefixedType
     ;
 
 TypeQualifierLeft
     ;
 
 TypeQualifierLeft

-    : "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); }
-    /* XXX: | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); } */
-    | { $$ = NULL; }
+    : { $$ = NULL; }
+    | "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); }
+    | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); }

     ;
 
 TypeQualifierRight
     ;
 
 TypeQualifierRight

-    : "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); }
-    | PrefixedType { $$ = $1; }
+    : PrefixedType { $$ = $1; }

     | SuffixedType { $$ = $1; }
     | SuffixedType { $$ = $1; }

+    | "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); }
+    | "volatile" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeVolatile($$->modifier_); }
+    ;
+
+IntegerType
+    : "int" { $$ = CYNew CYTypeVariable("int"); }
+    | "unsigned" IntegerTypeOpt { $$ = CYNew CYTypeUnsigned($2); }
+    | "signed" IntegerTypeOpt { $$ = CYNew CYTypeSigned($2); }
+    | "long" IntegerTypeOpt { $$ = CYNew CYTypeLong($2); }
+    | "short" IntegerTypeOpt { $$ = CYNew CYTypeShort($2); }
+    ;
+
+IntegerTypeOpt
+    : IntegerType { $$ = $1; }
+    | { $$ = CYNew CYTypeVariable("int"); }

     ;
 
 PrimitiveType
     ;
 
 PrimitiveType

-    : Variable { $$ = $1; }
-    | "void" { $$  = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); }
+    : IdentifierType { $$ = CYNew CYTypeVariable($1); }
+    | IntegerType { $$ = $1; }
+    | "void" { $$ = CYNew CYTypeVoid(); }
+    | "char" { $$ = CYNew CYTypeVariable("char"); }
+    | "signed" "char" { $$ = CYNew CYTypeSigned(CYNew CYTypeVariable("char")); }
+    | "unsigned" "char" { $$ = CYNew CYTypeUnsigned(CYNew CYTypeVariable("char")); }

     ;
 
 TypedIdentifier
     ;
 
 TypedIdentifier

-    : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->type_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
+    : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->specifier_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }

     ;
 
 EncodedType
     ;
 
 EncodedType


@@ -1440,7 +1469,7 @@ EncodedType
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

-    : AtEncode "(" EncodedType ")" { $$ = $3; }
+    : "@encode" "(" EncodedType ")" { $$ = $3; }

     ;
 /* }}} */
 /* Cycript (Objective-C): @class Declaration {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): @class Declaration {{{ */


@@ -1451,7 +1480,7 @@ ClassSuperOpt
     ;
 
 ClassFieldListOpt
     ;
 
 ClassFieldListOpt

-    : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
+    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $3); }

     | LexSetRegExp { $$ = NULL; }
     ;
 
     | LexSetRegExp { $$ = NULL; }
     ;
 


@@ -1625,7 +1654,7 @@ PrimaryExpression
 /* }}} */
 /* Cycript (Objective-C): Block Expressions {{{ */
 ModifiedType
 /* }}} */
 /* Cycript (Objective-C): Block Expressions {{{ */
 ModifiedType

-    : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->type_ = $2; $$->modifier_ = $1; }
+    : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->specifier_ = $2; $$->modifier_ = $1; }

     | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
     ;
 
     | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
     ;
 


@@ -1633,6 +1662,11 @@ PrimaryExpression
     : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }
     ;
 /* }}} */
     : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }
     ;
 /* }}} */

+/* Cycript (Objective-C): Instance Literals {{{ */
+PrimaryExpression
+    : "^" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); }
+    ;
+/* }}} */

 @end
 
 @begin C
 @end
 
 @begin C