Merge pull request #4 from rom1504/fix_const

fix const with an expression
glayzzle · Oct 4, 2015 · 6012a0d · 6012a0d
2 parents 48f65fb + db6396d
commit 6012a0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/parser/class.js b/src/parser/class.js
@@ -160,7 +160,7 @@ module.exports = function(api, tokens, EOF) {
     /**
      * Reads a constant declaration
      * <ebnf>
-     *  constant_declaration ::= T_STRING '=' scalar
+     *  constant_declaration ::= T_STRING '=' expr
      * </ebnf>
      */
     ,read_constant_declaration: function() {
@@ -169,7 +169,7 @@ module.exports = function(api, tokens, EOF) {
         .next()
         .expect('=')
         .next()
-        .read_scalar()
+        .read_expr()
       ;
       return [name, value];
     }

diff --git a/test/parser/class.parser b/test/parser/class.parser
@@ -5,6 +5,12 @@ interface a1 extends i1, i2 {
   public function a1();
   protected function a1();
 }
+--PASS--
+class a {
+  const e=5;
+  const f=6;
+  const A=(self::e | self::f);
+}
 --FAIL--
 class a1 {
   echo 123;