From 0508916952b3c0f050adfa26d25d5af447aa98b5 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Wed, 6 Jun 2012 14:14:43 -0700 Subject: [PATCH] Remove RelationalExpression_: merge to parent. --- Cycript.yy.in | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Cycript.yy.in b/Cycript.yy.in index d5e3e6a..02d2f01 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -411,7 +411,6 @@ int cylex(YYSTYPE *, cy::location *, void *); %type PropertyNameAndValueList_ %type PropertyNameAndValueList %type PropertyNameAndValueListOpt -%type RelationalExpression_ %type RelationalExpression %type ReturnStatement %type RubyProcExpression @@ -858,18 +857,14 @@ ShiftExpression ; /* }}} */ /* 11.8 Relational Operators {{{ */ -RelationalExpression_ - : ShiftExpression { $$ = $1; } - ; - RelationalExpression - : RelationalExpression_ { $$ = $1; } - | RelationalExpression "<" RelationalExpression_ { $$ = CYNew CYLess($1, $3); } - | RelationalExpression ">" RelationalExpression_ { $$ = CYNew CYGreater($1, $3); } - | RelationalExpression "<=" RelationalExpression_ { $$ = CYNew CYLessOrEqual($1, $3); } - | RelationalExpression ">=" RelationalExpression_ { $$ = CYNew CYGreaterOrEqual($1, $3); } - | RelationalExpression "instanceof" RelationalExpression_ { $$ = CYNew CYInstanceOf($1, $3); } - | RelationalExpression "in" RelationalExpression_ { $$ = CYNew CYIn($1, $3); } + : ShiftExpression { $$ = $1; } + | RelationalExpression "<" ShiftExpression { $$ = CYNew CYLess($1, $3); } + | RelationalExpression ">" ShiftExpression { $$ = CYNew CYGreater($1, $3); } + | RelationalExpression "<=" ShiftExpression { $$ = CYNew CYLessOrEqual($1, $3); } + | RelationalExpression ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual($1, $3); } + | RelationalExpression "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf($1, $3); } + | RelationalExpression "in" ShiftExpression { $$ = CYNew CYIn($1, $3); } ; /* }}} */ /* 11.9 Equality Operators {{{ */ -- 2.45.2