Changeset 1025

Timestamp:

02/08/10 13:37:52 (6 months ago)

Author:

weyrick

Message:

add bitwise not and resolve some conflicts

Location:

trunk/rphp

Files:

• compiler/analysis/grammar_src/rphp_grammar.y (modified) (4 diffs)
• include/rphp/analysis/pAST.h (modified) (1 diff)

trunk/rphp/compiler/analysis/grammar_src/rphp_grammar.y

@@ -214 +214 @@
 
 /** ASSOCIATIVITY AND PRECEDENCE (low to high) **/
-%left T_INCLUDE T_INCLUDE_ONCE T_REQUIRE T_REQUIRE_ONCE.
+%left T_INCLUDE T_INCLUDE_ONCE T_REQUIRE T_REQUIRE_ONCE T_EVAL.
 %left T_COMMA.
 %left T_BOOLEAN_OR_LIT.
@@ -220 +220 @@
 %left T_BOOLEAN_AND_LIT.
 %right T_PRINT.
-%left T_ASSIGN T_CONCAT_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_PLUS_EQUAL T_MINUS_EQUAL T_MOD_EQUAL T_DIV_EQUAL T_MUL_EQUAL.
+%left T_ASSIGN T_CONCAT_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_PLUS_EQUAL T_MINUS_EQUAL T_MOD_EQUAL T_DIV_EQUAL T_MUL_EQUAL T_SL_EQUAL T_SR_EQUAL.
 %left T_QUESTION T_COLON.
 %left T_BOOLEAN_AND T_BOOLEAN_OR.
@@ -228 +228 @@
 %nonassoc T_EQUAL T_NOT_EQUAL T_IDENTICAL T_NOT_IDENTICAL.
 %nonassoc T_GREATER_THAN T_LESS_THAN T_GREATER_OR_EQUAL T_LESS_OR_EQUAL.
+%left T_SL T_SR.
 %left T_PLUS T_MINUS T_DOT.
 %left T_DIV T_MOD T_MULT.
 %right T_BOOLEAN_NOT.
 %nonassoc T_INSTANCEOF.
-%right T_INC T_DEC T_FLOAT_CAST T_STRING_CAST T_BINARY_CAST T_UNICODE_CAST T_ARRAY_CAST T_OBJECT_CAST T_INT_CAST T_BOOL_CAST T_UNSET_CAST.
+%right T_TILDE T_INC T_DEC T_FLOAT_CAST T_STRING_CAST T_BINARY_CAST T_UNICODE_CAST T_ARRAY_CAST T_OBJECT_CAST T_INT_CAST T_BOOL_CAST T_UNSET_CAST T_AT.
+%right T_LEFTSQUARE.
 %nonassoc T_NEW T_CLONE.
 %left T_ELSE T_ELSEIF.
+%right T_STATIC T_PROTECTED T_PRIVATE T_ABSTRACT T_FINAL T_PUBLIC.
+
 
 /** GOAL **/
@@ -1352 +1356 @@
     A->setLine(CURRENT_LINE);
 }
-
+unaryOp(A) ::= T_TILDE expr(R).
+{
+    A = new (CTXT) AST::unaryOp(R, AST::unaryOp::BITWISENOT);
+    A->setLine(CURRENT_LINE);
+}
 /** BINARY OPERATORS **/
 %type binaryOp {AST::binaryOp*}

trunk/rphp/include/rphp/analysis/pAST.h

@@ -1670 +1670 @@
 
 public:
-    enum opKind { NEGATIVE, POSITIVE, LOGICALNOT };
+    enum opKind { NEGATIVE, POSITIVE, LOGICALNOT, BITWISENOT };
 
 private: