bool newline_;
union {
+ bool bool_;
+
CYArgument *argument_;
CYBoolean *boolean_;
CYClause *clause_;
CYCatch *catch_;
+ CYCompound *compound_;
CYDeclaration *declaration_;
CYDeclarations *declarations_;
CYElement *element_;
CYExpression *expression_;
CYFalse *false_;
+ CYField *field_;
CYForInitialiser *for_;
CYForInInitialiser *forin_;
+ CYFunctionParameter *functionParameter_;
CYIdentifier *identifier_;
CYLiteral *literal_;
+ CYMessage *message_;
+ CYMessageParameter *messageParameter_;
CYName *name_;
CYNull *null_;
CYNumber *number_;
- CYParameter *parameter_;
CYProperty *property_;
+ CYSelectorPart *selector_;
CYSource *source_;
CYStatement *statement_;
CYString *string_;
%token OpenBracket "["
%token CloseBracket "]"
+%token AtClass "@class"
+%token AtSelector "@selector"
+%token AtEnd "@end"
+
%token <word_> Break "break"
%token <word_> Case "case"
%token <word_> Catch "catch"
%token <word_> While "while"
%token <word_> With "with"
+%token <word_> Abstract "abstract"
+%token <word_> Boolean "boolean"
+%token <word_> Byte "byte"
+%token <word_> Char "char"
+%token <word_> Class "class"
+%token <word_> Const "const"
+%token <word_> Debugger "debugger"
+%token <word_> Double "double"
+%token <word_> Enum "enum"
+%token <word_> Export "export"
+%token <word_> Extends "extends"
+%token <word_> Final "final"
+%token <word_> Float "float"
+%token <word_> Goto "goto"
+%token <word_> Implements "implements"
+%token <word_> Import "import"
+%token <word_> Int "int"
+%token <word_> Interface "interface"
+%token <word_> Long "long"
+%token <word_> Native "native"
+%token <word_> Package "package"
+%token <word_> Private "private"
+%token <word_> Protected "protected"
+%token <word_> Public "public"
+%token <word_> Short "short"
+%token <word_> Static "static"
+%token <word_> Super "super"
+%token <word_> Synchronized "synchronized"
+%token <word_> Throws "throws"
+%token <word_> Transient "transient"
+%token <word_> Volatile "volatile"
+
%token <identifier_> Identifier
%token <number_> NumericLiteral
%token <string_> StringLiteral
%type <clause_> CaseClause
%type <clause_> CaseClausesOpt
%type <catch_> CatchOpt
+%type <source_> ClassDeclaration
+%type <message_> ClassMessageDeclaration
+%type <message_> ClassMessageDeclarationListOpt
+%type <expression_> ClassSuperOpt
+%type <field_> ClassFieldList
%type <expression_> ConditionalExpression
%type <expression_> ConditionalExpressionNoBF
%type <expression_> ConditionalExpressionNoIn
%type <clause_> DefaultClause
%type <statement_> DoWhileStatement
%type <expression_> Element
+%type <expression_> ElementOpt
%type <element_> ElementList
-%type <element_> ElementList_
+%type <element_> ElementListOpt
%type <statement_> ElseStatementOpt
%type <statement_> EmptyStatement
%type <expression_> EqualityExpression
%type <expression_> EqualityExpressionNoIn
%type <expression_> Expression
%type <expression_> ExpressionOpt
-%type <expression_> Expression_
+%type <compound_> Expression_
%type <expression_> ExpressionNoBF
%type <expression_> ExpressionNoIn
-%type <expression_> ExpressionNoIn_
+%type <compound_> ExpressionNoIn_
%type <expression_> ExpressionNoInOpt
%type <statement_> ExpressionStatement
%type <statement_> FinallyOpt
%type <for_> ForStatementInitialiser
%type <statement_> ForInStatement
%type <forin_> ForInStatementInitialiser
-%type <parameter_> FormalParameterList
-%type <parameter_> FormalParameterList_
+%type <functionParameter_> FormalParameterList
+%type <functionParameter_> FormalParameterList_
%type <source_> FunctionBody
%type <source_> FunctionDeclaration
%type <expression_> FunctionExpression
%type <expression_> MemberExpression
%type <expression_> MemberExpression_
%type <expression_> MemberExpressionNoBF
+%type <messageParameter_> MessageParameter
+%type <messageParameter_> MessageParameters
+%type <messageParameter_> MessageParameterList
+%type <messageParameter_> MessageParameterListOpt
+%type <bool_> MessageScope
%type <expression_> MultiplicativeExpression
%type <expression_> MultiplicativeExpressionNoBF
%type <expression_> NewExpression
%type <expression_> RelationalExpressionNoBF
%type <expression_> RelationalExpressionNoIn
%type <statement_> ReturnStatement
+%type <selector_> SelectorExpression
+%type <selector_> SelectorExpression_
+%type <selector_> SelectorExpressionOpt
%type <expression_> ShiftExpression
%type <expression_> ShiftExpressionNoBF
%type <source_> SourceElement
%type <statement_> SwitchStatement
%type <statement_> ThrowStatement
%type <statement_> TryStatement
+%type <expression_> TypeOpt
%type <expression_> UnaryExpression
%type <expression_> UnaryExpression_
%type <expression_> UnaryExpressionNoBF
%type <argument_> SelectorList
%type <argument_> VariadicCall
+%left "*" "/" "%"
+%left "+" "-"
+%left "<<" ">>" ">>>"
+%left "<" ">" "<=" ">=" "instanceof" "in"
+%left "==" "!=" "===" "!=="
+%left "&"
+%left "^"
+%left "|"
+%left "&&"
+%left "||"
+
+%right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="
+
%nonassoc "if"
%nonassoc "else"
TerminatorOpt
: ";"
| "\n"
- | error { yyerrok; }
+ | error { yyerrok; driver.errors_.pop_back(); }
;
Terminator
: ";"
| "\n"
- | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else yyerrok; }
+ | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } }
;
CommaOpt
Word
: Identifier { $$ = $1; }
+ | "abstract" { $$ = $1; }
+ | "boolean" { $$ = $1; }
| "break" NewLineOpt { $$ = $1; }
+ | "byte" { $$ = $1; }
| "case" { $$ = $1; }
| "catch" { $$ = $1; }
+ | "char" { $$ = $1; }
+ | "class" { $$ = $1; }
+ | "const" { $$ = $1; }
| "continue" NewLineOpt { $$ = $1; }
+ | "debugger" { $$ = $1; }
| "default" { $$ = $1; }
| "delete" { $$ = $1; }
| "do" { $$ = $1; }
+ | "double" { $$ = $1; }
| "else" { $$ = $1; }
+ | "enum" { $$ = $1; }
+ | "export" { $$ = $1; }
+ | "extends" { $$ = $1; }
| "false" { $$ = $1; }
+ | "final" { $$ = $1; }
| "finally" { $$ = $1; }
+ | "float" { $$ = $1; }
| "for" { $$ = $1; }
| "function" { $$ = $1; }
+ | "goto" { $$ = $1; }
| "if" { $$ = $1; }
+ | "implements" { $$ = $1; }
+ | "import" { $$ = $1; }
/* XXX: | "in" { $$ = $1; } */
/* XXX: | "instanceof" { $$ = $1; } */
+ | "int" { $$ = $1; }
+ | "interface" { $$ = $1; }
+ | "long" { $$ = $1; }
+ | "native" { $$ = $1; }
| "new" { $$ = $1; }
| "null" { $$ = $1; }
+ | "package" { $$ = $1; }
+ | "private" { $$ = $1; }
+ | "protected" { $$ = $1; }
+ | "public" { $$ = $1; }
| "return" NewLineOpt { $$ = $1; }
+ | "short" { $$ = $1; }
+ | "static" { $$ = $1; }
+ | "super" { $$ = $1; }
| "switch" { $$ = $1; }
+ | "synchronized" { $$ = $1; }
| "this" { $$ = $1; }
| "throw" NewLineOpt { $$ = $1; }
+ | "throws" { $$ = $1; }
+ | "transient" { $$ = $1; }
| "true" { $$ = $1; }
| "try" { $$ = $1; }
| "typeof" { $$ = $1; }
| "var" { $$ = $1; }
| "void" { $$ = $1; }
+ | "volatile" { $$ = $1; }
| "while" { $$ = $1; }
| "with" { $$ = $1; }
;
/* }}} */
/* 11.1.4 Array Initialiser {{{ */
ArrayLiteral
- : "[" ElementList "]" { $$ = $2; }
+ : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); }
;
Element
: AssignmentExpression { $$ = $1; }
+ ;
+
+ElementOpt
+ : Element { $$ = $1; }
| { $$ = NULL; }
;
-ElementList_
- : "," ElementList { $$ = $2; }
+ElementListOpt
+ : ElementList { $$ = $1; }
| { $$ = NULL; }
;
ElementList
- : Element ElementList_ { $$ = new(driver.pool_) CYElement($1, $2); }
+ : ElementOpt "," ElementListOpt { $$ = new(driver.pool_) CYElement($1, $3); }
+ | Element { $$ = new(driver.pool_) CYElement($1, NULL); }
;
/* }}} */
/* 11.1.5 Object Initialiser {{{ */
ObjectLiteral
- : "{" PropertyNameAndValueListOpt "}" { $$ = new CYObject($2); }
+ : "{" PropertyNameAndValueListOpt "}" { $$ = new(driver.pool_) CYObject($2); }
;
PropertyNameAndValueList_
;
Expression_
- : "," Expression { $$ = $2; }
+ : "," Expression { $$ = new(driver.pool_) CYCompound($2); }
| { $$ = NULL; }
;
ExpressionNoIn_
- : "," ExpressionNoIn { $$ = $2; }
+ : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); }
| { $$ = NULL; }
;
;
Expression
- : AssignmentExpression Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+ : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
ExpressionNoIn
- : AssignmentExpressionNoIn ExpressionNoIn_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+ : AssignmentExpressionNoIn ExpressionNoIn_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
ExpressionNoBF
- : AssignmentExpressionNoBF Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+ : AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
Statement
;
Block
- : "{" "}" { $$ = new(driver.pool_) CYEmpty(); }
- | "{" StatementList "}" { $$ = $2; }
+ : "{" StatementListOpt "}" { $$ = $2 ?: new(driver.pool_) CYEmpty(); }
;
StatementList
;
FormalParameterList
- : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYParameter($1, $2); }
+ : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYFunctionParameter($1, $2); }
| { $$ = NULL; }
;
;
Program
- : SourceElements { driver.source_.push_back($1); $$ = $1; }
+ : SourceElements { driver.source_ = $1; }
;
SourceElements
| { $$ = NULL; }
;
-/*Command
- : SourceElement { driver.source_.push_back($2); if (driver.filename_.empty() && false) YYACCEPT; $2->Show(std::cout); }
- ;*/
-
SourceElement
: Statement { $$ = $1; }
| FunctionDeclaration { $$ = $1; }
;
/* Objective-C Extensions {{{ */
+ClassSuperOpt
+ : ":" MemberExpressionNoBF { $$ = $2; }
+ | { $$ = NULL; }
+ ;
+
+ClassFieldList
+ : "{" "}" { $$ = NULL; }
+ ;
+
+MessageScope
+ : "+" { $$ = false; }
+ | "-" { $$ = true; }
+ ;
+
+TypeOpt
+ : "(" Expression ")" { $$ = $2; }
+ | { $$ = NULL; }
+ ;
+
+MessageParameter
+ : Word ":" TypeOpt Identifier { $$ = new CYMessageParameter($1, $3, $4); }
+ ;
+
+MessageParameterListOpt
+ : MessageParameterList { $$ = $1; }
+ | { $$ = NULL; }
+ ;
+
+MessageParameterList
+ : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; }
+ ;
+
+MessageParameters
+ : MessageParameterList { $$ = $1; }
+ | Word { $$ = new CYMessageParameter($1, NULL, NULL); }
+ ;
+
+ClassMessageDeclaration
+ : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new CYMessage($1, $2, $3, $5); }
+ ;
+
+ClassMessageDeclarationListOpt
+ : ClassMessageDeclarationListOpt ClassMessageDeclaration { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+ | { $$ = NULL; }
+ ;
+
+ClassDeclaration
+ : "@class" Identifier ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new CYClass($2, $3, $4, $5); }
+ ;
+
+SourceElement
+ : ClassDeclaration { $$ = $1; }
+ ;
+
VariadicCall
: "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
| { $$ = NULL; }
;
MessageExpression
- : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYMessage($2, $3); }
+ : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYSend($2, $3); }
;
-PrimaryExpression
+SelectorExpressionOpt
+ : SelectorExpression_ { $$ = $1; }
+ | { $$ = NULL; }
+ ;
+
+SelectorExpression_
+ : WordOpt ":" SelectorExpressionOpt { $$ = new(driver.pool_) CYSelectorPart($1, true, $3); }
+ ;
+
+SelectorExpression
+ : SelectorExpression_ { $$ = $1; }
+ | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
+ ;
+
+PrimaryExpression_
: MessageExpression { $$ = $1; }
+ | "@selector" "(" SelectorExpression ")" { $$ = new CYSelector($3); }
;
/* }}} */
projects / cycript.git / blobdiff