X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3fe283c53edc2a98d0164d893a4a667245da8e78..2ca4dab349cc3f91032b17ced6b76023b4e67115:/Cycript.yy.in?ds=inline
diff --git a/Cycript.yy.in b/Cycript.yy.in
index c8a1862..29a3755 100644
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1,33 +1,30 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013 Jay Freeman (saurik)
+ * Copyright (C) 2009-2014 Jay Freeman (saurik)
*/
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
/*
- * Cycript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript. If not, see .
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
**/
/* }}} */
-@if Bison23 %{
-
-@if Bison24 %code top {
+%code top {
#define cyscanner driver.scanner_
#define YYSTACKEXPANDABLE 1
-@if Bison23 #define yyerrok (yyerrstatus_ = 0)
-@if Bison24 }
+}
-@if Bison24 %code requires {
+%code requires {
#include "Driver.hpp"
#include "Parser.hpp"
#define CYNew new($pool)
@@ -79,13 +76,19 @@ typedef struct {
CYProperty *property_;
CYPropertyName *propertyName_;
CYRubyProc *rubyProc_;
- CYTypeSpecifier *specifier_;
CYStatement *statement_;
CYString *string_;
CYThis *this_;
CYTrue *true_;
CYWord *word_;
+@begin C
+ CYTypeModifier *modifier_;
+ CYTypeSpecifier *specifier_;
+ CYTypedIdentifier *typedIdentifier_;
+ CYTypedParameter *typedParameter_;
+@end
+
@begin ObjectiveC
CYClassName *className_;
CYField *field_;
@@ -93,9 +96,6 @@ typedef struct {
CYMessageParameter *messageParameter_;
CYProtocol *protocol_;
CYSelectorPart *selector_;
- CYTypeModifier *modifier_;
- CYTypedIdentifier *typedIdentifier_;
- CYTypedParameter *typedParameter_;
@end
@begin E4X
@@ -107,18 +107,15 @@ typedef struct {
} YYSTYPE;
#define YYSTYPE YYSTYPE
-@if Bison24 }
+}
-@if Bison24 %code provides {
-int cylex(YYSTYPE *, cy::location *, void *);
-@if Bison24 }
+%code provides {
+int cylex(YYSTYPE *, CYLocation *, void *);
+}
-@if Bison23 %}
+%name-prefix "cy"
-%name-prefix="cy"
-
-@if Bison23 %skeleton "lalr1.cc"
-@if Bison24 %language "C++"
+%language "C++"
%initial-action {
@$.begin.filename = @$.end.filename = &driver.filename_;
@@ -127,6 +124,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
%locations
%defines
+%define api.location.type { CYLocation }
+
//%glr-parser
//%expect 1
@@ -237,13 +236,17 @@ int cylex(YYSTYPE *, cy::location *, void *);
%token Typedef "typedef"
%token Unsigned "unsigned"
%token Signed "signed"
+%token Extern "extern"
+@end
+
+@begin C
+%token AtEncode "@encode"
@end
@begin ObjectiveC
%token AtImplementation "@implementation"
%token AtImplementation_ ";@implementation"
%token AtImport "@import"
-%token AtEncode "@encode"
%token AtEnd "@end"
%token AtSelector "@selector"
%token Yes "YES"
@@ -426,12 +429,13 @@ int cylex(YYSTYPE *, cy::location *, void *);
%type MemberAccess
%type MemberExpression_
%type MemberExpression
+%type Module
%type MultiplicativeExpression
%type NewExpression
%type NullLiteral
%type ObjectLiteral
%type Parenthetical
-%type ParentheticalOpt
+//%type ParentheticalOpt
%type PostfixExpression
%type PrimaryExpression
%type Program
@@ -469,11 +473,27 @@ int cylex(YYSTYPE *, cy::location *, void *);
%type VariableStatement
%type WithStatement
%type Word
+@begin ObjectiveC
%type WordOpt
+@end
%type Variable
+@begin C
+%type IntegerType
+%type IntegerTypeOpt
+%type PrefixedType
+%type PrimitiveType
+%type SuffixedType
+%type TypeSignifier
+%type TypeQualifierLeft
+%type TypeQualifierRight
+%type TypedIdentifier
+%type TypedParameterList_
+%type TypedParameterList
+%type TypedParameterListOpt
+@end
+
@begin ObjectiveC
-%type ArrayedType
%type BoxableExpression
%type CategoryStatement
%type ClassExpression
@@ -488,20 +508,12 @@ int cylex(YYSTYPE *, cy::location *, void *);
%type ClassProtocolListOpt
%type ClassProtocols
%type ClassProtocolsOpt
-%type EncodedType
-%type FunctionedType
-%type IntegerType
-%type IntegerTypeOpt
%type MessageExpression
%type MessageParameter
%type MessageParameters
%type MessageParameterList
%type MessageParameterListOpt
%type MessageScope
-%type ModifiedType
-%type Module
-%type PrefixedType
-%type PrimitiveType
%type SelectorCall_
%type SelectorCall
%type SelectorExpression_
@@ -509,16 +521,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
%type SelectorExpressionOpt
%type SelectorList
%type SelectorWordOpt
-%type SuffixedType
-%type TypeOpt
-%type TypeParenthetical
-%type TypeQualifierLeft
-%type TypeQualifierRight
-%type TypeSignifier
-%type TypedIdentifier
-%type TypedParameterList_
-%type TypedParameterList
-%type TypedParameterListOpt
+%type TypeOpt
%type VariadicCall
@end
@@ -573,16 +576,16 @@ LexSetRegExp
;
LexNoBrace
- : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }
+ : { if (yyla.empty()) driver.no_.OpenBrace = true; else if (yyla.type == yytranslate_(token::OpenBrace) || yyla.type == yytranslate_(token::OpenBrace_)) yyla.type = yytranslate_(token::OpenBrace__); }
;
LexNoFunction
- : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
+ : { if (yyla.empty()) driver.no_.Function = true; else if (yyla.type == yytranslate_(token::Function)) yyla.type = yytranslate_(token::Function_); }
;
LexNoAtImplementation :
@begin ObjectiveC
- { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+ { if (yyla.empty()) driver.no_.AtImplementation = true; else if (yyla.type == yytranslate_(token::AtImplementation)) yyla.type = yytranslate_(token::AtImplementation_); }
@end
;
@@ -657,10 +660,12 @@ Word
| "with" { $$ = $1; }
;
+@begin ObjectiveC
WordOpt
: Word { $$ = $1; }
| { $$ = NULL; }
;
+@end
IdentifierType
: Identifier_ { $$ = $1; }
@@ -705,6 +710,9 @@ Identifier
| "typedef" { $$ = $1; }
| "unsigned" { $$ = $1; }
| "signed" { $$ = $1; }
+ | "extern" { $$ = $1; }
+@end
+@begin ObjectiveC
| "YES" { $$ = $1; }
| "NO" { $$ = $1; }
@end
@@ -743,12 +751,12 @@ BooleanLiteral
/* 7.9 Automatic Semicolon Insertion {{{ */
StrictSemi
- : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
+ : { driver.Warning(@$, "warning, automatic semi-colon insertion required"); }
;
Terminator
: ";"
- | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+ | error { if (yyla.type_get() != yyeof_ && yyla.type != token::CloseBrace && !yyla.value.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
;
TerminatorOpt
@@ -762,10 +770,10 @@ Parenthetical
: "(" LexPushInOff Expression ")" LexPopIn { $$ = $3; }
;
-ParentheticalOpt
+/*ParentheticalOpt
: Parenthetical { $$ = $1; }
| { $$ = NULL; }
- ;
+ ;*/
Variable
: Identifier { $$ = CYNew CYVariable($1); }
@@ -1054,11 +1062,11 @@ AssignmentExpression
/* 11.14 Comma Operator {{{ */
Expression_
: "," Expression { $$ = $2; }
- | { $$ = CYNew CYCompound(); }
+ | { $$ = NULL; }
;
Expression
- : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; }
+ : AssignmentExpression Expression_ { $$ = CYNew CYCompound($1, $2); }
;
ExpressionOpt
@@ -1394,32 +1402,20 @@ ProgramBodyOpt
;
/* }}} */
-@begin ObjectiveC
-/* Cycript (Objective-C): Type Encoding {{{ */
-TypeParenthetical
- : "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; }
- ;
-
+@begin C
+/* Cycript (C): Type Encoding {{{ */
TypeSignifier
- : IdentifierType { $$ = CYNew CYTypedIdentifier($1); }
- | TypeParenthetical { $$ = $1; }
- ;
-
-ArrayedType
- : ArrayedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); }
- | TypeSignifier { $$ = $1; }
- | { $$ = CYNew CYTypedIdentifier(); }
- ;
-
-FunctionedType
- : "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypeFunctionWith($3); }
+ : IdentifierType { $$ = CYNew CYTypedIdentifier(@1, $1); }
+ | "(" LexPushInOff "*" TypeQualifierRight ")" LexPopIn { $$ = $4; }
;
SuffixedType
- : ArrayedType { $$ = $1; }
+ : SuffixedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); }
| "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); }
- | TypeParenthetical FunctionedType { $$ = $1; CYSetLast($2) = $$->modifier_; $$->modifier_ = $2; }
- | FunctionedType { $$ = CYNew CYTypedIdentifier(); CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
+ | TypeSignifier "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $1; $$->modifier_ = CYNew CYTypeFunctionWith($4, $$->modifier_); }
+ | "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypedIdentifier(@1); $$->modifier_ = CYNew CYTypeFunctionWith($3, $$->modifier_); }
+ | TypeSignifier { $$ = $1; }
+ | { $$ = CYNew CYTypedIdentifier(@$); }
;
PrefixedType
@@ -1449,7 +1445,7 @@ IntegerType
IntegerTypeOpt
: IntegerType { $$ = $1; }
- |
+ | { $$ = CYNew CYTypeVariable("int"); }
;
PrimitiveType
@@ -1465,14 +1461,13 @@ TypedIdentifier
: TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->specifier_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
;
-EncodedType
- : TypedIdentifier { $$ = CYNew CYEncodedType($1); }
- ;
-
PrimaryExpression
- : AtEncode "(" EncodedType ")" { $$ = $3; }
+ : "@encode" "(" TypedIdentifier ")" { $$ = CYNew CYEncodedType($3); }
;
/* }}} */
+@end
+
+@begin ObjectiveC
/* Cycript (Objective-C): @class Declaration {{{ */
ClassSuperOpt
/* XXX: why the hell did I choose MemberExpression? */
@@ -1481,7 +1476,7 @@ ClassSuperOpt
;
ClassFieldListOpt
- : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
+ : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $3); }
| LexSetRegExp { $$ = NULL; }
;
@@ -1495,7 +1490,7 @@ MessageScope
;
TypeOpt
- : "(" LexSetRegExp EncodedType ")" { $$ = $3; }
+ : "(" LexSetRegExp TypedIdentifier ")" { $$ = $3; }
| { $$ = NULL; }
;
@@ -1626,7 +1621,9 @@ PrimaryExpression
| "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); }
;
/* }}} */
-/* Cycript (Objective-C): @import Directive {{{ */
+@end
+
+/* Cycript: @import Directive {{{ */
Module
: Module "." Word { $$ = CYNew CYModule($3, $1); }
| Word { $$ = CYNew CYModule($1); }
@@ -1636,6 +1633,8 @@ Declaration__
: "@import" Module { $$ = CYNew CYImport($2); }
;
/* }}} */
+
+@begin ObjectiveC
/* Cycript (Objective-C): Boxed Expressions {{{ */
BoxableExpression
: NullLiteral { $$ = $1; }
@@ -1654,13 +1653,8 @@ PrimaryExpression
;
/* }}} */
/* Cycript (Objective-C): Block Expressions {{{ */
-ModifiedType
- : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->specifier_ = $2; $$->modifier_ = $1; }
- | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
- ;
-
PrimaryExpression
- : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }
+ : "^" TypedIdentifier { if ($2->identifier_ != NULL) error($2->location_, "unexpected identifier"); } BRACE LexPushInOff FunctionBody "}" LexPopIn { if (CYTypeFunctionWith *function = $2->Function()) $$ = CYNew CYObjCBlock($2, function->parameters_, $6); else error($2->location_, "expected parameters"); }
;
/* }}} */
/* Cycript (Objective-C): Instance Literals {{{ */
@@ -1712,9 +1706,15 @@ PrimaryExpression
/* }}} */
/* Cycript (C): Type Definitions {{{ */
Statement__
- : "typedef" TypedIdentifier Terminator { $$ = CYNew CYTypeDefinition($2); }
+ : "typedef" TypedIdentifier { if ($2->identifier_ == NULL) error($2->location_, "expected identifier"); } Terminator { $$ = CYNew CYTypeDefinition($2); }
;
/* }}} */
+/* Cycript (C): extern "C" {{{ */
+Statement__
+ : "extern" StringLiteral { if (strcmp($2->Value(), "C") != 0) YYABORT; } TypedIdentifier { if ($4->identifier_ == NULL) error($4->location_, "expected identifier"); } Terminator { $$ = CYNew CYExternal($2, $4); }
+ ;
+/* }}} */
+
@end
/* YUI: Documentation Comments {{{ */