From 693d501bb3c190a047d02b897f84917ccb623db6 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Thu, 1 Oct 2009 07:07:09 +0000 Subject: [PATCH] Factored away all LALR(1) conflicts and gave up on GLR. --- Application.mm | 1 + Cycript.l | 4 +- Cycript.y | 428 ++++++++++++++++++++++++++++++++++++++++++------- Library.mm | 4 - Output.cpp | 19 ++- Parser.hpp | 18 ++- 6 files changed, 396 insertions(+), 78 deletions(-) diff --git a/Application.mm b/Application.mm index 106c7dd..cb12f32 100644 --- a/Application.mm +++ b/Application.mm @@ -1,4 +1,5 @@ #include +#include int CYConsole(FILE *in, FILE *out, FILE *err); diff --git a/Cycript.l b/Cycript.l index 08b7cd5..6e2a780 100644 --- a/Cycript.l +++ b/Cycript.l @@ -1,12 +1,14 @@ %{ #include "Cycript.tab.hh" typedef cy::parser::token tk; + #define YY_EXTRA_TYPE CYDriver * +#define YYLTYPE cy::location #define T yylval->newline_ = yyextra->state_ == CYNewLine; #define C T yyextra->state_ = CYClear; #define R T yyextra->state_ = CYRestricted; -#define N { bool restricted(yyextra->state_ == CYRestricted); if (restricted) { yyextra->state_ = CYClear; return tk::NewLine; } else yyextra->state_ = CYNewLine; } +#define N if (yyextra->state_ != CYNewLine) { bool restricted(yyextra->state_ == CYRestricted); if (restricted) { yyextra->state_ = CYClear; return tk::NewLine; } else yyextra->state_ = CYNewLine; } %} %option prefix="cy" diff --git a/Cycript.y b/Cycript.y index c4fa447..9d663b2 100644 --- a/Cycript.y +++ b/Cycript.y @@ -1,7 +1,7 @@ %code top { #include "Cycript.tab.hh" -int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); #define scanner driver.scanner_ +#define YYSTACKEXPANDABLE 1 } %code requires { @@ -40,11 +40,14 @@ typedef struct { } +%code provides { +int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner); +} + %name-prefix "cy" %language "C++" %locations -%glr-parser %initial-action { @$.begin.filename = @$.end.filename = &driver.filename_; @@ -149,24 +152,36 @@ typedef struct { %token StringLiteral %type AdditiveExpression +%type AdditiveExpressionNoBF %type ArgumentList %type ArgumentList_ %type ArgumentListOpt %type Arguments %type ArrayLiteral %type AssignmentExpression +%type AssignmentExpressionNoBF +%type AssignmentExpressionNoIn %type BitwiseANDExpression +%type BitwiseANDExpressionNoBF +%type BitwiseANDExpressionNoIn %type Block %type BooleanLiteral %type BitwiseORExpression +%type BitwiseORExpressionNoBF +%type BitwiseORExpressionNoIn %type BitwiseXORExpression +%type BitwiseXORExpressionNoBF +%type BitwiseXORExpressionNoIn %type BreakStatement %type CallExpression +%type CallExpressionNoBF %type CaseBlock %type CaseClause %type CaseClausesOpt %type CatchOpt %type ConditionalExpression +%type ConditionalExpressionNoBF +%type ConditionalExpressionNoIn %type ContinueStatement %type DefaultClause %type DoWhileStatement @@ -176,9 +191,15 @@ typedef struct { %type ElseStatementOpt %type EmptyStatement %type EqualityExpression +%type EqualityExpressionNoBF +%type EqualityExpressionNoIn %type Expression -%type Expression_ %type ExpressionOpt +%type Expression_ +%type ExpressionNoBF +%type ExpressionNoIn +%type ExpressionNoIn_ +%type ExpressionNoInOpt %type ExpressionStatement %type FinallyOpt %type ForStatement @@ -194,70 +215,101 @@ typedef struct { %type IfStatement %type Initialiser %type InitialiserOpt +%type InitialiserNoIn +%type InitialiserNoInOpt %type IterationStatement %type LabelledStatement %type LeftHandSideExpression +%type LeftHandSideExpression_ +%type LeftHandSideExpressionNoBF %type Literal %type LogicalANDExpression +%type LogicalANDExpressionNoBF +%type LogicalANDExpressionNoIn %type LogicalORExpression +%type LogicalORExpressionNoBF +%type LogicalORExpressionNoIn %type MemberExpression +%type MemberExpression_ +%type MemberExpressionNoBF %type MultiplicativeExpression +%type MultiplicativeExpressionNoBF %type NewExpression +%type NewExpression_ +%type NewExpressionNoBF %type NullLiteral %type ObjectLiteral -%type MessageExpression %type PostfixExpression +%type PostfixExpressionNoBF %type PrimaryExpression +%type PrimaryExpression_ +%type PrimaryExpressionNoBF %type Program %type PropertyName %type PropertyNameAndValueList %type PropertyNameAndValueList_ %type PropertyNameAndValueListOpt %type RelationalExpression +%type RelationalExpressionNoBF +%type RelationalExpressionNoIn %type ReturnStatement -%type SelectorCall -%type SelectorCall_ -%type SelectorList %type ShiftExpression +%type ShiftExpressionNoBF %type SourceElement %type SourceElements %type Statement +%type StatementList %type StatementListOpt %type SwitchStatement %type ThrowStatement %type TryStatement %type UnaryExpression +%type UnaryExpression_ +%type UnaryExpressionNoBF %type VariableDeclaration +%type VariableDeclarationNoIn %type VariableDeclarationList %type VariableDeclarationList_ +%type VariableDeclarationListNoIn +%type VariableDeclarationListNoIn_ %type VariableStatement -%type VariadicCall %type WhileStatement %type WithStatement %type Word %type WordOpt +%type MessageExpression +%type SelectorCall +%type SelectorCall_ +%type SelectorList +%type VariadicCall + %nonassoc "if" %nonassoc "else" -%% +%start Program -%start Program; +%% TerminatorOpt : ";" - | NewLine - | + | "\n" + | error { yyerrok; } ; Terminator : ";" - | NewLine + | "\n" | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else yyerrok; } ; +CommaOpt + : "," + | + ; + NewLineOpt - : NewLine + : "\n" | ; @@ -281,8 +333,8 @@ Word | "for" { $$ = $1; } | "function" { $$ = $1; } | "if" { $$ = $1; } - | "in" { $$ = $1; } - | "instanceof" { $$ = $1; } + /* XXX: | "in" { $$ = $1; } */ + /* XXX: | "instanceof" { $$ = $1; } */ | "new" { $$ = $1; } | "null" { $$ = $1; } | "return" NewLineOpt { $$ = $1; } @@ -319,40 +371,22 @@ BooleanLiteral | "false" { $$ = $1; } ; -/* Objective-C Extensions {{{ */ -VariadicCall - : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); } - | { $$ = NULL; } - ; - -SelectorCall_ - : SelectorCall { $$ = $1; } - | VariadicCall { $$ = $1; } - ; - -SelectorCall - : WordOpt ":" AssignmentExpression SelectorCall_ { $$ = new(driver.pool_) CYArgument($1 ?: new(driver.pool_) CYBlank(), $3, $4); } - ; - -SelectorList - : SelectorCall { $$ = $1; } - | Word { $$ = new(driver.pool_) CYArgument($1, NULL); } - ; - -MessageExpression - : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYMessage($2, $3); } - ; -/* }}} */ - /* 11.1 Primary Expressions {{{ */ -PrimaryExpression +PrimaryExpression_ : "this" { $$ = $1; } | Identifier { $$ = new(driver.pool_) CYVariable($1); } | Literal { $$ = $1; } | ArrayLiteral { $$ = $1; } - | ObjectLiteral { $$ = $1; } | "(" Expression ")" { $$ = $2; } - | MessageExpression { $$ = $1; } + ; + +PrimaryExpression + : ObjectLiteral { $$ = $1; } + | PrimaryExpression_ { $$ = $1; } + ; + +PrimaryExpressionNoBF + : PrimaryExpression_ { $$ = $1; } ; /* }}} */ /* 11.1.4 Array Initialiser {{{ */ @@ -376,12 +410,12 @@ ElementList /* }}} */ /* 11.1.5 Object Initialiser {{{ */ ObjectLiteral - : "{" PropertyNameAndValueListOpt "}" { $$ = $2; } + : "{" PropertyNameAndValueListOpt "}" { $$ = new CYObject($2); } ; PropertyNameAndValueList_ : "," PropertyNameAndValueList { $$ = $2; } - | { $$ = NULL; } + | CommaOpt { $$ = NULL; } ; PropertyNameAndValueListOpt @@ -400,17 +434,37 @@ PropertyName ; /* }}} */ +MemberExpression_ + : "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); } + ; + MemberExpression : PrimaryExpression { $$ = $1; } | FunctionExpression { $$ = $1; } | MemberExpression "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); } | MemberExpression "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); } - | "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); } + | MemberExpression_ { $$ = $1; } + ; + +MemberExpressionNoBF + : PrimaryExpressionNoBF { $$ = $1; } + | MemberExpressionNoBF "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); } + | MemberExpressionNoBF "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); } + | MemberExpression_ { $$ = $1; } + ; + +NewExpression_ + : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); } ; NewExpression : MemberExpression { $$ = $1; } - | "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); } + | NewExpression_ { $$ = $1; } + ; + +NewExpressionNoBF + : MemberExpressionNoBF { $$ = $1; } + | NewExpression_ { $$ = $1; } ; CallExpression @@ -420,6 +474,13 @@ CallExpression | CallExpression "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); } ; +CallExpressionNoBF + : MemberExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); } + | CallExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); } + | CallExpressionNoBF "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); } + | CallExpressionNoBF "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); } + ; + ArgumentList_ : "," ArgumentList { $$ = $2; } | { $$ = NULL; } @@ -441,7 +502,13 @@ Arguments LeftHandSideExpression : NewExpression { $$ = $1; } | CallExpression { $$ = $1; } - | "*" LeftHandSideExpression { $$ = new(driver.pool_) CYIndirect($2); } + | LeftHandSideExpression_ { $$ = $1; } + ; + +LeftHandSideExpressionNoBF + : NewExpressionNoBF { $$ = $1; } + | CallExpressionNoBF { $$ = $1; } + | LeftHandSideExpression_ { $$ = $1; } ; PostfixExpression @@ -450,9 +517,14 @@ PostfixExpression | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); } ; -UnaryExpression - : PostfixExpression { $$ = $1; } - | "delete" UnaryExpression { $$ = new(driver.pool_) CYDelete($2); } +PostfixExpressionNoBF + : LeftHandSideExpressionNoBF { $$ = $1; } + | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); } + | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); } + ; + +UnaryExpression_ + : "delete" UnaryExpression { $$ = new(driver.pool_) CYDelete($2); } | "void" UnaryExpression { $$ = new(driver.pool_) CYVoid($2); } | "typeof" UnaryExpression { $$ = new(driver.pool_) CYTypeOf($2); } | "++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); } @@ -463,7 +535,16 @@ UnaryExpression | "-" UnaryExpression { $$ = new(driver.pool_) CYNegate($2); } | "~" UnaryExpression { $$ = new(driver.pool_) CYBitwiseNot($2); } | "!" UnaryExpression { $$ = new(driver.pool_) CYLogicalNot($2); } - | "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); } + ; + +UnaryExpression + : PostfixExpression { $$ = $1; } + | UnaryExpression_ { $$ = $1; } + ; + +UnaryExpressionNoBF + : PostfixExpressionNoBF { $$ = $1; } + | UnaryExpression_ { $$ = $1; } ; MultiplicativeExpression @@ -473,12 +554,25 @@ MultiplicativeExpression | MultiplicativeExpression "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); } ; +MultiplicativeExpressionNoBF + : UnaryExpressionNoBF { $$ = $1; } + | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); } + | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); } + | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); } + ; + AdditiveExpression : MultiplicativeExpression { $$ = $1; } | AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); } | AdditiveExpression "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); } ; +AdditiveExpressionNoBF + : MultiplicativeExpressionNoBF { $$ = $1; } + | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); } + | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); } + ; + ShiftExpression : AdditiveExpression { $$ = $1; } | ShiftExpression "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); } @@ -486,6 +580,13 @@ ShiftExpression | ShiftExpression ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); } ; +ShiftExpressionNoBF + : AdditiveExpressionNoBF { $$ = $1; } + | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); } + | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); } + | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); } + ; + RelationalExpression : ShiftExpression { $$ = $1; } | RelationalExpression "<" ShiftExpression { $$ = new(driver.pool_) CYLess($1, $3); } @@ -496,6 +597,25 @@ RelationalExpression | RelationalExpression "in" ShiftExpression { $$ = new(driver.pool_) CYIn($1, $3); } ; +RelationalExpressionNoIn + : ShiftExpression { $$ = $1; } + | RelationalExpressionNoIn "<" ShiftExpression { $$ = new(driver.pool_) CYLess($1, $3); } + | RelationalExpressionNoIn ">" ShiftExpression { $$ = new(driver.pool_) CYGreater($1, $3); } + | RelationalExpressionNoIn "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual($1, $3); } + | RelationalExpressionNoIn ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual($1, $3); } + | RelationalExpressionNoIn "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf($1, $3); } + ; + +RelationalExpressionNoBF + : ShiftExpressionNoBF { $$ = $1; } + | RelationalExpressionNoBF "<" ShiftExpression { $$ = new(driver.pool_) CYLess($1, $3); } + | RelationalExpressionNoBF ">" ShiftExpression { $$ = new(driver.pool_) CYGreater($1, $3); } + | RelationalExpressionNoBF "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual($1, $3); } + | RelationalExpressionNoBF ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual($1, $3); } + | RelationalExpressionNoBF "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf($1, $3); } + | RelationalExpressionNoBF "in" ShiftExpression { $$ = new(driver.pool_) CYIn($1, $3); } + ; + EqualityExpression : RelationalExpression { $$ = $1; } | EqualityExpression "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); } @@ -504,36 +624,112 @@ EqualityExpression | EqualityExpression "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); } ; +EqualityExpressionNoIn + : RelationalExpressionNoIn { $$ = $1; } + | EqualityExpressionNoIn "==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYEqual($1, $3); } + | EqualityExpressionNoIn "!=" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotEqual($1, $3); } + | EqualityExpressionNoIn "===" RelationalExpressionNoIn { $$ = new(driver.pool_) CYIdentical($1, $3); } + | EqualityExpressionNoIn "!==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotIdentical($1, $3); } + ; + +EqualityExpressionNoBF + : RelationalExpressionNoBF { $$ = $1; } + | EqualityExpressionNoBF "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); } + | EqualityExpressionNoBF "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); } + | EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); } + | EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); } + ; + BitwiseANDExpression : EqualityExpression { $$ = $1; } | BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); } ; +BitwiseANDExpressionNoIn + : EqualityExpressionNoIn { $$ = $1; } + | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); } + ; + +BitwiseANDExpressionNoBF + : EqualityExpressionNoBF { $$ = $1; } + | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); } + ; + BitwiseXORExpression : BitwiseANDExpression { $$ = $1; } | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); } ; +BitwiseXORExpressionNoIn + : BitwiseANDExpressionNoIn { $$ = $1; } + | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); } + ; + +BitwiseXORExpressionNoBF + : BitwiseANDExpressionNoBF { $$ = $1; } + | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); } + ; + BitwiseORExpression : BitwiseXORExpression { $$ = $1; } | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); } ; +BitwiseORExpressionNoIn + : BitwiseXORExpressionNoIn { $$ = $1; } + | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOr($1, $3); } + ; + +BitwiseORExpressionNoBF + : BitwiseXORExpressionNoBF { $$ = $1; } + | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); } + ; + LogicalANDExpression : BitwiseORExpression { $$ = $1; } | LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); } ; +LogicalANDExpressionNoIn + : BitwiseORExpressionNoIn { $$ = $1; } + | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = new(driver.pool_) CYLogicalAnd($1, $3); } + ; + +LogicalANDExpressionNoBF + : BitwiseORExpressionNoBF { $$ = $1; } + | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); } + ; + LogicalORExpression : LogicalANDExpression { $$ = $1; } | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); } ; +LogicalORExpressionNoIn + : LogicalANDExpressionNoIn { $$ = $1; } + | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = new(driver.pool_) CYLogicalOr($1, $3); } + ; + +LogicalORExpressionNoBF + : LogicalANDExpressionNoBF { $$ = $1; } + | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); } + ; + ConditionalExpression : LogicalORExpression { $$ = $1; } | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); } ; +ConditionalExpressionNoIn + : LogicalORExpressionNoIn { $$ = $1; } + | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYCondition($1, $3, $5); } + ; + +ConditionalExpressionNoBF + : LogicalORExpressionNoBF { $$ = $1; } + | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); } + ; + AssignmentExpression : ConditionalExpression { $$ = $1; } | LeftHandSideExpression "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign($1, $3); } @@ -550,20 +746,70 @@ AssignmentExpression | LeftHandSideExpression "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); } ; +AssignmentExpressionNoIn + : ConditionalExpressionNoIn { $$ = $1; } + | LeftHandSideExpression "=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAssign($1, $3); } + | LeftHandSideExpression "*=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); } + | LeftHandSideExpression "/=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYDivideAssign($1, $3); } + | LeftHandSideExpression "%=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYModulusAssign($1, $3); } + | LeftHandSideExpression "+=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAddAssign($1, $3); } + | LeftHandSideExpression "-=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYSubtractAssign($1, $3); } + | LeftHandSideExpression "<<=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); } + | LeftHandSideExpression ">>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); } + | LeftHandSideExpression ">>>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); } + | LeftHandSideExpression "&=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); } + | LeftHandSideExpression "^=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); } + | LeftHandSideExpression "|=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); } + ; + +AssignmentExpressionNoBF + : ConditionalExpressionNoBF { $$ = $1; } + | LeftHandSideExpressionNoBF "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign($1, $3); } + | LeftHandSideExpressionNoBF "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); } + | LeftHandSideExpressionNoBF "/=" AssignmentExpression { $$ = new(driver.pool_) CYDivideAssign($1, $3); } + | LeftHandSideExpressionNoBF "%=" AssignmentExpression { $$ = new(driver.pool_) CYModulusAssign($1, $3); } + | LeftHandSideExpressionNoBF "+=" AssignmentExpression { $$ = new(driver.pool_) CYAddAssign($1, $3); } + | LeftHandSideExpressionNoBF "-=" AssignmentExpression { $$ = new(driver.pool_) CYSubtractAssign($1, $3); } + | LeftHandSideExpressionNoBF "<<=" AssignmentExpression { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); } + | LeftHandSideExpressionNoBF ">>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); } + | LeftHandSideExpressionNoBF ">>>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); } + | LeftHandSideExpressionNoBF "&=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); } + | LeftHandSideExpressionNoBF "^=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); } + | LeftHandSideExpressionNoBF "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); } + ; + Expression_ : "," Expression { $$ = $2; } | { $$ = NULL; } ; +ExpressionNoIn_ + : "," ExpressionNoIn { $$ = $2; } + | { $$ = NULL; } + ; + ExpressionOpt : Expression { $$ = $1; } | { $$ = NULL; } ; +ExpressionNoInOpt + : ExpressionNoIn { $$ = $1; } + | { $$ = NULL; } + ; + Expression : AssignmentExpression Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; } ; +ExpressionNoIn + : AssignmentExpressionNoIn ExpressionNoIn_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; } + ; + +ExpressionNoBF + : AssignmentExpressionNoBF Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; } + ; + Statement : Block { $$ = $1; } | VariableStatement { $$ = $1; } @@ -582,11 +828,16 @@ Statement ; Block - : "{" StatementListOpt "}" { $$ = $2 ?: new(driver.pool_) CYEmpty(); } + : "{" "}" { $$ = new(driver.pool_) CYEmpty(); } + | "{" StatementList "}" { $$ = $2; } ; -StatementListOpt +StatementList : Statement StatementListOpt { $1->SetNext($2); $$ = $1; } + ; + +StatementListOpt + : StatementList { $$ = $1; } | { $$ = NULL; } ; @@ -599,29 +850,51 @@ VariableDeclarationList_ | { $$ = NULL; } ; +VariableDeclarationListNoIn_ + : "," VariableDeclarationListNoIn { $$ = $2; } + | { $$ = NULL; } + ; + VariableDeclarationList : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); } ; +VariableDeclarationListNoIn + : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); } + ; + VariableDeclaration : Identifier InitialiserOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); } ; +VariableDeclarationNoIn + : Identifier InitialiserNoInOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); } + ; + InitialiserOpt : Initialiser { $$ = $1; } | { $$ = NULL; } ; +InitialiserNoInOpt + : InitialiserNoIn { $$ = $1; } + | { $$ = NULL; } + ; + Initialiser : "=" AssignmentExpression { $$ = $2; } ; +InitialiserNoIn + : "=" AssignmentExpressionNoIn { $$ = $2; } + ; + EmptyStatement : ";" { $$ = new(driver.pool_) CYEmpty(); } ; ExpressionStatement - : Expression Terminator { $$ = new(driver.pool_) CYExpress($1); } + : ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); } ; ElseStatementOpt @@ -653,8 +926,8 @@ ForStatement ; ForStatementInitialiser - : ExpressionOpt { $$ = $1; } - | "var" VariableDeclarationList { $$ = $2; } + : ExpressionNoInOpt { $$ = $1; } + | "var" VariableDeclarationListNoIn { $$ = $2; } ; ForInStatement @@ -663,7 +936,7 @@ ForInStatement ForInStatementInitialiser : LeftHandSideExpression { $$ = $1; } - | "var" VariableDeclaration { $$ = $2; } + | "var" VariableDeclarationNoIn { $$ = $2; } ; ContinueStatement @@ -766,4 +1039,41 @@ SourceElement | FunctionDeclaration { $$ = $1; } ; +/* Objective-C Extensions {{{ */ +VariadicCall + : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); } + | { $$ = NULL; } + ; + +SelectorCall_ + : SelectorCall { $$ = $1; } + | VariadicCall { $$ = $1; } + ; + +SelectorCall + : WordOpt ":" AssignmentExpression SelectorCall_ { $$ = new(driver.pool_) CYArgument($1 ?: new(driver.pool_) CYBlank(), $3, $4); } + ; + +SelectorList + : SelectorCall { $$ = $1; } + | Word { $$ = new(driver.pool_) CYArgument($1, NULL); } + ; + +MessageExpression + : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYMessage($2, $3); } + ; + +PrimaryExpression + : MessageExpression { $$ = $1; } + ; +/* }}} */ + +LeftHandSideExpression_ + : "*" LeftHandSideExpression { $$ = new(driver.pool_) CYIndirect($2); } + ; + +UnaryExpression_ + : "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); } + ; + %% diff --git a/Library.mm b/Library.mm index b818ad2..5a5fdf8 100644 --- a/Library.mm +++ b/Library.mm @@ -935,15 +935,11 @@ void CYDriver::Clear() { pool_.Clear(); } -extern int cydebug; - void cy::parser::error(const cy::parser::location_type &loc, const std::string &msg) { std::cerr << loc << ": " << msg << std::endl; } void CYConsole(FILE *fin, FILE *fout, FILE *ferr) { - //cydebug = 1; - CYDriver driver(""); while (!feof(fin)) { _pooled diff --git a/Output.cpp b/Output.cpp index ec0120d..9b03d28 100644 --- a/Output.cpp +++ b/Output.cpp @@ -249,6 +249,13 @@ void CYNumber::Output(std::ostream &out) const { out << Value(); } +void CYObject::Output(std::ostream &out) const { + out << '{'; + if (property_ != NULL) + property_->Output(out); + out << '}'; +} + void CYParameter::Output(std::ostream &out) const { out << *name_; if (next_ != NULL) { @@ -265,20 +272,12 @@ void CYPrefix::Output(std::ostream &out) const { out << Operator() << *rhs_; } -void CYProperty::Output(std::ostream &out, bool raw) const { - if (!raw) - out << '{'; +void CYProperty::Output(std::ostream &out) const { out << *name_ << ':' << *value_; if (next_ != NULL) { out << ','; - next_->Output(out, true); + next_->Output(out); } - if (!raw) - out << '}'; -} - -void CYProperty::Output(std::ostream &out) const { - Output(out, false); } void CYReturn::Output(std::ostream &out) const { diff --git a/Parser.hpp b/Parser.hpp index d7322aa..7673ad0 100644 --- a/Parser.hpp +++ b/Parser.hpp @@ -477,9 +477,7 @@ struct CYForIn : virtual void Output(std::ostream &out) const; }; -struct CYProperty : - CYLiteral -{ +struct CYProperty { CYName *name_; CYExpression *value_; CYProperty *next_; @@ -491,10 +489,22 @@ struct CYProperty : { } - void Output(std::ostream &out, bool raw) const; virtual void Output(std::ostream &out) const; }; +struct CYObject : + CYLiteral +{ + CYProperty *property_; + + CYObject(CYProperty *property) : + property_(property) + { + } + + void Output(std::ostream &out) const; +}; + struct CYCatch : CYThing { -- 2.45.2