Merge branch '1.x'

lib/PhpParser/Lexer.php

@@ -278,6 +278,10 @@ class Lexer
         if (defined('T_ONUMBER')) {
             $tokenMap[T_ONUMBER] = Tokens::T_DNUMBER;
         }
+        // HHVM also has a separate token for the __COMPILER_HALT_OFFSET__ constant
+        if (defined('T_COMPILER_HALT_OFFSET')) {
+            $tokenMap[T_COMPILER_HALT_OFFSET] = Tokens::T_STRING;
+        }
 
         return $tokenMap;
     }

test/code/parser/stmt/haltCompilerOffset.test

@@ -0,0 +1,34 @@
+Use of __HALT_COMPILER_OFFSET__ constant
+-----
+<?php
+
+var_dump(__HALT_COMPILER_OFFSET__);
+__halt_compiler();
+Foo
+-----
+array(
+    0: Expr_FuncCall(
+        name: Name(
+            parts: array(
+                0: var_dump
+            )
+        )
+        args: array(
+            0: Arg(
+                value: Expr_ConstFetch(
+                    name: Name(
+                        parts: array(
+                            0: __HALT_COMPILER_OFFSET__
+                        )
+                    )
+                )
+                byRef: false
+                unpack: false
+            )
+        )
+    )
+    1: Stmt_HaltCompiler(
+        remaining:
+    Foo
+    )
+)