Imported Upstream version 5.4.14upstream/5.4.14

28 files changed, 2143 insertions, 1750 deletions

diff --git a/Zend/tests/bug62343.phpt b/Zend/tests/bug62343.phpt
new file mode 100644
index 000000000..b0208c4ac
--- /dev/null
+++ b/Zend/tests/bug62343.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #62343 (Show class_alias In get_declared_classes())
+--FILE--
+<?php
+class a { }
+class_alias("a", "b");
+$c = get_declared_classes();
+var_dump(end($c));
+var_dump(prev($c));
+?>
+--EXPECT--
+string(1) "b"
+string(1) "a"
diff --git a/Zend/tests/bug63976.phpt b/Zend/tests/bug63976.phpt
new file mode 100644
index 000000000..0ac09d9b3
--- /dev/null
+++ b/Zend/tests/bug63976.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #63976 (Parent class incorrectly using child constant in class property)
+--FILE--
+<?php
+if (1) {
+  class Foo {
+    const TABLE = "foo";
+    public $table = self::TABLE;
+  }
+}
+if (1) {
+  class Bar extends Foo {
+    const TABLE = "bar";
+  }
+}
+$bar = new Bar();
+var_dump($bar->table);
+?>
+--EXPECT--
+string(3) "foo"
diff --git a/Zend/tests/bug64239_1.phpt b/Zend/tests/bug64239_1.phpt
new file mode 100644
index 000000000..10d44c181
--- /dev/null
+++ b/Zend/tests/bug64239_1.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #64239 (get_class_methods() changed behavior)
+--FILE--
+<?php
+class A {
+	use T2 { t2method as Bmethod; }
+}
+
+class B extends A {
+}
+
+trait T2 {
+	public function t2method() {
+	}
+}
+print_r(get_class_methods("A"));
+print_r(get_class_methods("B"));
+--EXPECT--
+Array
+(
+    [0] => Bmethod
+    [1] => t2method
+)
+Array
+(
+    [0] => Bmethod
+    [1] => t2method
+)
diff --git a/Zend/tests/bug64239_2.phpt b/Zend/tests/bug64239_2.phpt
new file mode 100644
index 000000000..26cf8ee1a
--- /dev/null
+++ b/Zend/tests/bug64239_2.phpt
@@ -0,0 +1,58 @@
+--TEST--
+Bug #64239 (debug_backtrace() changed behavior)
+--FILE--
+<?php
+class A {
+	use T1;
+	public function test() { $this->backtrace(); }
+}
+
+class B {
+	use T2 { t2method as Bmethod; }
+}
+
+class C extends A {
+}
+
+trait T1 {
+	protected function backtrace() {
+		$b = new B();
+		$b->Bmethod();
+	}
+}
+trait T2 {
+	public function t2method() {
+		print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1));
+	}
+}
+$a = new A();
+$a->test();
+
+$c = new C();
+$c->test();
+?>
+--EXPECTF--
+Array
+(
+    [0] => Array
+        (
+            [file] => %sbug64239_2.php
+            [line] => %d
+            [function] => Bmethod
+            [class] => B
+            [type] => ->
+        )
+
+)
+Array
+(
+    [0] => Array
+        (
+            [file] => %sbug64239_2.php
+            [line] => %d
+            [function] => Bmethod
+            [class] => B
+            [type] => ->
+        )
+
+)
diff --git a/Zend/tests/bug64239_3.phpt b/Zend/tests/bug64239_3.phpt
new file mode 100644
index 000000000..15faeb985
--- /dev/null
+++ b/Zend/tests/bug64239_3.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Bug #64239 (debug_print_backtrace() changed behavior)
+--FILE--
+<?php
+class A {
+	use T2 { t2method as Bmethod; }
+}
+
+class C extends A {
+	public function Bmethod() {
+		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+    }
+}
+
+trait T2 {
+	public function t2method() {
+		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+	}
+}
+
+$a = new A();
+$a->Bmethod();
+$a->t2method();
+
+$c = new C();
+$c->Bmethod();
+$c->t2method();
+?>
+--EXPECTF--
+#0  A->Bmethod() called at [%sbug64239_3.php:%d]
+#0  A->t2method() called at [%sbug64239_3.php:%d]
+#0  C->Bmethod() called at [%sbug64239_3.php:%d]
+#0  A->t2method() called at [%sbug64239_3.php:%d]
diff --git a/Zend/tests/bug64239_4.phpt b/Zend/tests/bug64239_4.phpt
new file mode 100644
index 000000000..7ab761ef7
--- /dev/null
+++ b/Zend/tests/bug64239_4.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #64239 (debug_print_backtrace() changed behavior)
+--FILE--
+<?php
+class A {
+	use T2 { t2method as Bmethod; }
+}
+
+class C extends A {
+	public static function Bmethod() {
+		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+    }
+}
+
+trait T2 {
+	public static function t2method() {
+		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+	}
+}
+
+A::Bmethod();
+A::t2method();
+
+C::Bmethod();
+C::t2method();
+?>
+--EXPECTF--
+#0  A::Bmethod() called at [%sbug64239_4.php:%d]
+#0  A::t2method() called at [%sbug64239_4.php:%d]
+#0  C::Bmethod() called at [%sbug64239_4.php:%d]
+#0  A::t2method() called at [%sbug64239_4.php:%d]
diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt
new file mode 100644
index 000000000..03a4b80b4
--- /dev/null
+++ b/Zend/tests/bug64354.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
+--FILE--
+<?php
+class B implements Serializable {
+    public function serialize() {
+        throw new Exception("serialize");
+        return NULL;
+    }
+
+    public function unserialize($data) {
+    }
+}
+
+$data = array(new B);
+
+try {
+    serialize($data);
+} catch (Exception $e) { 
+    var_dump($e->getMessage());
+}
+?>
+--EXPECTF--
+string(9) "serialize"
diff --git a/Zend/tests/bug64417.phpt b/Zend/tests/bug64417.phpt
new file mode 100644
index 000000000..f3ef740b4
--- /dev/null
+++ b/Zend/tests/bug64417.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #64417 (BC break: ArrayAccess::&offsetGet() in a trait causes fatal error)
+--FILE--
+<?php
+trait aa {
+    private $container = array();
+    public function offsetSet($offset, $value) {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+    public function offsetExists($offset) {
+        return isset($this->container[$offset]);
+    }
+    public function offsetUnset($offset) {
+        unset($this->container[$offset]);
+    }
+    public function &offsetGet($offset) {
+	$result = null;
+        if (isset($this->container[$offset])) {
+            $result = &$this->container[$offset];
+        }
+        return $result;
+    }
+}
+
+class obj implements ArrayAccess {
+    use aa;
+}
+
+$o = new obj;
+$o['x'] = 1;
+++$o['x'];
+echo $o['x'], "\n";
+--EXPECT--
+2
+
diff --git a/Zend/tests/bug64515.phpt b/Zend/tests/bug64515.phpt
new file mode 100644
index 000000000..5390a6cdc
--- /dev/null
+++ b/Zend/tests/bug64515.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
+--FILE--
+<?php
+function foo($unused = null, $unused = null, $arg = array()) {
+	    return 1;
+}
+foo();
+echo "okey";
+?>
+--EXPECT--
+okey
diff --git a/Zend/zend.h b/Zend/zend.h
index b6c1a5b8a..e1d1fad42 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -350,6 +350,10 @@ struct _zval_struct {
 #define Z_UNSET_ISREF(z)		Z_UNSET_ISREF_P(&(z))
 #define Z_SET_ISREF_TO(z, isref)	Z_SET_ISREF_TO_P(&(z), isref)
 
+#if ZEND_DEBUG
+#define zend_always_inline inline
+#define zend_never_inline
+#else
 #if defined(__GNUC__)
 #if __GNUC__ >= 3
 #define zend_always_inline inline __attribute__((always_inline))
@@ -358,7 +362,6 @@ struct _zval_struct {
 #define zend_always_inline inline
 #define zend_never_inline
 #endif
-
 #elif defined(_MSC_VER)
 #define zend_always_inline __forceinline
 #define zend_never_inline
@@ -366,6 +369,7 @@ struct _zval_struct {
 #define zend_always_inline inline
 #define zend_never_inline
 #endif
+#endif /* ZEND_DEBUG */
 
 #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
 # define EXPECTED(condition)   __builtin_expect(condition, 1)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index eec4ab0bb..529092ab9 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1022,6 +1022,41 @@ ZEND_API void zend_merge_properties(zval *obj, HashTable *properties, int destro
 }
 /* }}} */
 
+static int zval_update_class_constant(zval **pp, int is_static, int offset TSRMLS_DC) /* {{{ */
+{
+	if ((Z_TYPE_PP(pp) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT ||
+	    (Z_TYPE_PP(pp) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_ARRAY) {	    
+		zend_class_entry **scope = EG(in_execution)?&EG(scope):&CG(active_class_entry);
+
+		if ((*scope)->parent) {
+			zend_class_entry *ce = *scope;
+			HashPosition pos;
+			zend_property_info *prop_info;
+
+			do {
+				for (zend_hash_internal_pointer_reset_ex(&ce->properties_info, &pos);
+				     zend_hash_get_current_data_ex(&ce->properties_info, (void **) &prop_info, &pos) == SUCCESS;
+				     zend_hash_move_forward_ex(&ce->properties_info, &pos)) {
+					if (is_static == ((prop_info->flags & ZEND_ACC_STATIC) != 0) &&
+					    offset == prop_info->offset) {
+						int ret;
+						zend_class_entry *old_scope = *scope;
+						*scope = prop_info->ce;
+						ret = zval_update_constant(pp, (void*)1 TSRMLS_CC);
+						*scope = old_scope;
+						return ret;
+					}
+				}				
+				ce = ce->parent;
+			} while (ce);
+			
+		}
+		return zval_update_constant(pp, (void*)1 TSRMLS_CC);
+	}
+	return 0;
+}
+/* }}} */
+
 ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
 	if ((class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED) == 0 || (!CE_STATIC_MEMBERS(class_type) && class_type->default_static_members_count)) {
@@ -1034,7 +1069,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
 
 		for (i = 0; i < class_type->default_properties_count; i++) {
 			if (class_type->default_properties_table[i]) {
-				zval_update_constant(&class_type->default_properties_table[i], (void**)1 TSRMLS_CC);
+				zval_update_class_constant(&class_type->default_properties_table[i], 0, i TSRMLS_CC);
 			}
 		}
 
@@ -1075,7 +1110,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
 		}
 
 		for (i = 0; i < class_type->default_static_members_count; i++) {
-			zval_update_constant(&CE_STATIC_MEMBERS(class_type)[i], (void**)1 TSRMLS_CC);
+			zval_update_class_constant(&CE_STATIC_MEMBERS(class_type)[i], 1, i TSRMLS_CC);
 		}
 
 		*scope = old_scope;
@@ -3878,6 +3913,62 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC)
 }
 /* }}} */
 
+ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len) /* {{{ */
+{
+	zend_trait_alias *alias, **alias_ptr;
+
+	alias_ptr = ce->trait_aliases;
+	alias = *alias_ptr;
+	while (alias) {
+		if (alias->alias_len == len &&
+		    !strncasecmp(name, alias->alias, alias->alias_len)) {
+			return alias->alias;
+		}
+		alias_ptr++;
+		alias = *alias_ptr;
+	}
+
+	return name;
+}
+/* }}} */
+
+ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f) /* {{{ */
+{
+	zend_function *func;
+	HashPosition iterator;
+	HashTable *function_table;
+
+	if (f->common.type != ZEND_USER_FUNCTION ||
+	    *(f->op_array.refcount) < 2 ||
+	    !f->common.scope ||
+	    !f->common.scope->trait_aliases) {
+		return f->common.function_name;
+	}
+
+	function_table = &ce->function_table;
+	zend_hash_internal_pointer_reset_ex(function_table, &iterator);
+	while (zend_hash_get_current_data_ex(function_table, (void **)&func, &iterator) == SUCCESS) {
+		if (func == f) {
+			char *name;
+			uint len;
+			ulong idx;
+
+			if (zend_hash_get_current_key_ex(function_table, &name, &len, &idx, 0, &iterator) != HASH_KEY_IS_STRING) {
+				return f->common.function_name;
+			}
+			--len;
+			if (len == strlen(f->common.function_name) &&
+			    !strncasecmp(name, f->common.function_name, len)) {
+				return f->common.function_name;
+			}
+			return zend_find_alias_name(f->common.scope, name, len);
+		}
+		zend_hash_move_forward_ex(function_table, &iterator);
+	}
+	return f->common.function_name;
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index e20f8d624..62bf391ca 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -517,6 +517,9 @@ ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);
 
 ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);
 
+ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len);
+ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f);
+
 #define add_method(arg, key, method)	add_assoc_function((arg), (key), (method))
 
 ZEND_API ZEND_FUNCTION(display_disabled_function);
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index fcd1deac6..f29676bac 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1025,6 +1025,13 @@ ZEND_FUNCTION(get_object_vars)
 }
 /* }}} */
 
+static int same_name(const char *key, const char *name, zend_uint name_len)
+{
+	char *lcname = zend_str_tolower_dup(name, name_len);
+	int ret = memcmp(lcname, key, name_len) == 0;
+	efree(lcname);
+	return ret;
+}
 
 /* {{{ proto array get_class_methods(mixed class)
    Returns an array of method names for class or class instance. */
@@ -1072,14 +1079,26 @@ ZEND_FUNCTION(get_class_methods)
 			uint len = strlen(mptr->common.function_name);
 
 			/* Do not display old-style inherited constructors */
-			if ((mptr->common.fn_flags & ZEND_ACC_CTOR) == 0 ||
-			    mptr->common.scope == ce ||
-			    zend_hash_get_current_key_ex(&ce->function_table, &key, &key_len, &num_index, 0, &pos) != HASH_KEY_IS_STRING ||
-			    zend_binary_strcasecmp(key, key_len-1, mptr->common.function_name, len) == 0) {
-
+			if (zend_hash_get_current_key_ex(&ce->function_table, &key, &key_len, &num_index, 0, &pos) != HASH_KEY_IS_STRING) {
 				MAKE_STD_ZVAL(method_name);
 				ZVAL_STRINGL(method_name, mptr->common.function_name, len, 1);
 				zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
+			} else if ((mptr->common.fn_flags & ZEND_ACC_CTOR) == 0 ||
+			    mptr->common.scope == ce ||
+			    zend_binary_strcasecmp(key, key_len-1, mptr->common.function_name, len) == 0) {
+
+				if (mptr->type == ZEND_USER_FUNCTION &&
+				    *mptr->op_array.refcount > 1 &&
+			    	(len != key_len - 1 ||
+			    	 !same_name(key, mptr->common.function_name, len))) {
+					MAKE_STD_ZVAL(method_name);
+					ZVAL_STRINGL(method_name, zend_find_alias_name(mptr->common.scope, key, key_len - 1), key_len - 1, 1);
+					zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
+				} else {
+					MAKE_STD_ZVAL(method_name);
+					ZVAL_STRINGL(method_name, mptr->common.function_name, len, 1);
+					zend_hash_next_index_insert(return_value->value.ht, &method_name, sizeof(zval *), NULL);
+				}
 			}
 		}
 		zend_hash_move_forward_ex(&ce->function_table, &pos);
@@ -1640,7 +1659,6 @@ ZEND_FUNCTION(restore_exception_handler)
 }
 /* }}} */
 
-
 static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	zval *array = va_arg(args, zval *);
@@ -1651,7 +1669,13 @@ static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int nu
 
 	if ((hash_key->nKeyLength==0 || hash_key->arKey[0]!=0)
 		&& (comply_mask == (ce->ce_flags & mask))) {
-		add_next_index_stringl(array, ce->name, ce->name_length, 1);
+		if (ce->refcount > 1 && 
+		    (ce->name_length != hash_key->nKeyLength - 1 || 
+		     !same_name(hash_key->arKey, ce->name, ce->name_length))) {
+			add_next_index_stringl(array, hash_key->arKey, hash_key->nKeyLength - 1, 1);
+		} else {
+			add_next_index_stringl(array, ce->name, ce->name_length, 1);
+		}
 	}
 	return ZEND_HASH_APPLY_KEEP;
 }
@@ -2094,7 +2118,14 @@ ZEND_FUNCTION(debug_print_backtrace)
 			lineno = 0;
 		}
 
-		function_name = ptr->function_state.function->common.function_name;
+		function_name = (ptr->function_state.function->common.scope &&
+			ptr->function_state.function->common.scope->trait_aliases) ?
+				zend_resolve_method_name(
+					ptr->object ?
+						Z_OBJCE_P(ptr->object) : 
+						ptr->function_state.function->common.scope,
+					ptr->function_state.function) :
+				ptr->function_state.function->common.function_name;
 
 		if (function_name) {
 			if (ptr->object) {
@@ -2275,7 +2306,14 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 			filename = NULL;
 		}
 
-		function_name = ptr->function_state.function->common.function_name;
+		function_name = (ptr->function_state.function->common.scope &&
+			ptr->function_state.function->common.scope->trait_aliases) ?
+				zend_resolve_method_name(
+					ptr->object ?
+						Z_OBJCE_P(ptr->object) : 
+						ptr->function_state.function->common.scope,
+					ptr->function_state.function) :
+				ptr->function_state.function->common.function_name;
 
 		if (function_name) {
 			add_assoc_string_ex(stack_frame, "function", sizeof("function"), (char*)function_name, 1);
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 0a1749dbd..82275ce62 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1798,7 +1798,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /*
 	zend_do_return(NULL, 0 TSRMLS_CC);
 
 	pass_two(CG(active_op_array) TSRMLS_CC);
-	zend_release_labels(TSRMLS_C);
+	zend_release_labels(0 TSRMLS_CC);
 
 	if (CG(active_class_entry)) {
 		zend_check_magic_method_implementation(CG(active_class_entry), (zend_function*)CG(active_op_array), E_COMPILE_ERROR TSRMLS_CC);
@@ -2320,13 +2320,14 @@ void zend_do_goto(const znode *label TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-void zend_release_labels(TSRMLS_D) /* {{{ */
+void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */
 {
 	if (CG(context).labels) {
 		zend_hash_destroy(CG(context).labels);
 		FREE_HASHTABLE(CG(context).labels);
+		CG(context).labels = NULL;
 	}
-	if (!zend_stack_is_empty(&CG(context_stack))) {
+	if (!temporary && !zend_stack_is_empty(&CG(context_stack))) {
 		zend_compiler_context *ctx;
 
 		zend_stack_top(&CG(context_stack), (void**)&ctx);
@@ -3634,7 +3635,7 @@ static zend_bool zend_traits_method_compatibility_check(zend_function *fn, zend_
 	zend_uint other_flags = other_fn->common.scope->ce_flags;
 	
 	return zend_do_perform_implementation_check(fn, other_fn TSRMLS_CC)
-		&& zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC)
+		&& ((other_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) || zend_do_perform_implementation_check(other_fn, fn TSRMLS_CC))
 		&& ((fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC)) == 
 		    (other_flags & (ZEND_ACC_FINAL|ZEND_ACC_STATIC))); /* equal final and static qualifier */
 }
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 50ee3a4d7..32449d2a6 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -616,7 +616,7 @@ void zend_do_end_compilation(TSRMLS_D);
 void zend_do_label(znode *label TSRMLS_DC);
 void zend_do_goto(const znode *label TSRMLS_DC);
 void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC);
-void zend_release_labels(TSRMLS_D);
+void zend_release_labels(int temporary TSRMLS_DC);
 
 ZEND_API void function_add_ref(zend_function *function);
 
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a38504fbb..09e703ca5 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1313,7 +1313,7 @@ void execute_new_code(TSRMLS_D) /* {{{ */
 		opline++;
 	}
 	
-	zend_release_labels(TSRMLS_C);
+	zend_release_labels(1 TSRMLS_CC);
 	
 	EG(return_value_ptr_ptr) = NULL;
 	EG(active_op_array) = CG(active_op_array);
diff --git a/Zend/zend_ini_parser.c b/Zend/zend_ini_parser.c
index a3862d30f..70be84343 100644
--- a/Zend/zend_ini_parser.c
+++ b/Zend/zend_ini_parser.c
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -47,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,58 +54,23 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse ini_parse
-#define yylex   ini_lex
-#define yyerror ini_error
-#define yylval  ini_lval
-#define yychar  ini_char
-#define yydebug ini_debug
-#define yynerrs ini_nerrs
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TC_SECTION = 258,
-     TC_RAW = 259,
-     TC_CONSTANT = 260,
-     TC_NUMBER = 261,
-     TC_STRING = 262,
-     TC_WHITESPACE = 263,
-     TC_LABEL = 264,
-     TC_OFFSET = 265,
-     TC_DOLLAR_CURLY = 266,
-     TC_VARNAME = 267,
-     TC_QUOTED_STRING = 268,
-     BOOL_TRUE = 269,
-     BOOL_FALSE = 270,
-     END_OF_LINE = 271
-   };
-#endif
-/* Tokens.  */
-#define TC_SECTION 258
-#define TC_RAW 259
-#define TC_CONSTANT 260
-#define TC_NUMBER 261
-#define TC_STRING 262
-#define TC_WHITESPACE 263
-#define TC_LABEL 264
-#define TC_OFFSET 265
-#define TC_DOLLAR_CURLY 266
-#define TC_VARNAME 267
-#define TC_QUOTED_STRING 268
-#define BOOL_TRUE 269
-#define BOOL_FALSE 270
-#define END_OF_LINE 271
-
-
+#define yyparse         ini_parse
+#define yylex           ini_lex
+#define yyerror         ini_error
+#define yylval          ini_lval
+#define yychar          ini_char
+#define yydebug         ini_debug
+#define yynerrs         ini_nerrs
 
 
 /* Copy the first part of user declarations.  */
@@ -359,6 +323,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 
 
 
+
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -377,20 +342,59 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 # define YYTOKEN_TABLE 0
 #endif
 
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TC_SECTION = 258,
+     TC_RAW = 259,
+     TC_CONSTANT = 260,
+     TC_NUMBER = 261,
+     TC_STRING = 262,
+     TC_WHITESPACE = 263,
+     TC_LABEL = 264,
+     TC_OFFSET = 265,
+     TC_DOLLAR_CURLY = 266,
+     TC_VARNAME = 267,
+     TC_QUOTED_STRING = 268,
+     BOOL_TRUE = 269,
+     BOOL_FALSE = 270,
+     END_OF_LINE = 271
+   };
+#endif
+/* Tokens.  */
+#define TC_SECTION 258
+#define TC_RAW 259
+#define TC_CONSTANT 260
+#define TC_NUMBER 261
+#define TC_STRING 262
+#define TC_WHITESPACE 263
+#define TC_LABEL 264
+#define TC_OFFSET 265
+#define TC_DOLLAR_CURLY 266
+#define TC_VARNAME 267
+#define TC_QUOTED_STRING 268
+#define BOOL_TRUE 269
+#define BOOL_FALSE 270
+#define END_OF_LINE 271
+
+
+
+
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
-
 /* Copy the second part of user declarations.  */
 
 
-/* Line 216 of yacc.c.  */
-
 
 #ifdef short
 # undef short
@@ -440,7 +444,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -465,14 +469,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int i)
+YYID (int yyi)
 #else
 static int
-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;
 #endif
 {
-  return i;
+  return yyi;
 }
 #endif
 
@@ -553,9 +557,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -589,12 +593,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -705,7 +709,7 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "TC_SECTION", "TC_RAW", "TC_CONSTANT",
   "TC_NUMBER", "TC_STRING", "TC_WHITESPACE", "TC_LABEL", "TC_OFFSET",
   "TC_DOLLAR_CURLY", "TC_VARNAME", "TC_QUOTED_STRING", "BOOL_TRUE",
-  "BOOL_FALSE", "END_OF_LINE", "'='", "':'", "','", "'.'", "'\"'", "'''",
+  "BOOL_FALSE", "END_OF_LINE", "'='", "':'", "','", "'.'", "'\"'", "'\\''",
   "'^'", "'+'", "'-'", "'/'", "'*'", "'%'", "'$'", "'~'", "'<'", "'>'",
   "'?'", "'@'", "'{'", "'}'", "'|'", "'&'", "'!'", "']'", "'('", "')'",
   "$accept", "statement_list", "statement", "section_string_or_value",
@@ -909,7 +913,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -1020,17 +1024,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1064,11 +1071,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");
     }
 }
 
@@ -1348,10 +1355,8 @@ yydestruct (yymsg, yytype, yyvaluep)
 	break;
     }
 }
-
 
 /* Prevent warnings from -Wmissing-prototypes.  */
-
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -1370,10 +1375,9 @@ int yyparse ();
 
 
 
-
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1397,74 +1401,75 @@ yyparse ()
 #endif
 #endif
 {
-  /* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
-/* Number of syntax errors so far.  */
-int yynerrs;
+    /* Number of syntax errors so far.  */
+    int yynerrs;
 
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
 
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
-
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;
 
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
-
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -1494,7 +1499,6 @@ int yynerrs;
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
-
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1502,7 +1506,6 @@ int yynerrs;
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1525,9 +1528,8 @@ int yynerrs;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1538,7 +1540,6 @@ int yynerrs;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1548,6 +1549,9 @@ int yynerrs;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -1556,16 +1560,16 @@ int yynerrs;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1597,20 +1601,16 @@ yybackup:
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -1891,7 +1891,6 @@ yyreduce:
     break;
 
 
-/* Line 1267 of yacc.c.  */
 
       default: break;
     }
@@ -1903,7 +1902,6 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1968,7 +1966,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -1985,7 +1983,7 @@ yyerrlab:
 	}
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -2042,9 +2040,6 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   *++yyvsp = yylval;
 
 
@@ -2069,7 +2064,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -2080,7 +2075,7 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
+  if (yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
diff --git a/Zend/zend_ini_parser.h b/Zend/zend_ini_parser.h
index d883f9d40..1e0c9a96d 100644
--- a/Zend/zend_ini_parser.h
+++ b/Zend/zend_ini_parser.h
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +28,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -76,10 +76,11 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
+
diff --git a/Zend/zend_ini_parser.output b/Zend/zend_ini_parser.output
index 9f7bcda21..fc6468a7f 100644
--- a/Zend/zend_ini_parser.output
+++ b/Zend/zend_ini_parser.output
@@ -1,9 +1,9 @@
-Terminals which are not used
+Terminals unused in grammar
 
    ':'
    ','
    '.'
-   '''
+   '\''
    '^'
    '+'
    '-'
@@ -90,7 +90,7 @@ $end (0) 0
 '$' (36)
 '%' (37)
 '&' (38) 33
-''' (39)
+'\'' (39)
 '(' (40) 36
 ')' (41) 36
 '*' (42)
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 384b66da4..e2e81ed32 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -452,7 +452,7 @@ ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint
 		zval_ptr_dtor(&retval);
 	}
 
-	if (result == FAILURE) {
+	if (result == FAILURE && !EG(exception)) {
 		zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "%s::serialize() must return a string or NULL", ce->name);
 	}
 	return result;
diff --git a/Zend/zend_language_parser.c b/Zend/zend_language_parser.c
index 295da98ca..e631c6ed5 100644
--- a/Zend/zend_language_parser.c
+++ b/Zend/zend_language_parser.c
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,7 +28,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -47,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,17 +54,96 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
-#define yyparse zendparse
-#define yylex   zendlex
-#define yyerror zenderror
-#define yylval  zendlval
-#define yychar  zendchar
-#define yydebug zenddebug
-#define yynerrs zendnerrs
+#define yyparse         zendparse
+#define yylex           zendlex
+#define yyerror         zenderror
+#define yylval          zendlval
+#define yychar          zendchar
+#define yydebug         zenddebug
+#define yynerrs         zendnerrs
+
+
+/* Copy the first part of user declarations.  */
+
+
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+/*
+ * LALR shift/reduce conflicts and how they are resolved:
+ *
+ * - 2 shift/reduce conflicts due to the dangling elseif/else ambiguity. Solved by shift.
+ *
+ */
+
+
+#include "zend_compile.h"
+#include "zend.h"
+#include "zend_list.h"
+#include "zend_globals.h"
+#include "zend_API.h"
+#include "zend_constants.h"
+
+#define YYSIZE_T size_t
+#define yytnamerr zend_yytnamerr
+static YYSIZE_T zend_yytnamerr(char*, const char*);
+
+#define YYERROR_VERBOSE
+#define YYSTYPE znode
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+
+
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
 
 
 /* Tokens.  */
@@ -337,91 +415,17 @@
 
 
 
-/* Copy the first part of user declarations.  */
-
-
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-/*
- * LALR shift/reduce conflicts and how they are resolved:
- *
- * - 2 shift/reduce conflicts due to the dangling elseif/else ambiguity. Solved by shift.
- *
- */
-
-
-#include "zend_compile.h"
-#include "zend.h"
-#include "zend_list.h"
-#include "zend_globals.h"
-#include "zend_API.h"
-#include "zend_constants.h"
-
-#define YYSIZE_T size_t
-#define yytnamerr zend_yytnamerr
-static YYSIZE_T zend_yytnamerr(char*, const char*);
-
-#define YYERROR_VERBOSE
-#define YYSTYPE znode
-#ifdef ZTS
-# define YYPARSE_PARAM tsrm_ls
-# define YYLEX_PARAM tsrm_ls
-#endif
-
-
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
-
 /* Copy the second part of user declarations.  */
 
 
-/* Line 216 of yacc.c.  */
-
 
 #ifdef short
 # undef short
@@ -471,7 +475,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -496,14 +500,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int i)
+YYID (int yyi)
 #else
 static int
-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;
 #endif
 {
-  return i;
+  return yyi;
 }
 #endif
 
@@ -584,9 +588,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -620,12 +624,12 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -1055,27 +1059,28 @@ static const char *const yytname[] =
   "\":: (T_PAAMAYIM_NEKUDOTAYIM)\"", "\"namespace (T_NAMESPACE)\"",
   "\"__NAMESPACE__ (T_NS_C)\"", "\"__DIR__ (T_DIR)\"",
   "\"\\\\ (T_NS_SEPARATOR)\"", "'('", "')'", "';'", "'{'", "'}'", "'$'",
-  "']'", "'`'", "'\"'", "$accept", "start", "top_statement_list", "@1",
-  "namespace_name", "top_statement", "@2", "@3", "use_declarations",
-  "use_declaration", "constant_declaration", "inner_statement_list", "@4",
-  "inner_statement", "statement", "unticked_statement", "@5", "@6", "@7",
-  "@8", "@9", "@10", "@11", "@12", "@13", "@14", "@15", "@16", "@17",
-  "@18", "@19", "@20", "@21", "@22", "@23", "@24", "@25", "@26",
-  "additional_catches", "non_empty_additional_catches", "additional_catch",
-  "@27", "@28", "unset_variables", "unset_variable",
+  "']'", "'`'", "'\"'", "$accept", "start", "top_statement_list", "$@1",
+  "namespace_name", "top_statement", "$@2", "$@3", "use_declarations",
+  "use_declaration", "constant_declaration", "inner_statement_list", "$@4",
+  "inner_statement", "statement", "unticked_statement", "$@5", "$@6",
+  "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "$@13", "$@14", "$@15",
+  "$@16", "$@17", "$@18", "$@19", "$@20", "$@21", "$@22", "$@23", "$@24",
+  "$@25", "$@26", "additional_catches", "non_empty_additional_catches",
+  "additional_catch", "@27", "$@28", "unset_variables", "unset_variable",
   "function_declaration_statement", "class_declaration_statement",
-  "is_reference", "unticked_function_declaration_statement", "@29",
-  "unticked_class_declaration_statement", "@30", "@31", "class_entry_type",
-  "extends_from", "interface_entry", "interface_extends_list",
-  "implements_list", "interface_list", "foreach_optional_arg",
-  "foreach_variable", "for_statement", "foreach_statement",
-  "declare_statement", "declare_list", "switch_case_list", "case_list",
-  "@32", "@33", "case_separator", "while_statement", "elseif_list", "@34",
-  "new_elseif_list", "@35", "else_single", "new_else_single",
-  "parameter_list", "non_empty_parameter_list", "optional_class_type",
+  "is_reference", "unticked_function_declaration_statement", "$@29",
+  "unticked_class_declaration_statement", "$@30", "$@31",
+  "class_entry_type", "extends_from", "interface_entry",
+  "interface_extends_list", "implements_list", "interface_list",
+  "foreach_optional_arg", "foreach_variable", "for_statement",
+  "foreach_statement", "declare_statement", "declare_list",
+  "switch_case_list", "case_list", "$@32", "$@33", "case_separator",
+  "while_statement", "elseif_list", "$@34", "new_elseif_list", "$@35",
+  "else_single", "new_else_single", "parameter_list",
+  "non_empty_parameter_list", "optional_class_type",
   "function_call_parameter_list", "non_empty_function_call_parameter_list",
   "global_var_list", "global_var", "static_var_list",
-  "class_statement_list", "class_statement", "@36", "@37",
+  "class_statement_list", "class_statement", "$@36", "$@37",
   "trait_use_statement", "trait_list", "trait_adaptations",
   "trait_adaptation_list", "non_empty_trait_adaptation_list",
   "trait_adaptation_statement", "trait_precedence", "trait_reference_list",
@@ -1083,32 +1088,33 @@ static const char *const yytname[] =
   "trait_alias", "trait_modifiers", "method_body", "variable_modifiers",
   "method_modifiers", "non_empty_member_modifiers", "member_modifier",
   "class_variable_declaration", "class_constant_declaration",
-  "echo_expr_list", "for_expr", "non_empty_for_expr", "@38",
+  "echo_expr_list", "for_expr", "non_empty_for_expr", "$@38",
   "chaining_method_or_property", "chaining_dereference",
-  "chaining_instance_call", "@39", "instance_call", "@40", "new_expr",
-  "@41", "expr_without_variable", "@42", "@43", "@44", "@45", "@46", "@47",
-  "@48", "@49", "@50", "@51", "@52", "@53", "@54", "function",
-  "lexical_vars", "lexical_var_list", "function_call", "@55", "@56", "@57",
-  "@58", "@59", "@60", "@61", "@62", "class_name",
+  "chaining_instance_call", "$@39", "instance_call", "$@40", "new_expr",
+  "$@41", "expr_without_variable", "$@42", "$@43", "$@44", "$@45", "$@46",
+  "$@47", "@48", "$@49", "$@50", "$@51", "$@52", "@53", "@54", "function",
+  "lexical_vars", "lexical_var_list", "function_call", "$@55", "$@56",
+  "$@57", "$@58", "$@59", "$@60", "$@61", "$@62", "class_name",
   "fully_qualified_class_name", "class_name_reference",
-  "dynamic_class_name_reference", "@63", "@64",
+  "dynamic_class_name_reference", "$@63", "$@64",
   "dynamic_class_name_variable_properties",
   "dynamic_class_name_variable_property", "exit_expr", "backticks_expr",
   "ctor_arguments", "common_scalar", "static_scalar",
   "static_class_constant", "scalar", "static_array_pair_list",
   "possible_comma", "non_empty_static_array_pair_list", "expr",
-  "r_variable", "w_variable", "rw_variable", "variable", "@65", "@66",
-  "variable_properties", "variable_property", "@67",
-  "array_method_dereference", "method", "@68", "method_or_not",
+  "r_variable", "w_variable", "rw_variable", "variable", "$@65", "$@66",
+  "variable_properties", "variable_property", "$@67",
+  "array_method_dereference", "method", "$@68", "method_or_not",
   "variable_without_objects", "static_member", "variable_class_name",
-  "array_function_dereference", "@69", "base_variable_with_function_calls",
-  "base_variable", "reference_variable", "compound_variable", "dim_offset",
-  "object_property", "@70", "object_dim_list", "variable_name",
+  "array_function_dereference", "$@69",
+  "base_variable_with_function_calls", "base_variable",
+  "reference_variable", "compound_variable", "dim_offset",
+  "object_property", "$@70", "object_dim_list", "variable_name",
   "simple_indirect_reference", "assignment_list",
-  "assignment_list_element", "@71", "array_pair_list",
-  "non_empty_array_pair_list", "encaps_list", "encaps_var", "@72",
+  "assignment_list_element", "$@71", "array_pair_list",
+  "non_empty_array_pair_list", "encaps_list", "encaps_var", "$@72",
   "encaps_var_offset", "internal_functions_in_yacc", "isset_variables",
-  "@73", "class_constant", 0
+  "$@73", "class_constant", 0
 };
 #endif
 
@@ -2767,7 +2773,7 @@ while (YYID (0))
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
 	      (Loc).first_line, (Loc).first_column,	\
@@ -2878,17 +2884,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
@@ -2922,11 +2931,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");
     }
 }
 
@@ -3206,10 +3215,8 @@ yydestruct (yymsg, yytype, yyvaluep)
 	break;
     }
 }
-
 
 /* Prevent warnings from -Wmissing-prototypes.  */
-
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
@@ -3228,10 +3235,9 @@ int yyparse ();
 
 
 
-
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -3255,74 +3261,75 @@ yyparse ()
 #endif
 #endif
 {
-  /* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
-/* Number of syntax errors so far.  */
-int yynerrs;
+    /* Number of syntax errors so far.  */
+    int yynerrs;
 
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
 
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
 
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
 
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;
 
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
-
   yyssp = yyss;
   yyvsp = yyvs;
 
@@ -3352,7 +3359,6 @@ int yynerrs;
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
-
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -3360,7 +3366,6 @@ int yynerrs;
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -3383,9 +3388,8 @@ int yynerrs;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -3396,7 +3400,6 @@ int yynerrs;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -3406,6 +3409,9 @@ int yynerrs;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -3414,16 +3420,16 @@ int yynerrs;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -3455,20 +3461,16 @@ yybackup:
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
   *++yyvsp = yylval;
@@ -5790,7 +5792,6 @@ yyreduce:
     break;
 
 
-/* Line 1267 of yacc.c.  */
 
       default: break;
     }
@@ -5802,7 +5803,6 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -5867,7 +5867,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -5884,7 +5884,7 @@ yyerrlab:
 	}
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -5941,9 +5941,6 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   *++yyvsp = yylval;
 
 
@@ -5968,7 +5965,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -5979,7 +5976,7 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
+  if (yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
diff --git a/Zend/zend_language_parser.h b/Zend/zend_language_parser.h
index 152ff00e7..b16a2dc8c 100644
--- a/Zend/zend_language_parser.h
+++ b/Zend/zend_language_parser.h
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +28,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -304,10 +304,11 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
+
diff --git a/Zend/zend_language_parser.output b/Zend/zend_language_parser.output
index a67c1a458..79b9680dd 100644
--- a/Zend/zend_language_parser.output
+++ b/Zend/zend_language_parser.output
@@ -1,4 +1,4 @@
-Terminals which are not used
+Terminals unused in grammar
 
    T_CHARACTER
    T_BAD_CHARACTER
@@ -20,9 +20,9 @@ Grammar
 
     1 start: top_statement_list
 
-    2 @1: /* empty */
+    2 $@1: /* empty */
 
-    3 top_statement_list: top_statement_list @1 top_statement
+    3 top_statement_list: top_statement_list $@1 top_statement
     4                   | /* empty */
 
     5 namespace_name: "identifier (T_STRING)"
@@ -34,13 +34,13 @@ Grammar
    10              | "__halt_compiler (T_HALT_COMPILER)" '(' ')' ';'
    11              | "namespace (T_NAMESPACE)" namespace_name ';'
 
-   12 @2: /* empty */
+   12 $@2: /* empty */
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 top_statement_list '}'
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 top_statement_list '}'
 
-   14 @3: /* empty */
+   14 $@3: /* empty */
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 top_statement_list '}'
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 top_statement_list '}'
    16              | "use (T_USE)" use_declarations ';'
    17              | constant_declaration ';'
 
@@ -55,9 +55,9 @@ Grammar
    24 constant_declaration: constant_declaration ',' "identifier (T_STRING)" '=' static_scalar
    25                     | "const (T_CONST)" "identifier (T_STRING)" '=' static_scalar
 
-   26 @4: /* empty */
+   26 $@4: /* empty */
 
-   27 inner_statement_list: inner_statement_list @4 inner_statement
+   27 inner_statement_list: inner_statement_list $@4 inner_statement
    28                     | /* empty */
 
    29 inner_statement: statement
@@ -70,41 +70,41 @@ Grammar
 
    35 unticked_statement: '{' inner_statement_list '}'
 
-   36 @5: /* empty */
+   36 $@5: /* empty */
 
-   37 @6: /* empty */
+   37 $@6: /* empty */
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 elseif_list else_single
 
-   39 @7: /* empty */
+   39 $@7: /* empty */
 
-   40 @8: /* empty */
+   40 $@8: /* empty */
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
-   42 @9: /* empty */
+   42 $@9: /* empty */
 
-   43 @10: /* empty */
+   43 $@10: /* empty */
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' $@10 while_statement
 
-   45 @11: /* empty */
+   45 $@11: /* empty */
 
-   46 @12: /* empty */
+   46 $@12: /* empty */
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr ')' ';'
 
-   48 @13: /* empty */
+   48 $@13: /* empty */
 
-   49 @14: /* empty */
+   49 $@14: /* empty */
 
-   50 @15: /* empty */
+   50 $@15: /* empty */
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
-   52 @16: /* empty */
+   52 $@16: /* empty */
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' $@16 switch_case_list
    54                   | "break (T_BREAK)" ';'
    55                   | "break (T_BREAK)" expr ';'
    56                   | "continue (T_CONTINUE)" ';'
@@ -119,34 +119,34 @@ Grammar
    65                   | expr ';'
    66                   | "unset (T_UNSET)" '(' unset_variables ')' ';'
 
-   67 @17: /* empty */
+   67 $@17: /* empty */
 
-   68 @18: /* empty */
+   68 $@18: /* empty */
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
 
-   70 @19: /* empty */
+   70 $@19: /* empty */
 
-   71 @20: /* empty */
+   71 $@20: /* empty */
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
-   73 @21: /* empty */
+   73 $@21: /* empty */
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list ')' declare_statement
    75                   | ';'
 
-   76 @22: /* empty */
+   76 $@22: /* empty */
 
-   77 @23: /* empty */
+   77 $@23: /* empty */
 
-   78 @24: /* empty */
+   78 $@24: /* empty */
 
-   79 @25: /* empty */
+   79 $@25: /* empty */
 
-   80 @26: /* empty */
+   80 $@26: /* empty */
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
    82                   | "throw (T_THROW)" expr ';'
    83                   | "goto (T_GOTO)" "identifier (T_STRING)" ';'
 
@@ -158,9 +158,9 @@ Grammar
 
    88 @27: /* empty */
 
-   89 @28: /* empty */
+   89 $@28: /* empty */
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
    91 unset_variables: unset_variable
    92                | unset_variables ',' unset_variable
@@ -174,17 +174,17 @@ Grammar
    96 is_reference: /* empty */
    97             | '&'
 
-   98 @29: /* empty */
+   98 $@29: /* empty */
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}'
 
-  100 @30: /* empty */
+  100 $@30: /* empty */
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list '}'
 
-  102 @31: /* empty */
+  102 $@31: /* empty */
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list '}'
 
   104 class_entry_type: "class (T_CLASS)"
   105                 | "abstract (T_ABSTRACT)" "class (T_CLASS)"
@@ -230,13 +230,13 @@ Grammar
 
   133 case_list: /* empty */
 
-  134 @32: /* empty */
+  134 $@32: /* empty */
 
-  135 case_list: case_list "case (T_CASE)" expr case_separator @32 inner_statement_list
+  135 case_list: case_list "case (T_CASE)" expr case_separator $@32 inner_statement_list
 
-  136 @33: /* empty */
+  136 $@33: /* empty */
 
-  137 case_list: case_list "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
   138 case_separator: ':'
   139               | ';'
@@ -246,15 +246,15 @@ Grammar
 
   142 elseif_list: /* empty */
 
-  143 @34: /* empty */
+  143 $@34: /* empty */
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' $@34 statement
 
   145 new_elseif_list: /* empty */
 
-  146 @35: /* empty */
+  146 $@35: /* empty */
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 inner_statement_list
 
   148 else_single: /* empty */
   149            | "else (T_ELSE)" statement
@@ -304,15 +304,15 @@ Grammar
   183 class_statement_list: class_statement_list class_statement
   184                     | /* empty */
 
-  185 @36: /* empty */
+  185 $@36: /* empty */
 
-  186 class_statement: variable_modifiers @36 class_variable_declaration ';'
+  186 class_statement: variable_modifiers $@36 class_variable_declaration ';'
   187                | class_constant_declaration ';'
   188                | trait_use_statement
 
-  189 @37: /* empty */
+  189 $@37: /* empty */
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
   191 trait_use_statement: "use (T_USE)" trait_list trait_adaptations
 
@@ -380,9 +380,9 @@ Grammar
   234 for_expr: /* empty */
   235         | non_empty_for_expr
 
-  236 @38: /* empty */
+  236 $@38: /* empty */
 
-  237 non_empty_for_expr: non_empty_for_expr ',' @38 expr
+  237 non_empty_for_expr: non_empty_for_expr ',' $@38 expr
   238                   | expr
 
   239 chaining_method_or_property: chaining_method_or_property variable_property
@@ -391,31 +391,31 @@ Grammar
   241 chaining_dereference: chaining_dereference '[' dim_offset ']'
   242                     | '[' dim_offset ']'
 
-  243 @39: /* empty */
+  243 $@39: /* empty */
 
-  244 chaining_instance_call: chaining_dereference @39 chaining_method_or_property
+  244 chaining_instance_call: chaining_dereference $@39 chaining_method_or_property
   245                       | chaining_dereference
   246                       | chaining_method_or_property
 
   247 instance_call: /* empty */
 
-  248 @40: /* empty */
+  248 $@40: /* empty */
 
-  249 instance_call: @40 chaining_instance_call
+  249 instance_call: $@40 chaining_instance_call
 
-  250 @41: /* empty */
+  250 $@41: /* empty */
 
-  251 new_expr: "new (T_NEW)" class_name_reference @41 ctor_arguments
+  251 new_expr: "new (T_NEW)" class_name_reference $@41 ctor_arguments
 
-  252 @42: /* empty */
+  252 $@42: /* empty */
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' '=' expr
   254                      | variable '=' expr
   255                      | variable '=' '&' variable
 
-  256 @43: /* empty */
+  256 $@43: /* empty */
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   258                      | "clone (T_CLONE)" expr
   259                      | variable "+= (T_PLUS_EQUAL)" expr
   260                      | variable "-= (T_MINUS_EQUAL)" expr
@@ -433,21 +433,21 @@ Grammar
   272                      | rw_variable "-- (T_DEC)"
   273                      | "-- (T_DEC)" rw_variable
 
-  274 @44: /* empty */
+  274 $@44: /* empty */
 
-  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" @44 expr
+  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" $@44 expr
 
-  276 @45: /* empty */
+  276 $@45: /* empty */
 
-  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" @45 expr
+  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" $@45 expr
 
-  278 @46: /* empty */
+  278 $@46: /* empty */
 
-  279 expr_without_variable: expr "or (T_LOGICAL_OR)" @46 expr
+  279 expr_without_variable: expr "or (T_LOGICAL_OR)" $@46 expr
 
-  280 @47: /* empty */
+  280 $@47: /* empty */
 
-  281 expr_without_variable: expr "and (T_LOGICAL_AND)" @47 expr
+  281 expr_without_variable: expr "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr "xor (T_LOGICAL_XOR)" expr
   283                      | expr '|' expr
   284                      | expr '&' expr
@@ -480,15 +480,15 @@ Grammar
 
   310 expr_without_variable: '(' new_expr ')' @48 instance_call
 
-  311 @49: /* empty */
+  311 $@49: /* empty */
 
-  312 @50: /* empty */
+  312 $@50: /* empty */
 
-  313 expr_without_variable: expr '?' @49 expr ':' @50 expr
+  313 expr_without_variable: expr '?' $@49 expr ':' $@50 expr
 
-  314 @51: /* empty */
+  314 $@51: /* empty */
 
-  315 expr_without_variable: expr '?' ':' @51 expr
+  315 expr_without_variable: expr '?' ':' $@51 expr
   316                      | internal_functions_in_yacc
   317                      | "(int) (T_INT_CAST)" expr
   318                      | "(double) (T_DOUBLE_CAST)" expr
@@ -499,9 +499,9 @@ Grammar
   323                      | "(unset) (T_UNSET_CAST)" expr
   324                      | "exit (T_EXIT)" exit_expr
 
-  325 @52: /* empty */
+  325 $@52: /* empty */
 
-  326 expr_without_variable: '@' @52 expr
+  326 expr_without_variable: '@' $@52 expr
   327                      | scalar
   328                      | "array (T_ARRAY)" '(' array_pair_list ')'
   329                      | '[' array_pair_list ']'
@@ -526,37 +526,37 @@ Grammar
   341                 | "variable (T_VARIABLE)"
   342                 | '&' "variable (T_VARIABLE)"
 
-  343 @55: /* empty */
+  343 $@55: /* empty */
 
-  344 function_call: namespace_name '(' @55 function_call_parameter_list ')'
+  344 function_call: namespace_name '(' $@55 function_call_parameter_list ')'
 
-  345 @56: /* empty */
+  345 $@56: /* empty */
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
 
-  347 @57: /* empty */
+  347 $@57: /* empty */
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 function_call_parameter_list ')'
 
-  349 @58: /* empty */
+  349 $@58: /* empty */
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')'
 
-  351 @59: /* empty */
+  351 $@59: /* empty */
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')'
 
-  353 @60: /* empty */
+  353 $@60: /* empty */
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')'
 
-  355 @61: /* empty */
+  355 $@61: /* empty */
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')'
 
-  357 @62: /* empty */
+  357 $@62: /* empty */
 
-  358 function_call: variable_without_objects '(' @62 function_call_parameter_list ')'
+  358 function_call: variable_without_objects '(' $@62 function_call_parameter_list ')'
 
   359 class_name: "static (T_STATIC)"
   360           | namespace_name
@@ -570,11 +570,11 @@ Grammar
   366 class_name_reference: class_name
   367                     | dynamic_class_name_reference
 
-  368 @63: /* empty */
+  368 $@63: /* empty */
 
-  369 @64: /* empty */
+  369 $@64: /* empty */
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 dynamic_class_name_variable_properties
   371                             | base_variable
 
   372 dynamic_class_name_variable_properties: dynamic_class_name_variable_properties dynamic_class_name_variable_property
@@ -649,26 +649,26 @@ Grammar
 
   427 rw_variable: variable
 
-  428 @65: /* empty */
+  428 $@65: /* empty */
 
-  429 @66: /* empty */
+  429 $@66: /* empty */
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not variable_properties
   431         | base_variable_with_function_calls
 
   432 variable_properties: variable_properties variable_property
   433                    | /* empty */
 
-  434 @67: /* empty */
+  434 $@67: /* empty */
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property @67 method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property $@67 method_or_not
 
   436 array_method_dereference: array_method_dereference '[' dim_offset ']'
   437                         | method '[' dim_offset ']'
 
-  438 @68: /* empty */
+  438 $@68: /* empty */
 
-  439 method: '(' @68 function_call_parameter_list ')'
+  439 method: '(' $@68 function_call_parameter_list ')'
 
   440 method_or_not: method
   441              | array_method_dereference
@@ -684,9 +684,9 @@ Grammar
 
   448 array_function_dereference: array_function_dereference '[' dim_offset ']'
 
-  449 @69: /* empty */
+  449 $@69: /* empty */
 
-  450 array_function_dereference: function_call @69 '[' dim_offset ']'
+  450 array_function_dereference: function_call $@69 '[' dim_offset ']'
 
   451 base_variable_with_function_calls: base_variable
   452                                  | array_function_dereference
@@ -708,9 +708,9 @@ Grammar
 
   464 object_property: object_dim_list
 
-  465 @70: /* empty */
+  465 $@70: /* empty */
 
-  466 object_property: variable_without_objects @70
+  466 object_property: variable_without_objects $@70
 
   467 object_dim_list: object_dim_list '[' dim_offset ']'
   468                | object_dim_list '{' expr '}'
@@ -727,9 +727,9 @@ Grammar
 
   476 assignment_list_element: variable
 
-  477 @71: /* empty */
+  477 $@71: /* empty */
 
-  478 assignment_list_element: "list (T_LIST)" '(' @71 assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 assignment_list ')'
   479                        | /* empty */
 
   480 array_pair_list: /* empty */
@@ -751,9 +751,9 @@ Grammar
 
   494 encaps_var: "variable (T_VARIABLE)"
 
-  495 @72: /* empty */
+  495 $@72: /* empty */
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 encaps_var_offset ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 encaps_var_offset ']'
   497           | "variable (T_VARIABLE)" "-> (T_OBJECT_OPERATOR)" "identifier (T_STRING)"
   498           | "${ (T_DOLLAR_OPEN_CURLY_BRACES)" expr '}'
   499           | "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' expr ']' '}'
@@ -773,9 +773,9 @@ Grammar
 
   511 isset_variables: variable
 
-  512 @73: /* empty */
+  512 $@73: /* empty */
 
-  513 isset_variables: isset_variables ',' @73 variable
+  513 isset_variables: isset_variables ',' $@73 variable
 
   514 class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
   515               | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
@@ -883,8 +883,8 @@ error (256)
 T_INLINE_HTML (311) 64
 T_CHARACTER (312)
 T_BAD_CHARACTER (313)
-"quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)"
-    (314) 379 393 491 493
+"quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" (314) 379
+    393 491 493
 "quoted-string (T_CONSTANT_ENCAPSED_STRING)" (315) 385
 "echo (T_ECHO)" (316) 63
 "do (T_DO)" (317) 47
@@ -967,16 +967,16 @@ start (159)
     on left: 1, on right: 0
 top_statement_list (160)
     on left: 3 4, on right: 1 3 13 15
-@1 (161)
+$@1 (161)
     on left: 2, on right: 3
 namespace_name (162)
     on left: 5 6, on right: 6 11 13 20 21 22 23 344 346 348 360 361
     362 363 364 365 396 397 398 408 409 410
 top_statement (163)
     on left: 7 8 9 10 11 13 15 16 17, on right: 3
-@2 (164)
+$@2 (164)
     on left: 12, on right: 13
-@3 (165)
+$@3 (165)
     on left: 14, on right: 15
 use_declarations (166)
     on left: 18 19, on right: 16 18
@@ -987,7 +987,7 @@ constant_declaration (168)
 inner_statement_list (169)
     on left: 27 28, on right: 27 35 41 81 90 99 122 124 126 135 137
     141 147 151 213 333 335
-@4 (170)
+$@4 (170)
     on left: 26, on right: 27
 inner_statement (171)
     on left: 29 30 31 32, on right: 27
@@ -996,49 +996,49 @@ statement (172)
 unticked_statement (173)
     on left: 35 38 41 44 47 51 53 54 55 56 57 58 59 60 61 62 63 64
     65 66 69 72 74 75 81 82 83, on right: 33
-@5 (174)
+$@5 (174)
     on left: 36, on right: 38
-@6 (175)
+$@6 (175)
     on left: 37, on right: 38
-@7 (176)
+$@7 (176)
     on left: 39, on right: 41
-@8 (177)
+$@8 (177)
     on left: 40, on right: 41
-@9 (178)
+$@9 (178)
     on left: 42, on right: 44
-@10 (179)
+$@10 (179)
     on left: 43, on right: 44
-@11 (180)
+$@11 (180)
     on left: 45, on right: 47
-@12 (181)
+$@12 (181)
     on left: 46, on right: 47
-@13 (182)
+$@13 (182)
     on left: 48, on right: 51
-@14 (183)
+$@14 (183)
     on left: 49, on right: 51
-@15 (184)
+$@15 (184)
     on left: 50, on right: 51
-@16 (185)
+$@16 (185)
     on left: 52, on right: 53
-@17 (186)
+$@17 (186)
     on left: 67, on right: 69
-@18 (187)
+$@18 (187)
     on left: 68, on right: 69
-@19 (188)
+$@19 (188)
     on left: 70, on right: 72
-@20 (189)
+$@20 (189)
     on left: 71, on right: 72
-@21 (190)
+$@21 (190)
     on left: 73, on right: 74
-@22 (191)
+$@22 (191)
     on left: 76, on right: 81
-@23 (192)
+$@23 (192)
     on left: 77, on right: 81
-@24 (193)
+$@24 (193)
     on left: 78, on right: 81
-@25 (194)
+$@25 (194)
     on left: 79, on right: 81
-@26 (195)
+$@26 (195)
     on left: 80, on right: 81
 additional_catches (196)
     on left: 84 85, on right: 81
@@ -1048,7 +1048,7 @@ additional_catch (198)
     on left: 90, on right: 86 87
 @27 (199)
     on left: 88, on right: 90
-@28 (200)
+$@28 (200)
     on left: 89, on right: 90
 unset_variables (201)
     on left: 91 92, on right: 66 92
@@ -1062,13 +1062,13 @@ is_reference (205)
     on left: 96 97, on right: 99 190 333 335
 unticked_function_declaration_statement (206)
     on left: 99, on right: 94
-@29 (207)
+$@29 (207)
     on left: 98, on right: 99
 unticked_class_declaration_statement (208)
     on left: 101 103, on right: 95
-@30 (209)
+$@30 (209)
     on left: 100, on right: 101
-@31 (210)
+$@31 (210)
     on left: 102, on right: 103
 class_entry_type (211)
     on left: 104 105 106 107, on right: 101
@@ -1098,9 +1098,9 @@ switch_case_list (223)
     on left: 129 130 131 132, on right: 53
 case_list (224)
     on left: 133 135 137, on right: 129 130 131 132 135 137
-@32 (225)
+$@32 (225)
     on left: 134, on right: 135
-@33 (226)
+$@33 (226)
     on left: 136, on right: 137
 case_separator (227)
     on left: 138 139, on right: 135 137
@@ -1108,11 +1108,11 @@ while_statement (228)
     on left: 140 141, on right: 44
 elseif_list (229)
     on left: 142 144, on right: 38 144
-@34 (230)
+$@34 (230)
     on left: 143, on right: 144
 new_elseif_list (231)
     on left: 145 147, on right: 41 147
-@35 (232)
+$@35 (232)
     on left: 146, on right: 147
 else_single (233)
     on left: 148 149, on right: 38
@@ -1141,9 +1141,9 @@ class_statement_list (243)
     on left: 183 184, on right: 101 103 183
 class_statement (244)
     on left: 186 187 188 190, on right: 183
-@36 (245)
+$@36 (245)
     on left: 185, on right: 186
-@37 (246)
+$@37 (246)
     on left: 189, on right: 190
 trait_use_statement (247)
     on left: 191, on right: 188
@@ -1189,7 +1189,7 @@ for_expr (267)
     on left: 234 235, on right: 51
 non_empty_for_expr (268)
     on left: 237 238, on right: 235 237
-@38 (269)
+$@38 (269)
     on left: 236, on right: 237
 chaining_method_or_property (270)
     on left: 239 240, on right: 239 244 246
@@ -1197,15 +1197,15 @@ chaining_dereference (271)
     on left: 241 242, on right: 241 244 245
 chaining_instance_call (272)
     on left: 244 245 246, on right: 249
-@39 (273)
+$@39 (273)
     on left: 243, on right: 244
 instance_call (274)
     on left: 247 249, on right: 310
-@40 (275)
+$@40 (275)
     on left: 248, on right: 249
 new_expr (276)
     on left: 251, on right: 308 310
-@41 (277)
+$@41 (277)
     on left: 250, on right: 251
 expr_without_variable (278)
     on left: 253 254 255 257 258 259 260 261 262 263 264 265 266 267
@@ -1213,27 +1213,27 @@ expr_without_variable (278)
     288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303
     304 305 306 307 308 310 313 315 316 317 318 319 320 321 322 323
     324 326 327 328 329 330 331 333 335, on right: 59 72 168 171 424
-@42 (279)
+$@42 (279)
     on left: 252, on right: 253
-@43 (280)
+$@43 (280)
     on left: 256, on right: 257
-@44 (281)
+$@44 (281)
     on left: 274, on right: 275
-@45 (282)
+$@45 (282)
     on left: 276, on right: 277
-@46 (283)
+$@46 (283)
     on left: 278, on right: 279
-@47 (284)
+$@47 (284)
     on left: 280, on right: 281
 @48 (285)
     on left: 309, on right: 310
-@49 (286)
+$@49 (286)
     on left: 311, on right: 313
-@50 (287)
+$@50 (287)
     on left: 312, on right: 313
-@51 (288)
+$@51 (288)
     on left: 314, on right: 315
-@52 (289)
+$@52 (289)
     on left: 325, on right: 326
 @53 (290)
     on left: 332, on right: 333
@@ -1247,21 +1247,21 @@ lexical_var_list (294)
     on left: 339 340 341 342, on right: 338 339 340
 function_call (295)
     on left: 344 346 348 350 352 354 356 358, on right: 450 453
-@55 (296)
+$@55 (296)
     on left: 343, on right: 344
-@56 (297)
+$@56 (297)
     on left: 345, on right: 346
-@57 (298)
+$@57 (298)
     on left: 347, on right: 348
-@58 (299)
+$@58 (299)
     on left: 349, on right: 350
-@59 (300)
+$@59 (300)
     on left: 351, on right: 352
-@60 (301)
+$@60 (301)
     on left: 353, on right: 354
-@61 (302)
+$@61 (302)
     on left: 355, on right: 356
-@62 (303)
+$@62 (303)
     on left: 357, on right: 358
 class_name (304)
     on left: 359 360 361 362, on right: 350 352 366 405 445 514
@@ -1272,9 +1272,9 @@ class_name_reference (306)
     on left: 366 367, on right: 251 257 306
 dynamic_class_name_reference (307)
     on left: 370 371, on right: 367
-@63 (308)
+$@63 (308)
     on left: 368, on right: 370
-@64 (309)
+$@64 (309)
     on left: 369, on right: 370
 dynamic_class_name_variable_properties (310)
     on left: 372 373, on right: 370 372
@@ -1287,12 +1287,12 @@ backticks_expr (313)
 ctor_arguments (314)
     on left: 381 382, on right: 251 257
 common_scalar (315)
-    on left: 383 384 385 386 387 388 389 390 391 392 393 394,
-    on right: 395 411
+    on left: 383 384 385 386 387 388 389 390 391 392 393 394, on right:
+    395 411
 static_scalar (316)
-    on left: 395 396 397 398 399 400 401 402 403 404,
-    on right: 24 25 127 128 156 157 160 161 180 182 227 229 230 231
-    399 400 419 420 421 422
+    on left: 395 396 397 398 399 400 401 402 403 404, on right: 24
+    25 127 128 156 157 160 161 180 182 227 229 230 231 399 400 419
+    420 421 422
 static_class_constant (317)
     on left: 405, on right: 403
 scalar (318)
@@ -1320,21 +1320,21 @@ variable (326)
     on left: 430 431, on right: 60 69 72 93 119 120 169 172 254 255
     257 259 260 261 262 263 264 265 266 267 268 269 425 426 427 476
     500 505 511 513
-@65 (327)
+$@65 (327)
     on left: 428, on right: 430
-@66 (328)
+$@66 (328)
     on left: 429, on right: 430
 variable_properties (329)
     on left: 432 433, on right: 430 432
 variable_property (330)
     on left: 435, on right: 239 240 432
-@67 (331)
+$@67 (331)
     on left: 434, on right: 435
 array_method_dereference (332)
     on left: 436 437, on right: 436 441
 method (333)
     on left: 439, on right: 437 440
-@68 (334)
+$@68 (334)
     on left: 438, on right: 439
 method_or_not (335)
     on left: 440 441 442, on right: 430 435
@@ -1346,7 +1346,7 @@ variable_class_name (338)
     on left: 447, on right: 354 356 446 515
 array_function_dereference (339)
     on left: 448 450, on right: 448 452
-@69 (340)
+$@69 (340)
     on left: 449, on right: 450
 base_variable_with_function_calls (341)
     on left: 451 452 453, on right: 430 431
@@ -1360,7 +1360,7 @@ dim_offset (345)
     on left: 462 463, on right: 241 242 436 437 448 450 457 467
 object_property (346)
     on left: 464 466, on right: 370 374 430 435
-@70 (347)
+$@70 (347)
     on left: 465, on right: 466
 object_dim_list (348)
     on left: 467 468 469, on right: 464 467 468
@@ -1372,7 +1372,7 @@ assignment_list (351)
     on left: 474 475, on right: 253 474 478
 assignment_list_element (352)
     on left: 476 478 479, on right: 474 475
-@71 (353)
+$@71 (353)
     on left: 477, on right: 478
 array_pair_list (354)
     on left: 480 481, on right: 328 329
@@ -1383,7 +1383,7 @@ encaps_list (356)
     on left: 490 491 492 493, on right: 380 412 413 490 491
 encaps_var (357)
     on left: 494 496 497 498 499 500, on right: 490 492 493
-@72 (358)
+$@72 (358)
     on left: 495, on right: 496
 encaps_var_offset (359)
     on left: 501 502 503, on right: 496
@@ -1391,7 +1391,7 @@ internal_functions_in_yacc (360)
     on left: 504 505 506 507 508 509 510, on right: 316
 isset_variables (361)
     on left: 511 513, on right: 504 513
-@73 (362)
+$@73 (362)
     on left: 512, on right: 513
 class_constant (363)
     on left: 514 515, on right: 407
@@ -1417,12 +1417,12 @@ state 1
 state 2
 
     1 start: top_statement_list .
-    3 top_statement_list: top_statement_list . @1 top_statement
+    3 top_statement_list: top_statement_list . $@1 top_statement
 
     "end of file"  reduce using rule 1 (start)
-    $default       reduce using rule 2 (@1)
+    $default       reduce using rule 2 ($@1)
 
-    @1  go to state 4
+    $@1  go to state 4
 
 
 state 3
@@ -1434,7 +1434,7 @@ state 3
 
 state 4
 
-    3 top_statement_list: top_statement_list @1 . top_statement
+    3 top_statement_list: top_statement_list $@1 . top_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -2288,11 +2288,11 @@ state 14
 
 state 15
 
-  326 expr_without_variable: '@' . @52 expr
+  326 expr_without_variable: '@' . $@52 expr
 
-    $default  reduce using rule 325 (@52)
+    $default  reduce using rule 325 ($@52)
 
-    @52  go to state 130
+    $@52  go to state 130
 
 
 state 16
@@ -3085,7 +3085,7 @@ state 26
 
 state 27
 
-  251 new_expr: "new (T_NEW)" . class_name_reference @41 ctor_arguments
+  251 new_expr: "new (T_NEW)" . class_name_reference $@41 ctor_arguments
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -3119,8 +3119,8 @@ state 28
 
 state 29
 
-   38 unticked_statement: "if (T_IF)" . '(' expr ')' @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" . '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   38 unticked_statement: "if (T_IF)" . '(' expr ')' $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" . '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     '('  shift, and go to state 164
 
@@ -3261,47 +3261,47 @@ state 37
 
 state 38
 
-   47 unticked_statement: "do (T_DO)" . @11 statement "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" . $@11 statement "while (T_WHILE)" '(' $@12 expr ')' ';'
 
-    $default  reduce using rule 45 (@11)
+    $default  reduce using rule 45 ($@11)
 
-    @11  go to state 168
+    $@11  go to state 168
 
 
 state 39
 
-   44 unticked_statement: "while (T_WHILE)" . '(' @9 expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" . '(' $@9 expr ')' $@10 while_statement
 
     '('  shift, and go to state 169
 
 
 state 40
 
-   51 unticked_statement: "for (T_FOR)" . '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" . '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     '('  shift, and go to state 170
 
 
 state 41
 
-   69 unticked_statement: "foreach (T_FOREACH)" . '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
-   72                   | "foreach (T_FOREACH)" . '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" . '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
+   72                   | "foreach (T_FOREACH)" . '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
     '('  shift, and go to state 171
 
 
 state 42
 
-   74 unticked_statement: "declare (T_DECLARE)" . @21 '(' declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" . $@21 '(' declare_list ')' declare_statement
 
-    $default  reduce using rule 73 (@21)
+    $default  reduce using rule 73 ($@21)
 
-    @21  go to state 172
+    $@21  go to state 172
 
 
 state 43
 
-   53 unticked_statement: "switch (T_SWITCH)" . '(' expr ')' @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" . '(' expr ')' $@16 switch_case_list
 
     '('  shift, and go to state 173
 
@@ -3579,11 +3579,11 @@ state 49
 
 state 50
 
-   81 unticked_statement: "try (T_TRY)" . @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" . $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 76 (@22)
+    $default  reduce using rule 76 ($@22)
 
-    @22  go to state 184
+    $@22  go to state 184
 
 
 state 51
@@ -3770,7 +3770,7 @@ state 63
 
 state 64
 
-  253 expr_without_variable: "list (T_LIST)" . '(' @42 assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" . '(' $@42 assignment_list ')' '=' expr
 
     '('  shift, and go to state 203
 
@@ -3843,9 +3843,9 @@ state 72
 state 73
 
    11 top_statement: "namespace (T_NAMESPACE)" . namespace_name ';'
-   13              | "namespace (T_NAMESPACE)" . namespace_name '{' @2 top_statement_list '}'
-   15              | "namespace (T_NAMESPACE)" . '{' @3 top_statement_list '}'
-  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+   13              | "namespace (T_NAMESPACE)" . namespace_name '{' $@2 top_statement_list '}'
+   15              | "namespace (T_NAMESPACE)" . '{' $@3 top_statement_list '}'
+  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
   409 scalar: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
@@ -3872,7 +3872,7 @@ state 75
 
 state 76
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
   410 scalar: "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -4021,7 +4021,7 @@ state 82
 state 83
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  344 function_call: namespace_name . '(' @55 function_call_parameter_list ')'
+  344 function_call: namespace_name . '(' $@55 function_call_parameter_list ')'
   360 class_name: namespace_name .
   408 scalar: namespace_name .
 
@@ -4034,7 +4034,7 @@ state 83
 
 state 84
 
-    3 top_statement_list: top_statement_list @1 top_statement .
+    3 top_statement_list: top_statement_list $@1 top_statement .
 
     $default  reduce using rule 3 (top_statement_list)
 
@@ -4092,14 +4092,14 @@ state 91
 
 state 92
 
-  101 unticked_class_declaration_statement: class_entry_type . "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type . "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list '}'
 
     "identifier (T_STRING)"  shift, and go to state 229
 
 
 state 93
 
-  103 unticked_class_declaration_statement: interface_entry . "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry . "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list '}'
 
     "identifier (T_STRING)"  shift, and go to state 230
 
@@ -4120,7 +4120,7 @@ state 95
 
 state 96
 
-   99 unticked_function_declaration_statement: function . is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function . is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}'
   333 expr_without_variable: function . is_reference '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
     '&'  shift, and go to state 231
@@ -4132,19 +4132,19 @@ state 96
 
 state 97
 
-  450 array_function_dereference: function_call . @69 '[' dim_offset ']'
+  450 array_function_dereference: function_call . $@69 '[' dim_offset ']'
   453 base_variable_with_function_calls: function_call .
 
-    '['       reduce using rule 449 (@69)
+    '['       reduce using rule 449 ($@69)
     $default  reduce using rule 453 (base_variable_with_function_calls)
 
-    @69  go to state 233
+    $@69  go to state 233
 
 
 state 98
 
-  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
   514 class_constant: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
 
@@ -4168,10 +4168,10 @@ state 100
 state 101
 
    65 unticked_statement: expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4193,8 +4193,8 @@ state 101
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -4245,7 +4245,7 @@ state 104
 
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -4280,7 +4280,7 @@ state 104
 
 state 105
 
-  358 function_call: variable_without_objects . '(' @62 function_call_parameter_list ')'
+  358 function_call: variable_without_objects . '(' $@62 function_call_parameter_list ')'
 
     '('  shift, and go to state 276
 
@@ -4294,8 +4294,8 @@ state 106
 
 state 107
 
-  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
   515 class_constant: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
 
@@ -4314,7 +4314,7 @@ state 108
 
 state 109
 
-  430 variable: base_variable_with_function_calls . "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls . "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not variable_properties
   431         | base_variable_with_function_calls .
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 279
@@ -4400,7 +4400,7 @@ state 117
 
 state 118
 
-  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
   409 scalar: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
@@ -4420,10 +4420,10 @@ state 119
 
 state 120
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4445,8 +4445,8 @@ state 120
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   510 internal_functions_in_yacc: "require_once (T_REQUIRE_ONCE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4481,10 +4481,10 @@ state 120
 
 state 121
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4506,8 +4506,8 @@ state 121
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   509 internal_functions_in_yacc: "require (T_REQUIRE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4623,10 +4623,10 @@ state 122
 
 state 123
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4648,8 +4648,8 @@ state 123
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   507 internal_functions_in_yacc: "include_once (T_INCLUDE_ONCE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4684,10 +4684,10 @@ state 123
 
 state 124
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4709,8 +4709,8 @@ state 124
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   506 internal_functions_in_yacc: "include (T_INCLUDE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4745,10 +4745,10 @@ state 124
 
 state 125
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4770,8 +4770,8 @@ state 125
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   331                      | "print (T_PRINT)" expr .
 
     '?'                           shift, and go to state 238
@@ -4803,10 +4803,10 @@ state 125
 
 state 126
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4829,18 +4829,18 @@ state 126
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 294 (expr_without_variable)
 
 
 state 127
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4863,18 +4863,18 @@ state 127
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 295 (expr_without_variable)
 
 
 state 128
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4897,8 +4897,8 @@ state 128
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
@@ -4907,10 +4907,10 @@ state 128
 
 state 129
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4933,15 +4933,15 @@ state 129
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 297 (expr_without_variable)
 
 
 state 130
 
-  326 expr_without_variable: '@' @52 . expr
+  326 expr_without_variable: '@' $@52 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -5022,10 +5022,10 @@ state 130
 
 state 131
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5047,8 +5047,8 @@ state 131
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   323                      | "(unset) (T_UNSET_CAST)" expr .
 
     $default  reduce using rule 323 (expr_without_variable)
@@ -5056,10 +5056,10 @@ state 131
 
 state 132
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5081,8 +5081,8 @@ state 132
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   322                      | "(bool) (T_BOOL_CAST)" expr .
 
     $default  reduce using rule 322 (expr_without_variable)
@@ -5090,10 +5090,10 @@ state 132
 
 state 133
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5115,8 +5115,8 @@ state 133
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   321                      | "(object) (T_OBJECT_CAST)" expr .
 
     $default  reduce using rule 321 (expr_without_variable)
@@ -5124,10 +5124,10 @@ state 133
 
 state 134
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5149,8 +5149,8 @@ state 134
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   320                      | "(array) (T_ARRAY_CAST)" expr .
 
     $default  reduce using rule 320 (expr_without_variable)
@@ -5158,10 +5158,10 @@ state 134
 
 state 135
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5183,8 +5183,8 @@ state 135
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   319                      | "(string) (T_STRING_CAST)" expr .
 
     $default  reduce using rule 319 (expr_without_variable)
@@ -5192,10 +5192,10 @@ state 135
 
 state 136
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5217,8 +5217,8 @@ state 136
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   318                      | "(double) (T_DOUBLE_CAST)" expr .
 
     $default  reduce using rule 318 (expr_without_variable)
@@ -5226,10 +5226,10 @@ state 136
 
 state 137
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5251,8 +5251,8 @@ state 137
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   317                      | "(int) (T_INT_CAST)" expr .
 
     $default  reduce using rule 317 (expr_without_variable)
@@ -5267,7 +5267,7 @@ state 138
 
 state 139
 
-  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 287
@@ -5275,7 +5275,7 @@ state 139
 
 state 140
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
 
     "identifier (T_STRING)"  shift, and go to state 116
@@ -5286,7 +5286,7 @@ state 140
 state 141
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  344 function_call: namespace_name . '(' @55 function_call_parameter_list ')'
+  344 function_call: namespace_name . '(' $@55 function_call_parameter_list ')'
   360 class_name: namespace_name .
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
@@ -5297,8 +5297,8 @@ state 141
 
 state 142
 
-  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 289
@@ -5320,8 +5320,8 @@ state 144
 
 state 145
 
-  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 290
@@ -5363,10 +5363,10 @@ state 147
 
 state 148
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5388,8 +5388,8 @@ state 148
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   484 non_empty_array_pair_list: expr . "=> (T_DOUBLE_ARROW)" expr
   485                          | expr .
   488                          | expr . "=> (T_DOUBLE_ARROW)" '&' w_variable
@@ -5450,10 +5450,10 @@ state 150
 state 151
 
   258 expr_without_variable: "clone (T_CLONE)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5475,8 +5475,8 @@ state 151
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 258 (expr_without_variable)
 
@@ -5519,11 +5519,11 @@ state 155
 
 state 156
 
-  251 new_expr: "new (T_NEW)" class_name_reference . @41 ctor_arguments
+  251 new_expr: "new (T_NEW)" class_name_reference . $@41 ctor_arguments
 
-    $default  reduce using rule 250 (@41)
+    $default  reduce using rule 250 ($@41)
 
-    @41  go to state 300
+    $@41  go to state 300
 
 
 state 157
@@ -5542,7 +5542,7 @@ state 158
 
 state 159
 
-  370 dynamic_class_name_reference: base_variable . "-> (T_OBJECT_OPERATOR)" @63 object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable . "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 dynamic_class_name_variable_properties
   371                             | base_variable .
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 302
@@ -5668,8 +5668,8 @@ state 163
 
 state 164
 
-   38 unticked_statement: "if (T_IF)" '(' . expr ')' @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" '(' . expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   38 unticked_statement: "if (T_IF)" '(' . expr ')' $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" '(' . expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -5767,10 +5767,10 @@ state 166
 state 167
 
   233 echo_expr_list: expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5792,8 +5792,8 @@ state 167
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -5827,7 +5827,7 @@ state 167
 
 state 168
 
-   47 unticked_statement: "do (T_DO)" @11 . statement "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 . statement "while (T_WHILE)" '(' $@12 expr ')' ';'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -5929,16 +5929,16 @@ state 168
 
 state 169
 
-   44 unticked_statement: "while (T_WHILE)" '(' . @9 expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' . $@9 expr ')' $@10 while_statement
 
-    $default  reduce using rule 42 (@9)
+    $default  reduce using rule 42 ($@9)
 
-    @9  go to state 310
+    $@9  go to state 310
 
 
 state 170
 
-   51 unticked_statement: "for (T_FOR)" '(' . for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' . for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -6023,8 +6023,8 @@ state 170
 
 state 171
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' . variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
-   72                   | "foreach (T_FOREACH)" '(' . expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' . variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
+   72                   | "foreach (T_FOREACH)" '(' . expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -6105,14 +6105,14 @@ state 171
 
 state 172
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 . '(' declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 . '(' declare_list ')' declare_statement
 
     '('  shift, and go to state 316
 
 
 state 173
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' . expr ')' @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' . expr ')' $@16 switch_case_list
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -6201,10 +6201,10 @@ state 174
 state 175
 
    55 unticked_statement: "break (T_BREAK)" expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6226,8 +6226,8 @@ state 175
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6268,10 +6268,10 @@ state 176
 state 177
 
    57 unticked_statement: "continue (T_CONTINUE)" expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6293,8 +6293,8 @@ state 177
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6358,10 +6358,10 @@ state 181
 
 state 182
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6383,8 +6383,8 @@ state 182
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6419,7 +6419,7 @@ state 183
    60 unticked_statement: "return (T_RETURN)" variable . ';'
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -6455,7 +6455,7 @@ state 183
 
 state 184
 
-   81 unticked_statement: "try (T_TRY)" @22 . '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 . '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     '{'  shift, and go to state 324
 
@@ -6463,10 +6463,10 @@ state 184
 state 185
 
    82 unticked_statement: "throw (T_THROW)" expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6488,8 +6488,8 @@ state 185
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6745,11 +6745,11 @@ state 202
 
 state 203
 
-  253 expr_without_variable: "list (T_LIST)" '(' . @42 assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' . $@42 assignment_list ')' '=' expr
 
-    $default  reduce using rule 252 (@42)
+    $default  reduce using rule 252 ($@42)
 
-    @42  go to state 346
+    $@42  go to state 346
 
 
 state 204
@@ -6841,7 +6841,7 @@ state 204
 state 205
 
   494 encaps_var: "variable (T_VARIABLE)" .
-  496           | "variable (T_VARIABLE)" . '[' @72 encaps_var_offset ']'
+  496           | "variable (T_VARIABLE)" . '[' $@72 encaps_var_offset ']'
   497           | "variable (T_VARIABLE)" . "-> (T_OBJECT_OPERATOR)" "identifier (T_STRING)"
 
     '['                       shift, and go to state 348
@@ -7002,7 +7002,7 @@ state 211
 
 state 212
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
   409 scalar: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -7013,18 +7013,18 @@ state 212
 
 state 213
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' . @3 top_statement_list '}'
+   15 top_statement: "namespace (T_NAMESPACE)" '{' . $@3 top_statement_list '}'
 
-    $default  reduce using rule 14 (@3)
+    $default  reduce using rule 14 ($@3)
 
-    @3  go to state 359
+    $@3  go to state 359
 
 
 state 214
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
    11 top_statement: "namespace (T_NAMESPACE)" namespace_name . ';'
-   13              | "namespace (T_NAMESPACE)" namespace_name . '{' @2 top_statement_list '}'
+   13              | "namespace (T_NAMESPACE)" namespace_name . '{' $@2 top_statement_list '}'
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
     ';'                    shift, and go to state 360
@@ -7034,7 +7034,7 @@ state 214
 state 215
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
   410 scalar: "\\ (T_NS_SEPARATOR)" namespace_name .
 
@@ -7058,10 +7058,10 @@ state 216
 
 state 217
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -7084,8 +7084,8 @@ state 217
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
   307                      | '(' expr . ')'
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -7118,14 +7118,14 @@ state 217
 
 state 218
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
    35 unticked_statement: '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 365
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 219
@@ -7281,11 +7281,11 @@ state 225
 
 state 226
 
-  344 function_call: namespace_name '(' . @55 function_call_parameter_list ')'
+  344 function_call: namespace_name '(' . $@55 function_call_parameter_list ')'
 
-    $default  reduce using rule 343 (@55)
+    $default  reduce using rule 343 ($@55)
 
-    @55  go to state 371
+    $@55  go to state 371
 
 
 state 227
@@ -7304,7 +7304,7 @@ state 228
 
 state 229
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" . extends_from @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" . extends_from $@30 implements_list '{' class_statement_list '}'
 
     "extends (T_EXTENDS)"  shift, and go to state 373
 
@@ -7315,11 +7315,11 @@ state 229
 
 state 230
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" . @31 interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" . $@31 interface_extends_list '{' class_statement_list '}'
 
-    $default  reduce using rule 102 (@31)
+    $default  reduce using rule 102 ($@31)
 
-    @31  go to state 375
+    $@31  go to state 375
 
 
 state 231
@@ -7331,7 +7331,7 @@ state 231
 
 state 232
 
-   99 unticked_function_declaration_statement: function is_reference . "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference . "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}'
   333 expr_without_variable: function is_reference . '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
     "identifier (T_STRING)"  shift, and go to state 376
@@ -7340,15 +7340,15 @@ state 232
 
 state 233
 
-  450 array_function_dereference: function_call @69 . '[' dim_offset ']'
+  450 array_function_dereference: function_call $@69 . '[' dim_offset ']'
 
     '['  shift, and go to state 378
 
 
 state 234
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
   514 class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . "identifier (T_STRING)"
 
@@ -7366,11 +7366,11 @@ state 234
 
 state 235
 
-  279 expr_without_variable: expr "or (T_LOGICAL_OR)" . @46 expr
+  279 expr_without_variable: expr "or (T_LOGICAL_OR)" . $@46 expr
 
-    $default  reduce using rule 278 (@46)
+    $default  reduce using rule 278 ($@46)
 
-    @46  go to state 385
+    $@46  go to state 385
 
 
 state 236
@@ -7456,41 +7456,41 @@ state 236
 
 state 237
 
-  281 expr_without_variable: expr "and (T_LOGICAL_AND)" . @47 expr
+  281 expr_without_variable: expr "and (T_LOGICAL_AND)" . $@47 expr
 
-    $default  reduce using rule 280 (@47)
+    $default  reduce using rule 280 ($@47)
 
-    @47  go to state 387
+    $@47  go to state 387
 
 
 state 238
 
-  313 expr_without_variable: expr '?' . @49 expr ':' @50 expr
-  315                      | expr '?' . ':' @51 expr
+  313 expr_without_variable: expr '?' . $@49 expr ':' $@50 expr
+  315                      | expr '?' . ':' $@51 expr
 
     ':'  shift, and go to state 388
 
-    $default  reduce using rule 311 (@49)
+    $default  reduce using rule 311 ($@49)
 
-    @49  go to state 389
+    $@49  go to state 389
 
 
 state 239
 
-  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" . @44 expr
+  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" . $@44 expr
 
-    $default  reduce using rule 274 (@44)
+    $default  reduce using rule 274 ($@44)
 
-    @44  go to state 390
+    $@44  go to state 390
 
 
 state 240
 
-  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" . @45 expr
+  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" . $@45 expr
 
-    $default  reduce using rule 276 (@45)
+    $default  reduce using rule 276 ($@45)
 
-    @45  go to state 391
+    $@45  go to state 391
 
 
 state 241
@@ -9080,7 +9080,7 @@ state 264
 
   254 expr_without_variable: variable '=' . expr
   255                      | variable '=' . '&' variable
-  257                      | variable '=' . '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable '=' . '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -10053,17 +10053,17 @@ state 275
 
 state 276
 
-  358 function_call: variable_without_objects '(' . @62 function_call_parameter_list ')'
+  358 function_call: variable_without_objects '(' . $@62 function_call_parameter_list ')'
 
-    $default  reduce using rule 357 (@62)
+    $default  reduce using rule 357 ($@62)
 
-    @62  go to state 425
+    $@62  go to state 425
 
 
 state 277
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
   515 class_constant: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . "identifier (T_STRING)"
 
@@ -10165,11 +10165,11 @@ state 278
 
 state 279
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" . @65 object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" . $@65 object_property $@66 method_or_not variable_properties
 
-    $default  reduce using rule 428 (@65)
+    $default  reduce using rule 428 ($@65)
 
-    @65  go to state 431
+    $@65  go to state 431
 
 
 state 280
@@ -10370,10 +10370,10 @@ state 284
 
 state 285
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10395,8 +10395,8 @@ state 285
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   508 internal_functions_in_yacc: "eval (T_EVAL)" '(' expr . ')'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -10430,10 +10430,10 @@ state 285
 
 state 286
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10455,16 +10455,16 @@ state 286
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
-  326                      | '@' @52 expr .
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
+  326                      | '@' $@52 expr .
 
     $default  reduce using rule 326 (expr_without_variable)
 
 
 state 287
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
 
     "identifier (T_STRING)"  shift, and go to state 116
@@ -10475,7 +10475,7 @@ state 287
 state 288
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
@@ -10486,8 +10486,8 @@ state 288
 
 state 289
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
 
     "identifier (T_STRING)"  shift, and go to state 436
@@ -10504,8 +10504,8 @@ state 289
 
 state 290
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
 
     "identifier (T_STRING)"  shift, and go to state 436
@@ -10753,7 +10753,7 @@ state 299
 
 state 300
 
-  251 new_expr: "new (T_NEW)" class_name_reference @41 . ctor_arguments
+  251 new_expr: "new (T_NEW)" class_name_reference $@41 . ctor_arguments
 
     '('  shift, and go to state 443
 
@@ -10777,11 +10777,11 @@ state 301
 
 state 302
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" . @63 object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" . $@63 object_property $@64 dynamic_class_name_variable_properties
 
-    $default  reduce using rule 368 (@63)
+    $default  reduce using rule 368 ($@63)
 
-    @63  go to state 446
+    $@63  go to state 446
 
 
 state 303
@@ -10805,10 +10805,10 @@ state 304
 
 state 305
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10830,8 +10830,8 @@ state 305
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   377 exit_expr: '(' expr . ')'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -10865,12 +10865,12 @@ state 305
 
 state 306
 
-   38 unticked_statement: "if (T_IF)" '(' expr . ')' @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" '(' expr . ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   38 unticked_statement: "if (T_IF)" '(' expr . ')' $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" '(' expr . ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10892,8 +10892,8 @@ state 306
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -11014,14 +11014,14 @@ state 308
 
 state 309
 
-   47 unticked_statement: "do (T_DO)" @11 statement . "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement . "while (T_WHILE)" '(' $@12 expr ')' ';'
 
     "while (T_WHILE)"  shift, and go to state 450
 
 
 state 310
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 . expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 . expr ')' $@10 while_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -11102,7 +11102,7 @@ state 310
 
 state 311
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr . ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr . ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     ';'  shift, and go to state 452
 
@@ -11110,7 +11110,7 @@ state 311
 state 312
 
   235 for_expr: non_empty_for_expr .
-  237 non_empty_for_expr: non_empty_for_expr . ',' @38 expr
+  237 non_empty_for_expr: non_empty_for_expr . ',' $@38 expr
 
     ','  shift, and go to state 453
 
@@ -11120,10 +11120,10 @@ state 312
 state 313
 
   238 non_empty_for_expr: expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -11145,8 +11145,8 @@ state 313
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -11180,7 +11180,7 @@ state 313
 
 state 314
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable . "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable . "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
   424 expr: expr_without_variable .
 
     "as (T_AS)"  shift, and go to state 454
@@ -11190,10 +11190,10 @@ state 314
 
 state 315
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable . "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable . "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -11229,7 +11229,7 @@ state 315
 
 state 316
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' . declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' . declare_list ')' declare_statement
 
     "identifier (T_STRING)"  shift, and go to state 456
 
@@ -11238,11 +11238,11 @@ state 316
 
 state 317
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr . ')' @16 switch_case_list
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr . ')' $@16 switch_case_list
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -11264,8 +11264,8 @@ state 317
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -11365,7 +11365,7 @@ state 323
 
 state 324
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' . inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' . inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -11615,7 +11615,7 @@ state 342
 state 343
 
   504 internal_functions_in_yacc: "isset (T_ISSET)" '(' isset_variables . ')'
-  513 isset_variables: isset_variables . ',' @73 variable
+  513 isset_variables: isset_variables . ',' $@73 variable
 
     ','  shift, and go to state 483
     ')'  shift, and go to state 484
@@ -11637,7 +11637,7 @@ state 345
 
 state 346
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 . assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 . assignment_list ')' '=' expr
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -11675,11 +11675,11 @@ state 347
 
 state 348
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' . @72 encaps_var_offset ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' . $@72 encaps_var_offset ']'
 
-    $default  reduce using rule 495 (@72)
+    $default  reduce using rule 495 ($@72)
 
-    @72  go to state 492
+    $@72  go to state 492
 
 
 state 349
@@ -11715,10 +11715,10 @@ state 352
 
 state 353
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -11740,8 +11740,8 @@ state 353
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   498 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -11804,7 +11804,7 @@ state 357
 state 358
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
   409 scalar: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
 
@@ -11817,7 +11817,7 @@ state 358
 
 state 359
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 . top_statement_list '}'
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 . top_statement_list '}'
 
     $default  reduce using rule 4 (top_statement_list)
 
@@ -11833,20 +11833,20 @@ state 360
 
 state 361
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' . @2 top_statement_list '}'
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' . $@2 top_statement_list '}'
 
-    $default  reduce using rule 12 (@2)
+    $default  reduce using rule 12 ($@2)
 
-    @2  go to state 499
+    $@2  go to state 499
 
 
 state 362
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' . @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' . $@57 function_call_parameter_list ')'
 
-    $default  reduce using rule 347 (@57)
+    $default  reduce using rule 347 ($@57)
 
-    @57  go to state 500
+    $@57  go to state 500
 
 
 state 363
@@ -11874,7 +11874,7 @@ state 365
 
 state 366
 
-   27 inner_statement_list: inner_statement_list @4 . inner_statement
+   27 inner_statement_list: inner_statement_list $@4 . inner_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -11989,10 +11989,10 @@ state 366
 
 state 367
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -12014,8 +12014,8 @@ state 367
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   461 compound_variable: '$' '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -12070,7 +12070,7 @@ state 370
 
 state 371
 
-  344 function_call: namespace_name '(' @55 . function_call_parameter_list ')'
+  344 function_call: namespace_name '(' $@55 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12175,16 +12175,16 @@ state 373
 
 state 374
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from . @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from . $@30 implements_list '{' class_statement_list '}'
 
-    $default  reduce using rule 100 (@30)
+    $default  reduce using rule 100 ($@30)
 
-    @30  go to state 518
+    $@30  go to state 518
 
 
 state 375
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 . interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 . interface_extends_list '{' class_statement_list '}'
 
     "extends (T_EXTENDS)"  shift, and go to state 519
 
@@ -12195,11 +12195,11 @@ state 375
 
 state 376
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" . @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" . $@29 '(' parameter_list ')' '{' inner_statement_list '}'
 
-    $default  reduce using rule 98 (@29)
+    $default  reduce using rule 98 ($@29)
 
-    @29  go to state 521
+    $@29  go to state 521
 
 
 state 377
@@ -12213,7 +12213,7 @@ state 377
 
 state 378
 
-  450 array_function_dereference: function_call @69 '[' . dim_offset ']'
+  450 array_function_dereference: function_call $@69 '[' . dim_offset ']'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12387,7 +12387,7 @@ state 380
 
 state 381
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' @59 function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects .
 
     '('  shift, and go to state 525
@@ -12409,7 +12409,7 @@ state 382
 
 state 383
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' @58 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' $@58 function_call_parameter_list ')'
 
     '('  shift, and go to state 526
 
@@ -12428,7 +12428,7 @@ state 384
 
 state 385
 
-  279 expr_without_variable: expr "or (T_LOGICAL_OR)" @46 . expr
+  279 expr_without_variable: expr "or (T_LOGICAL_OR)" $@46 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12509,10 +12509,10 @@ state 385
 
 state 386
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   282                      | expr "xor (T_LOGICAL_XOR)" expr .
   283                      | expr . '|' expr
@@ -12535,8 +12535,8 @@ state 386
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "and (T_LOGICAL_AND)"         shift, and go to state 237
     '?'                           shift, and go to state 238
@@ -12568,7 +12568,7 @@ state 386
 
 state 387
 
-  281 expr_without_variable: expr "and (T_LOGICAL_AND)" @47 . expr
+  281 expr_without_variable: expr "and (T_LOGICAL_AND)" $@47 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12649,16 +12649,16 @@ state 387
 
 state 388
 
-  315 expr_without_variable: expr '?' ':' . @51 expr
+  315 expr_without_variable: expr '?' ':' . $@51 expr
 
-    $default  reduce using rule 314 (@51)
+    $default  reduce using rule 314 ($@51)
 
-    @51  go to state 530
+    $@51  go to state 530
 
 
 state 389
 
-  313 expr_without_variable: expr '?' @49 . expr ':' @50 expr
+  313 expr_without_variable: expr '?' $@49 . expr ':' $@50 expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12739,7 +12739,7 @@ state 389
 
 state 390
 
-  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" @44 . expr
+  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" $@44 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12820,7 +12820,7 @@ state 390
 
 state 391
 
-  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" @45 . expr
+  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" $@45 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12901,10 +12901,10 @@ state 391
 
 state 392
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   283                      | expr '|' expr .
@@ -12927,8 +12927,8 @@ state 392
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '^'                           shift, and go to state 242
     '&'                           shift, and go to state 243
@@ -12955,10 +12955,10 @@ state 392
 
 state 393
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -12981,8 +12981,8 @@ state 393
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '&'                           shift, and go to state 243
     "!== (T_IS_NOT_IDENTICAL)"    shift, and go to state 244
@@ -13008,10 +13008,10 @@ state 393
 
 state 394
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13034,8 +13034,8 @@ state 394
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "!== (T_IS_NOT_IDENTICAL)"    shift, and go to state 244
     "=== (T_IS_IDENTICAL)"        shift, and go to state 245
@@ -13060,10 +13060,10 @@ state 394
 
 state 395
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13086,8 +13086,8 @@ state 395
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13113,10 +13113,10 @@ state 395
 
 state 396
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13139,8 +13139,8 @@ state 396
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13166,10 +13166,10 @@ state 396
 
 state 397
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13192,8 +13192,8 @@ state 397
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13219,10 +13219,10 @@ state 397
 
 state 398
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13245,8 +13245,8 @@ state 398
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13272,10 +13272,10 @@ state 398
 
 state 399
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13298,8 +13298,8 @@ state 399
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13321,10 +13321,10 @@ state 399
 
 state 400
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13347,8 +13347,8 @@ state 400
   304                      | expr '>' expr .
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13370,10 +13370,10 @@ state 400
 
 state 401
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13396,8 +13396,8 @@ state 401
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   305                      | expr ">= (T_IS_GREATER_OR_EQUAL)" expr .
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13419,10 +13419,10 @@ state 401
 
 state 402
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13445,8 +13445,8 @@ state 402
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13468,10 +13468,10 @@ state 402
 
 state 403
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13494,8 +13494,8 @@ state 403
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '+'                          shift, and go to state 254
     '-'                          shift, and go to state 255
@@ -13510,10 +13510,10 @@ state 403
 
 state 404
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13536,8 +13536,8 @@ state 404
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '+'                          shift, and go to state 254
     '-'                          shift, and go to state 255
@@ -13552,10 +13552,10 @@ state 404
 
 state 405
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13578,8 +13578,8 @@ state 405
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '*'                          shift, and go to state 257
     '/'                          shift, and go to state 258
@@ -13591,10 +13591,10 @@ state 405
 
 state 406
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13617,8 +13617,8 @@ state 406
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '*'                          shift, and go to state 257
     '/'                          shift, and go to state 258
@@ -13630,10 +13630,10 @@ state 406
 
 state 407
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13656,8 +13656,8 @@ state 407
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '*'                          shift, and go to state 257
     '/'                          shift, and go to state 258
@@ -13669,10 +13669,10 @@ state 407
 
 state 408
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13695,8 +13695,8 @@ state 408
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
@@ -13705,10 +13705,10 @@ state 408
 
 state 409
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13731,8 +13731,8 @@ state 409
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
@@ -13741,10 +13741,10 @@ state 409
 
 state 410
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13767,8 +13767,8 @@ state 410
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
@@ -13785,7 +13785,7 @@ state 411
 state 412
 
   255 expr_without_variable: variable '=' '&' . variable
-  257                      | variable '=' '&' . "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable '=' '&' . "new (T_NEW)" class_name_reference $@43 ctor_arguments
 
     "new (T_NEW)"              shift, and go to state 534
     "identifier (T_STRING)"    shift, and go to state 116
@@ -13813,10 +13813,10 @@ state 412
 state 413
 
   254 expr_without_variable: variable '=' expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13838,8 +13838,8 @@ state 413
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -13871,10 +13871,10 @@ state 413
 state 414
 
   269 expr_without_variable: variable ">>= (T_SR_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13896,8 +13896,8 @@ state 414
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -13929,10 +13929,10 @@ state 414
 state 415
 
   268 expr_without_variable: variable "<<= (T_SL_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13954,8 +13954,8 @@ state 415
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -13987,10 +13987,10 @@ state 415
 state 416
 
   267 expr_without_variable: variable "^= (T_XOR_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14012,8 +14012,8 @@ state 416
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14045,10 +14045,10 @@ state 416
 state 417
 
   266 expr_without_variable: variable "|= (T_OR_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14070,8 +14070,8 @@ state 417
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14103,10 +14103,10 @@ state 417
 state 418
 
   265 expr_without_variable: variable "&= (T_AND_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14128,8 +14128,8 @@ state 418
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14161,10 +14161,10 @@ state 418
 state 419
 
   264 expr_without_variable: variable "%= (T_MOD_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14186,8 +14186,8 @@ state 419
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14219,10 +14219,10 @@ state 419
 state 420
 
   263 expr_without_variable: variable ".= (T_CONCAT_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14244,8 +14244,8 @@ state 420
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14277,10 +14277,10 @@ state 420
 state 421
 
   262 expr_without_variable: variable "/= (T_DIV_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14302,8 +14302,8 @@ state 421
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14335,10 +14335,10 @@ state 421
 state 422
 
   261 expr_without_variable: variable "*= (T_MUL_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14360,8 +14360,8 @@ state 422
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14393,10 +14393,10 @@ state 422
 state 423
 
   260 expr_without_variable: variable "-= (T_MINUS_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14418,8 +14418,8 @@ state 423
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14451,10 +14451,10 @@ state 423
 state 424
 
   259 expr_without_variable: variable "+= (T_PLUS_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14476,8 +14476,8 @@ state 424
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14508,7 +14508,7 @@ state 424
 
 state 425
 
-  358 function_call: variable_without_objects '(' @62 . function_call_parameter_list ')'
+  358 function_call: variable_without_objects '(' $@62 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -14603,7 +14603,7 @@ state 426
 
 state 427
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' @61 function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects .
 
     '('  shift, and go to state 537
@@ -14613,17 +14613,17 @@ state 427
 
 state 428
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' @60 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' $@60 function_call_parameter_list ')'
 
     '('  shift, and go to state 538
 
 
 state 429
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14645,8 +14645,8 @@ state 429
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   463 dim_offset: expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -14688,7 +14688,7 @@ state 430
 
 state 431
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 . object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 . object_property $@66 method_or_not variable_properties
 
     "identifier (T_STRING)"  shift, and go to state 436
     "variable (T_VARIABLE)"  shift, and go to state 34
@@ -14713,10 +14713,10 @@ state 432
 
 state 433
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14738,8 +14738,8 @@ state 433
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   458 reference_variable: reference_variable '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -14781,7 +14781,7 @@ state 434
 state 435
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
@@ -14826,10 +14826,10 @@ state 437
 
 state 438
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14851,8 +14851,8 @@ state 438
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   484 non_empty_array_pair_list: expr "=> (T_DOUBLE_ARROW)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -14914,10 +14914,10 @@ state 439
 
 state 440
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14939,8 +14939,8 @@ state 440
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   482 non_empty_array_pair_list: non_empty_array_pair_list ',' expr . "=> (T_DOUBLE_ARROW)" expr
   483                          | non_empty_array_pair_list ',' expr .
   486                          | non_empty_array_pair_list ',' expr . "=> (T_DOUBLE_ARROW)" '&' w_variable
@@ -15081,7 +15081,7 @@ state 443
 
 state 444
 
-  251 new_expr: "new (T_NEW)" class_name_reference @41 ctor_arguments .
+  251 new_expr: "new (T_NEW)" class_name_reference $@41 ctor_arguments .
 
     $default  reduce using rule 251 (new_expr)
 
@@ -15095,7 +15095,7 @@ state 445
 
 state 446
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 . object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 . object_property $@64 dynamic_class_name_variable_properties
 
     "identifier (T_STRING)"  shift, and go to state 436
     "variable (T_VARIABLE)"  shift, and go to state 34
@@ -15120,23 +15120,23 @@ state 447
 
 state 448
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' . @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" '(' expr ')' . ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   38 unticked_statement: "if (T_IF)" '(' expr ')' . $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" '(' expr ')' . ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     ':'  shift, and go to state 551
 
-    $default  reduce using rule 36 (@5)
+    $default  reduce using rule 36 ($@5)
 
-    @5  go to state 552
+    $@5  go to state 552
 
 
 state 449
 
   232 echo_expr_list: echo_expr_list ',' expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -15158,8 +15158,8 @@ state 449
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -15193,18 +15193,18 @@ state 449
 
 state 450
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" . '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" . '(' $@12 expr ')' ';'
 
     '('  shift, and go to state 553
 
 
 state 451
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr . ')' @10 while_statement
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr . ')' $@10 while_statement
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -15226,8 +15226,8 @@ state 451
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -15260,38 +15260,38 @@ state 451
 
 state 452
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' . @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' . $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
-    $default  reduce using rule 48 (@13)
+    $default  reduce using rule 48 ($@13)
 
-    @13  go to state 555
+    $@13  go to state 555
 
 
 state 453
 
-  237 non_empty_for_expr: non_empty_for_expr ',' . @38 expr
+  237 non_empty_for_expr: non_empty_for_expr ',' . $@38 expr
 
-    $default  reduce using rule 236 (@38)
+    $default  reduce using rule 236 ($@38)
 
-    @38  go to state 556
+    $@38  go to state 556
 
 
 state 454
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" . @19 variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" . $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
-    $default  reduce using rule 70 (@19)
+    $default  reduce using rule 70 ($@19)
 
-    @19  go to state 557
+    $@19  go to state 557
 
 
 state 455
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" . @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" . $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
 
-    $default  reduce using rule 67 (@17)
+    $default  reduce using rule 67 ($@17)
 
-    @17  go to state 558
+    $@17  go to state 558
 
 
 state 456
@@ -15303,7 +15303,7 @@ state 456
 
 state 457
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list . ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list . ')' declare_statement
   128 declare_list: declare_list . ',' "identifier (T_STRING)" '=' static_scalar
 
     ','  shift, and go to state 560
@@ -15312,11 +15312,11 @@ state 457
 
 state 458
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' . @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' . $@16 switch_case_list
 
-    $default  reduce using rule 52 (@16)
+    $default  reduce using rule 52 ($@16)
 
-    @16  go to state 562
+    $@16  go to state 562
 
 
 state 459
@@ -15502,14 +15502,14 @@ state 471
 
 state 472
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list . '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list . '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     '}'  shift, and go to state 573
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 473
@@ -15536,10 +15536,10 @@ state 475
 state 476
 
   178 global_var: '$' '{' expr . '}'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -15561,8 +15561,8 @@ state 476
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -15662,11 +15662,11 @@ state 482
 
 state 483
 
-  513 isset_variables: isset_variables ',' . @73 variable
+  513 isset_variables: isset_variables ',' . $@73 variable
 
-    $default  reduce using rule 512 (@73)
+    $default  reduce using rule 512 ($@73)
 
-    @73  go to state 580
+    $@73  go to state 580
 
 
 state 484
@@ -15692,7 +15692,7 @@ state 486
 
 state 487
 
-  478 assignment_list_element: "list (T_LIST)" . '(' @71 assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" . '(' $@71 assignment_list ')'
 
     '('  shift, and go to state 581
 
@@ -15706,7 +15706,7 @@ state 488
 
 state 489
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list . ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list . ')' '=' expr
   474 assignment_list: assignment_list . ',' assignment_list_element
 
     ','  shift, and go to state 582
@@ -15729,7 +15729,7 @@ state 491
 
 state 492
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 . encaps_var_offset ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 . encaps_var_offset ']'
 
     "identifier (T_STRING)"  shift, and go to state 584
     "variable (T_VARIABLE)"  shift, and go to state 585
@@ -15842,28 +15842,28 @@ state 496
 
 state 497
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' . @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' . $@56 function_call_parameter_list ')'
 
-    $default  reduce using rule 345 (@56)
+    $default  reduce using rule 345 ($@56)
 
-    @56  go to state 589
+    $@56  go to state 589
 
 
 state 498
 
-    3 top_statement_list: top_statement_list . @1 top_statement
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 top_statement_list . '}'
+    3 top_statement_list: top_statement_list . $@1 top_statement
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 top_statement_list . '}'
 
     '}'  shift, and go to state 590
 
-    $default  reduce using rule 2 (@1)
+    $default  reduce using rule 2 ($@1)
 
-    @1  go to state 4
+    $@1  go to state 4
 
 
 state 499
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 . top_statement_list '}'
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 . top_statement_list '}'
 
     $default  reduce using rule 4 (top_statement_list)
 
@@ -15872,7 +15872,7 @@ state 499
 
 state 500
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 . function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -15960,12 +15960,12 @@ state 501
 
   310 expr_without_variable: '(' new_expr ')' @48 . instance_call
 
-    '['                       reduce using rule 248 (@40)
-    "-> (T_OBJECT_OPERATOR)"  reduce using rule 248 (@40)
+    '['                       reduce using rule 248 ($@40)
+    "-> (T_OBJECT_OPERATOR)"  reduce using rule 248 ($@40)
     $default                  reduce using rule 247 (instance_call)
 
     instance_call  go to state 593
-    @40            go to state 594
+    $@40           go to state 594
 
 
 state 502
@@ -15977,7 +15977,7 @@ state 502
 
 state 503
 
-   27 inner_statement_list: inner_statement_list @4 inner_statement .
+   27 inner_statement_list: inner_statement_list $@4 inner_statement .
 
     $default  reduce using rule 27 (inner_statement_list)
 
@@ -16039,7 +16039,7 @@ state 508
 
 state 509
 
-  344 function_call: namespace_name '(' @55 function_call_parameter_list . ')'
+  344 function_call: namespace_name '(' $@55 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 597
 
@@ -16071,7 +16071,7 @@ state 512
   169 non_empty_function_call_parameter_list: variable .
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -16173,7 +16173,7 @@ state 517
 
 state 518
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 . implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 . implements_list '{' class_statement_list '}'
 
     "implements (T_IMPLEMENTS)"  shift, and go to state 602
 
@@ -16197,14 +16197,14 @@ state 519
 
 state 520
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list . '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list . '{' class_statement_list '}'
 
     '{'  shift, and go to state 606
 
 
 state 521
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 . '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 . '(' parameter_list ')' '{' inner_statement_list '}'
 
     '('  shift, and go to state 607
 
@@ -16231,17 +16231,17 @@ state 522
 
 state 523
 
-  450 array_function_dereference: function_call @69 '[' dim_offset . ']'
+  450 array_function_dereference: function_call $@69 '[' dim_offset . ']'
 
     ']'  shift, and go to state 614
 
 
 state 524
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16263,8 +16263,8 @@ state 524
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   471 variable_name: '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -16298,20 +16298,20 @@ state 524
 
 state 525
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . @59 function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . $@59 function_call_parameter_list ')'
 
-    $default  reduce using rule 351 (@59)
+    $default  reduce using rule 351 ($@59)
 
-    @59  go to state 616
+    $@59  go to state 616
 
 
 state 526
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . @58 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . $@58 function_call_parameter_list ')'
 
-    $default  reduce using rule 349 (@58)
+    $default  reduce using rule 349 ($@58)
 
-    @58  go to state 617
+    $@58  go to state 617
 
 
 state 527
@@ -16328,11 +16328,11 @@ state 527
 
 state 528
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  279                      | expr "or (T_LOGICAL_OR)" @46 expr .
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  279                      | expr "or (T_LOGICAL_OR)" $@46 expr .
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16354,8 +16354,8 @@ state 528
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
     "and (T_LOGICAL_AND)"         shift, and go to state 237
@@ -16388,11 +16388,11 @@ state 528
 
 state 529
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
-  281                      | expr "and (T_LOGICAL_AND)" @47 expr .
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
+  281                      | expr "and (T_LOGICAL_AND)" $@47 expr .
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16414,8 +16414,8 @@ state 529
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -16446,7 +16446,7 @@ state 529
 
 state 530
 
-  315 expr_without_variable: expr '?' ':' @51 . expr
+  315 expr_without_variable: expr '?' ':' $@51 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -16527,10 +16527,10 @@ state 530
 
 state 531
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16552,9 +16552,9 @@ state 531
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  313                      | expr '?' @49 expr . ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  313                      | expr '?' $@49 expr . ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -16587,11 +16587,11 @@ state 531
 
 state 532
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  275                      | expr "|| (T_BOOLEAN_OR)" @44 expr .
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  275                      | expr "|| (T_BOOLEAN_OR)" $@44 expr .
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16613,8 +16613,8 @@ state 532
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "&& (T_BOOLEAN_AND)"          shift, and go to state 240
     '|'                           shift, and go to state 241
@@ -16643,11 +16643,11 @@ state 532
 
 state 533
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  277                      | expr "&& (T_BOOLEAN_AND)" @45 expr .
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  277                      | expr "&& (T_BOOLEAN_AND)" $@45 expr .
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16669,8 +16669,8 @@ state 533
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '|'                           shift, and go to state 241
     '^'                           shift, and go to state 242
@@ -16698,7 +16698,7 @@ state 533
 
 state 534
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" . class_name_reference @43 ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" . class_name_reference $@43 ctor_arguments
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -16728,27 +16728,27 @@ state 535
 
 state 536
 
-  358 function_call: variable_without_objects '(' @62 function_call_parameter_list . ')'
+  358 function_call: variable_without_objects '(' $@62 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 621
 
 
 state 537
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . @61 function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . $@61 function_call_parameter_list ')'
 
-    $default  reduce using rule 355 (@61)
+    $default  reduce using rule 355 ($@61)
 
-    @61  go to state 622
+    $@61  go to state 622
 
 
 state 538
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . @60 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . $@60 function_call_parameter_list ')'
 
-    $default  reduce using rule 353 (@60)
+    $default  reduce using rule 353 ($@60)
 
-    @60  go to state 623
+    $@60  go to state 623
 
 
 state 539
@@ -16760,20 +16760,20 @@ state 539
 
 state 540
 
-  466 object_property: variable_without_objects . @70
+  466 object_property: variable_without_objects . $@70
 
-    $default  reduce using rule 465 (@70)
+    $default  reduce using rule 465 ($@70)
 
-    @70  go to state 624
+    $@70  go to state 624
 
 
 state 541
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property . @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property . $@66 method_or_not variable_properties
 
-    $default  reduce using rule 429 (@66)
+    $default  reduce using rule 429 ($@66)
 
-    @66  go to state 625
+    $@66  go to state 625
 
 
 state 542
@@ -16915,25 +16915,25 @@ state 549
 
 state 550
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property . @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property . $@64 dynamic_class_name_variable_properties
 
-    $default  reduce using rule 369 (@64)
+    $default  reduce using rule 369 ($@64)
 
-    @64  go to state 631
+    $@64  go to state 631
 
 
 state 551
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' . @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' . $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
-    $default  reduce using rule 39 (@7)
+    $default  reduce using rule 39 ($@7)
 
-    @7  go to state 632
+    $@7  go to state 632
 
 
 state 552
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 . statement @6 elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 . statement $@6 elseif_list else_single
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17035,25 +17035,25 @@ state 552
 
 state 553
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' . @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' . $@12 expr ')' ';'
 
-    $default  reduce using rule 46 (@12)
+    $default  reduce using rule 46 ($@12)
 
-    @12  go to state 634
+    $@12  go to state 634
 
 
 state 554
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' . @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' . $@10 while_statement
 
-    $default  reduce using rule 43 (@10)
+    $default  reduce using rule 43 ($@10)
 
-    @10  go to state 635
+    $@10  go to state 635
 
 
 state 555
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 . for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 . for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17138,7 +17138,7 @@ state 555
 
 state 556
 
-  237 non_empty_for_expr: non_empty_for_expr ',' @38 . expr
+  237 non_empty_for_expr: non_empty_for_expr ',' $@38 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17219,7 +17219,7 @@ state 556
 
 state 557
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 . variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 . variable foreach_optional_arg ')' $@20 foreach_statement
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -17245,7 +17245,7 @@ state 557
 
 state 558
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 . foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 . foreach_variable foreach_optional_arg ')' $@18 foreach_statement
 
     '&'                        shift, and go to state 639
     "identifier (T_STRING)"    shift, and go to state 116
@@ -17312,7 +17312,7 @@ state 560
 
 state 561
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list ')' . declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list ')' . declare_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17416,7 +17416,7 @@ state 561
 
 state 562
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' @16 . switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' $@16 . switch_case_list
 
     ':'  shift, and go to state 647
     '{'  shift, and go to state 648
@@ -17542,7 +17542,7 @@ state 572
 
 state 573
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' . "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' . "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     "catch (T_CATCH)"  shift, and go to state 657
 
@@ -17629,7 +17629,7 @@ state 579
 
 state 580
 
-  513 isset_variables: isset_variables ',' @73 . variable
+  513 isset_variables: isset_variables ',' $@73 . variable
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -17655,11 +17655,11 @@ state 580
 
 state 581
 
-  478 assignment_list_element: "list (T_LIST)" '(' . @71 assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" '(' . $@71 assignment_list ')'
 
-    $default  reduce using rule 477 (@71)
+    $default  reduce using rule 477 ($@71)
 
-    @71  go to state 661
+    $@71  go to state 661
 
 
 state 582
@@ -17694,7 +17694,7 @@ state 582
 
 state 583
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' . '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' . '=' expr
 
     '='  shift, and go to state 663
 
@@ -17722,17 +17722,17 @@ state 586
 
 state 587
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 encaps_var_offset . ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 encaps_var_offset . ']'
 
     ']'  shift, and go to state 664
 
 
 state 588
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -17754,8 +17754,8 @@ state 588
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   499 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' expr . ']' '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -17789,7 +17789,7 @@ state 588
 
 state 589
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 . function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17875,26 +17875,26 @@ state 589
 
 state 590
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 top_statement_list '}' .
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 top_statement_list '}' .
 
     $default  reduce using rule 15 (top_statement)
 
 
 state 591
 
-    3 top_statement_list: top_statement_list . @1 top_statement
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 top_statement_list . '}'
+    3 top_statement_list: top_statement_list . $@1 top_statement
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 top_statement_list . '}'
 
     '}'  shift, and go to state 667
 
-    $default  reduce using rule 2 (@1)
+    $default  reduce using rule 2 ($@1)
 
-    @1  go to state 4
+    $@1  go to state 4
 
 
 state 592
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 function_call_parameter_list . ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 668
 
@@ -17908,7 +17908,7 @@ state 593
 
 state 594
 
-  249 instance_call: @40 . chaining_instance_call
+  249 instance_call: $@40 . chaining_instance_call
 
     '['                       shift, and go to state 669
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
@@ -17935,7 +17935,7 @@ state 596
 
 state 597
 
-  344 function_call: namespace_name '(' @55 function_call_parameter_list ')' .
+  344 function_call: namespace_name '(' $@55 function_call_parameter_list ')' .
 
     $default  reduce using rule 344 (function_call)
 
@@ -18065,7 +18065,7 @@ state 602
 
 state 603
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list . '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list . '{' class_statement_list '}'
 
     '{'  shift, and go to state 681
 
@@ -18089,7 +18089,7 @@ state 605
 
 state 606
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' . class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' . class_statement_list '}'
 
     $default  reduce using rule 184 (class_statement_list)
 
@@ -18098,7 +18098,7 @@ state 606
 
 state 607
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' . parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' . parameter_list ')' '{' inner_statement_list '}'
 
     "identifier (T_STRING)"    shift, and go to state 116
     "array (T_ARRAY)"          shift, and go to state 608
@@ -18170,7 +18170,7 @@ state 613
 
 state 614
 
-  450 array_function_dereference: function_call @69 '[' dim_offset ']' .
+  450 array_function_dereference: function_call $@69 '[' dim_offset ']' .
 
     $default  reduce using rule 450 (array_function_dereference)
 
@@ -18184,7 +18184,7 @@ state 615
 
 state 616
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 . function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18270,7 +18270,7 @@ state 616
 
 state 617
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 . function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18356,10 +18356,10 @@ state 617
 
 state 618
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -18381,9 +18381,9 @@ state 618
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
-  315                      | expr '?' ':' @51 expr .
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
+  315                      | expr '?' ':' $@51 expr .
 
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
     "&& (T_BOOLEAN_AND)"          shift, and go to state 240
@@ -18413,32 +18413,32 @@ state 618
 
 state 619
 
-  313 expr_without_variable: expr '?' @49 expr ':' . @50 expr
+  313 expr_without_variable: expr '?' $@49 expr ':' . $@50 expr
 
-    $default  reduce using rule 312 (@50)
+    $default  reduce using rule 312 ($@50)
 
-    @50  go to state 691
+    $@50  go to state 691
 
 
 state 620
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference . @43 ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference . $@43 ctor_arguments
 
-    $default  reduce using rule 256 (@43)
+    $default  reduce using rule 256 ($@43)
 
-    @43  go to state 692
+    $@43  go to state 692
 
 
 state 621
 
-  358 function_call: variable_without_objects '(' @62 function_call_parameter_list ')' .
+  358 function_call: variable_without_objects '(' $@62 function_call_parameter_list ')' .
 
     $default  reduce using rule 358 (function_call)
 
 
 state 622
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 . function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18524,7 +18524,7 @@ state 622
 
 state 623
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 . function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18610,14 +18610,14 @@ state 623
 
 state 624
 
-  466 object_property: variable_without_objects @70 .
+  466 object_property: variable_without_objects $@70 .
 
     $default  reduce using rule 466 (object_property)
 
 
 state 625
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 . method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 . method_or_not variable_properties
 
     '('  shift, and go to state 695
 
@@ -18822,10 +18822,10 @@ state 628
 
 state 629
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -18847,8 +18847,8 @@ state 629
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   482 non_empty_array_pair_list: non_empty_array_pair_list ',' expr "=> (T_DOUBLE_ARROW)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -18890,7 +18890,7 @@ state 630
 
 state 631
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property @64 . dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 . dynamic_class_name_variable_properties
 
     $default  reduce using rule 373 (dynamic_class_name_variable_properties)
 
@@ -18899,7 +18899,7 @@ state 631
 
 state 632
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 . inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 . inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -18908,16 +18908,16 @@ state 632
 
 state 633
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement . @6 elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement . $@6 elseif_list else_single
 
-    $default  reduce using rule 37 (@6)
+    $default  reduce using rule 37 ($@6)
 
-    @6  go to state 704
+    $@6  go to state 704
 
 
 state 634
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 . expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 . expr ')' ';'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18998,7 +18998,7 @@ state 634
 
 state 635
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' @10 . while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' $@10 . while_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -19102,18 +19102,18 @@ state 635
 
 state 636
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr . ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr . ';' $@14 for_expr ')' $@15 for_statement
 
     ';'  shift, and go to state 709
 
 
 state 637
 
-  237 non_empty_for_expr: non_empty_for_expr ',' @38 expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  237 non_empty_for_expr: non_empty_for_expr ',' $@38 expr .
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -19135,8 +19135,8 @@ state 637
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -19170,7 +19170,7 @@ state 637
 
 state 638
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable . foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable . foreach_optional_arg ')' $@20 foreach_statement
 
     "=> (T_DOUBLE_ARROW)"  shift, and go to state 710
 
@@ -19207,7 +19207,7 @@ state 639
 
 state 640
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable . foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable . foreach_optional_arg ')' $@18 foreach_statement
 
     "=> (T_DOUBLE_ARROW)"  shift, and go to state 710
 
@@ -19255,7 +19255,7 @@ state 645
 
 state 646
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list ')' declare_statement .
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list ')' declare_statement .
 
     $default  reduce using rule 74 (unticked_statement)
 
@@ -19286,7 +19286,7 @@ state 648
 
 state 649
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' @16 switch_case_list .
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' $@16 switch_case_list .
 
     $default  reduce using rule 53 (unticked_statement)
 
@@ -19401,7 +19401,7 @@ state 656
 
 state 657
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" . '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" . '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     '('  shift, and go to state 723
 
@@ -19422,14 +19422,14 @@ state 659
 
 state 660
 
-  513 isset_variables: isset_variables ',' @73 variable .
+  513 isset_variables: isset_variables ',' $@73 variable .
 
     $default  reduce using rule 513 (isset_variables)
 
 
 state 661
 
-  478 assignment_list_element: "list (T_LIST)" '(' @71 . assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 . assignment_list ')'
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -19467,7 +19467,7 @@ state 662
 
 state 663
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' '=' . expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' '=' . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -19548,7 +19548,7 @@ state 663
 
 state 664
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 encaps_var_offset ']' .
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 encaps_var_offset ']' .
 
     $default  reduce using rule 496 (encaps_var)
 
@@ -19562,21 +19562,21 @@ state 665
 
 state 666
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list . ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 728
 
 
 state 667
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 top_statement_list '}' .
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 top_statement_list '}' .
 
     $default  reduce using rule 13 (top_statement)
 
 
 state 668
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 function_call_parameter_list ')' .
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 function_call_parameter_list ')' .
 
     $default  reduce using rule 348 (function_call)
 
@@ -19667,7 +19667,7 @@ state 669
 
 state 670
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" . object_property @67 method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" . object_property $@67 method_or_not
 
     "identifier (T_STRING)"  shift, and go to state 436
     "variable (T_VARIABLE)"  shift, and go to state 34
@@ -19698,20 +19698,20 @@ state 671
 state 672
 
   241 chaining_dereference: chaining_dereference . '[' dim_offset ']'
-  244 chaining_instance_call: chaining_dereference . @39 chaining_method_or_property
+  244 chaining_instance_call: chaining_dereference . $@39 chaining_method_or_property
   245                       | chaining_dereference .
 
     '['  shift, and go to state 732
 
-    "-> (T_OBJECT_OPERATOR)"  reduce using rule 243 (@39)
+    "-> (T_OBJECT_OPERATOR)"  reduce using rule 243 ($@39)
     $default                  reduce using rule 245 (chaining_instance_call)
 
-    @39  go to state 733
+    $@39  go to state 733
 
 
 state 673
 
-  249 instance_call: @40 chaining_instance_call .
+  249 instance_call: $@40 chaining_instance_call .
 
     $default  reduce using rule 249 (instance_call)
 
@@ -19772,7 +19772,7 @@ state 678
   172 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list ',' variable .
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -19829,7 +19829,7 @@ state 680
 
 state 681
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' . class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' . class_statement_list '}'
 
     $default  reduce using rule 184 (class_statement_list)
 
@@ -19850,7 +19850,7 @@ state 682
 
 state 683
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list . '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list . '}'
   183 class_statement_list: class_statement_list . class_statement
 
     "const (T_CONST)"          shift, and go to state 738
@@ -19877,7 +19877,7 @@ state 683
 
 state 684
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list . ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list . ')' '{' inner_statement_list '}'
 
     ')'  shift, and go to state 755
 
@@ -19933,21 +19933,21 @@ state 688
 
 state 689
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list . ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 761
 
 
 state 690
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list . ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 762
 
 
 state 691
 
-  313 expr_without_variable: expr '?' @49 expr ':' @50 . expr
+  313 expr_without_variable: expr '?' $@49 expr ':' $@50 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -20028,7 +20028,7 @@ state 691
 
 state 692
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference @43 . ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference $@43 . ctor_arguments
 
     '('  shift, and go to state 443
 
@@ -20039,25 +20039,25 @@ state 692
 
 state 693
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list . ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 765
 
 
 state 694
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list . ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 766
 
 
 state 695
 
-  439 method: '(' . @68 function_call_parameter_list ')'
+  439 method: '(' . $@68 function_call_parameter_list ')'
 
-    $default  reduce using rule 438 (@68)
+    $default  reduce using rule 438 ($@68)
 
-    @68  go to state 767
+    $@68  go to state 767
 
 
 state 696
@@ -20082,7 +20082,7 @@ state 697
 
 state 698
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not . variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not . variable_properties
 
     $default  reduce using rule 433 (variable_properties)
 
@@ -20098,10 +20098,10 @@ state 699
 
 state 700
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20123,8 +20123,8 @@ state 700
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   468 object_dim_list: object_dim_list '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -20165,7 +20165,7 @@ state 701
 
 state 702
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property @64 dynamic_class_name_variable_properties .
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 dynamic_class_name_variable_properties .
   372 dynamic_class_name_variable_properties: dynamic_class_name_variable_properties . dynamic_class_name_variable_property
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 773
@@ -20177,21 +20177,21 @@ state 702
 
 state 703
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list . @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list . $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
-    "elseif (T_ELSEIF)"  reduce using rule 40 (@8)
-    "else (T_ELSE)"      reduce using rule 40 (@8)
-    "endif (T_ENDIF)"    reduce using rule 40 (@8)
-    $default             reduce using rule 26 (@4)
+    "elseif (T_ELSEIF)"  reduce using rule 40 ($@8)
+    "else (T_ELSE)"      reduce using rule 40 ($@8)
+    "endif (T_ENDIF)"    reduce using rule 40 ($@8)
+    $default             reduce using rule 26 ($@4)
 
-    @4  go to state 366
-    @8  go to state 775
+    $@4  go to state 366
+    $@8  go to state 775
 
 
 state 704
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 . elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 . elseif_list else_single
 
     $default  reduce using rule 142 (elseif_list)
 
@@ -20200,11 +20200,11 @@ state 704
 
 state 705
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr . ')' ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr . ')' ';'
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20226,8 +20226,8 @@ state 705
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -20276,18 +20276,18 @@ state 707
 
 state 708
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' @10 while_statement .
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' $@10 while_statement .
 
     $default  reduce using rule 44 (unticked_statement)
 
 
 state 709
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' . @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' . $@14 for_expr ')' $@15 for_statement
 
-    $default  reduce using rule 49 (@14)
+    $default  reduce using rule 49 ($@14)
 
-    @14  go to state 779
+    $@14  go to state 779
 
 
 state 710
@@ -20320,7 +20320,7 @@ state 710
 
 state 711
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg . ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg . ')' $@20 foreach_statement
 
     ')'  shift, and go to state 781
 
@@ -20334,7 +20334,7 @@ state 712
 
 state 713
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg . ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg . ')' $@18 foreach_statement
 
     ')'  shift, and go to state 782
 
@@ -20373,14 +20373,14 @@ state 714
 
 state 715
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   126 declare_statement: ':' inner_statement_list . "enddeclare (T_ENDDECLARE)" ';'
 
     "enddeclare (T_ENDDECLARE)"  shift, and go to state 784
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 716
@@ -20395,8 +20395,8 @@ state 716
 state 717
 
   131 switch_case_list: ':' case_list . "endswitch (T_ENDSWITCH)" ';'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "endswitch (T_ENDSWITCH)"  shift, and go to state 786
     "case (T_CASE)"            shift, and go to state 787
@@ -20415,8 +20415,8 @@ state 718
 state 719
 
   129 switch_case_list: '{' case_list . '}'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "case (T_CASE)"        shift, and go to state 787
     "default (T_DEFAULT)"  shift, and go to state 788
@@ -20449,11 +20449,11 @@ state 722
 
 state 723
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' . @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' . $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 77 (@23)
+    $default  reduce using rule 77 ($@23)
 
-    @23  go to state 792
+    $@23  go to state 792
 
 
 state 724
@@ -20470,7 +20470,7 @@ state 724
 state 725
 
   474 assignment_list: assignment_list . ',' assignment_list_element
-  478 assignment_list_element: "list (T_LIST)" '(' @71 assignment_list . ')'
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 assignment_list . ')'
 
     ','  shift, and go to state 582
     ')'  shift, and go to state 794
@@ -20478,11 +20478,11 @@ state 725
 
 state 726
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' '=' expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' '=' expr .
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20504,8 +20504,8 @@ state 726
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -20543,7 +20543,7 @@ state 727
 
 state 728
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')' .
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')' .
 
     $default  reduce using rule 346 (function_call)
 
@@ -20557,11 +20557,11 @@ state 729
 
 state 730
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property . @67 method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property . $@67 method_or_not
 
-    $default  reduce using rule 434 (@67)
+    $default  reduce using rule 434 ($@67)
 
-    @67  go to state 796
+    $@67  go to state 796
 
 
 state 731
@@ -20657,7 +20657,7 @@ state 732
 
 state 733
 
-  244 chaining_instance_call: chaining_dereference @39 . chaining_method_or_property
+  244 chaining_instance_call: chaining_dereference $@39 . chaining_method_or_property
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
 
@@ -20681,7 +20681,7 @@ state 735
 
 state 736
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list . '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list . '}'
   183 class_statement_list: class_statement_list . class_statement
 
     "const (T_CONST)"          shift, and go to state 738
@@ -20784,7 +20784,7 @@ state 746
 
 state 747
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list '}' .
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list '}' .
 
     $default  reduce using rule 103 (unticked_class_declaration_statement)
 
@@ -20805,16 +20805,16 @@ state 749
 
 state 750
 
-  186 class_statement: variable_modifiers . @36 class_variable_declaration ';'
+  186 class_statement: variable_modifiers . $@36 class_variable_declaration ';'
 
-    $default  reduce using rule 185 (@36)
+    $default  reduce using rule 185 ($@36)
 
-    @36  go to state 803
+    $@36  go to state 803
 
 
 state 751
 
-  190 class_statement: method_modifiers . function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers . function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
     "function (T_FUNCTION)"  shift, and go to state 47
 
@@ -20858,7 +20858,7 @@ state 754
 
 state 755
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' . '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' . '{' inner_statement_list '}'
 
     '{'  shift, and go to state 808
 
@@ -20932,24 +20932,24 @@ state 760
 
 state 761
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')' .
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')' .
 
     $default  reduce using rule 352 (function_call)
 
 
 state 762
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')' .
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')' .
 
     $default  reduce using rule 350 (function_call)
 
 
 state 763
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20971,9 +20971,9 @@ state 763
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  313                      | expr '?' @49 expr ':' @50 expr .
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  313                      | expr '?' $@49 expr ':' $@50 expr .
+  315                      | expr . '?' ':' $@51 expr
 
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
     "&& (T_BOOLEAN_AND)"          shift, and go to state 240
@@ -21003,28 +21003,28 @@ state 763
 
 state 764
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments .
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments .
 
     $default  reduce using rule 257 (expr_without_variable)
 
 
 state 765
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')' .
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')' .
 
     $default  reduce using rule 356 (function_call)
 
 
 state 766
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')' .
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')' .
 
     $default  reduce using rule 354 (function_call)
 
 
 state 767
 
-  439 method: '(' @68 . function_call_parameter_list ')'
+  439 method: '(' $@68 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -21278,7 +21278,7 @@ state 769
 
 state 770
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not variable_properties .
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not variable_properties .
   432 variable_properties: variable_properties . variable_property
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
@@ -21329,7 +21329,7 @@ state 774
 
 state 775
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 . new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 . new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     $default  reduce using rule 145 (new_elseif_list)
 
@@ -21338,8 +21338,8 @@ state 775
 
 state 776
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 elseif_list . else_single
-  144 elseif_list: elseif_list . "elseif (T_ELSEIF)" '(' expr ')' @34 statement
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 elseif_list . else_single
+  144 elseif_list: elseif_list . "elseif (T_ELSEIF)" '(' expr ')' $@34 statement
 
     "elseif (T_ELSEIF)"  shift, and go to state 821
     "else (T_ELSE)"      shift, and go to state 822
@@ -21353,26 +21353,26 @@ state 776
 
 state 777
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr ')' . ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr ')' . ';'
 
     ';'  shift, and go to state 824
 
 
 state 778
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   141 while_statement: ':' inner_statement_list . "endwhile (T_ENDWHILE)" ';'
 
     "endwhile (T_ENDWHILE)"  shift, and go to state 825
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 779
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 . for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 . for_expr ')' $@15 for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -21464,20 +21464,20 @@ state 780
 
 state 781
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' . @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' . $@20 foreach_statement
 
-    $default  reduce using rule 71 (@20)
+    $default  reduce using rule 71 ($@20)
 
-    @20  go to state 827
+    $@20  go to state 827
 
 
 state 782
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' . @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' . $@18 foreach_statement
 
-    $default  reduce using rule 68 (@18)
+    $default  reduce using rule 68 ($@18)
 
-    @18  go to state 828
+    $@18  go to state 828
 
 
 state 783
@@ -21497,8 +21497,8 @@ state 784
 state 785
 
   132 switch_case_list: ':' ';' case_list . "endswitch (T_ENDSWITCH)" ';'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "endswitch (T_ENDSWITCH)"  shift, and go to state 830
     "case (T_CASE)"            shift, and go to state 787
@@ -21514,7 +21514,7 @@ state 786
 
 state 787
 
-  135 case_list: case_list "case (T_CASE)" . expr case_separator @32 inner_statement_list
+  135 case_list: case_list "case (T_CASE)" . expr case_separator $@32 inner_statement_list
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -21595,7 +21595,7 @@ state 787
 
 state 788
 
-  137 case_list: case_list "default (T_DEFAULT)" . case_separator @33 inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" . case_separator $@33 inner_statement_list
 
     ':'  shift, and go to state 833
     ';'  shift, and go to state 834
@@ -21606,8 +21606,8 @@ state 788
 state 789
 
   130 switch_case_list: '{' ';' case_list . '}'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "case (T_CASE)"        shift, and go to state 787
     "default (T_DEFAULT)"  shift, and go to state 788
@@ -21655,7 +21655,7 @@ state 791
 
 state 792
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 . fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 . fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     "identifier (T_STRING)"    shift, and go to state 116
     "namespace (T_NAMESPACE)"  shift, and go to state 514
@@ -21674,7 +21674,7 @@ state 793
 
 state 794
 
-  478 assignment_list_element: "list (T_LIST)" '(' @71 assignment_list ')' .
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 assignment_list ')' .
 
     $default  reduce using rule 478 (assignment_list_element)
 
@@ -21688,7 +21688,7 @@ state 795
 
 state 796
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property @67 . method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property $@67 . method_or_not
 
     '('  shift, and go to state 695
 
@@ -21709,7 +21709,7 @@ state 797
 state 798
 
   239 chaining_method_or_property: chaining_method_or_property . variable_property
-  244 chaining_instance_call: chaining_dereference @39 chaining_method_or_property .
+  244 chaining_instance_call: chaining_dereference $@39 chaining_method_or_property .
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
 
@@ -21720,7 +21720,7 @@ state 798
 
 state 799
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list '}' .
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list '}' .
 
     $default  reduce using rule 101 (unticked_class_declaration_statement)
 
@@ -21753,7 +21753,7 @@ state 802
 
 state 803
 
-  186 class_statement: variable_modifiers @36 . class_variable_declaration ';'
+  186 class_statement: variable_modifiers $@36 . class_variable_declaration ';'
 
     "variable (T_VARIABLE)"  shift, and go to state 847
 
@@ -21762,7 +21762,7 @@ state 803
 
 state 804
 
-  190 class_statement: method_modifiers function . is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function . is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
     '&'  shift, and go to state 231
 
@@ -21794,7 +21794,7 @@ state 807
 
 state 808
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' . inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' . inner_statement_list '}'
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -21879,7 +21879,7 @@ state 814
 
 state 815
 
-  439 method: '(' @68 function_call_parameter_list . ')'
+  439 method: '(' $@68 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 859
 
@@ -21914,8 +21914,8 @@ state 819
 
 state 820
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list . new_else_single "endif (T_ENDIF)" ';'
-  147 new_elseif_list: new_elseif_list . "elseif (T_ELSEIF)" '(' expr ')' ':' @35 inner_statement_list
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list . new_else_single "endif (T_ENDIF)" ';'
+  147 new_elseif_list: new_elseif_list . "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 inner_statement_list
 
     "elseif (T_ELSEIF)"  shift, and go to state 862
     "else (T_ELSE)"      shift, and go to state 863
@@ -21927,7 +21927,7 @@ state 820
 
 state 821
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" . '(' expr ')' @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" . '(' expr ')' $@34 statement
 
     '('  shift, and go to state 865
 
@@ -22036,14 +22036,14 @@ state 822
 
 state 823
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 elseif_list else_single .
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 elseif_list else_single .
 
     $default  reduce using rule 38 (unticked_statement)
 
 
 state 824
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr ')' ';' .
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr ')' ';' .
 
     $default  reduce using rule 47 (unticked_statement)
 
@@ -22057,14 +22057,14 @@ state 825
 
 state 826
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr . ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr . ')' $@15 for_statement
 
     ')'  shift, and go to state 868
 
 
 state 827
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 . foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 . foreach_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -22168,7 +22168,7 @@ state 827
 
 state 828
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 . foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 . foreach_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -22293,11 +22293,11 @@ state 831
 
 state 832
 
-  135 case_list: case_list "case (T_CASE)" expr . case_separator @32 inner_statement_list
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  135 case_list: case_list "case (T_CASE)" expr . case_separator $@32 inner_statement_list
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -22319,8 +22319,8 @@ state 832
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -22370,11 +22370,11 @@ state 834
 
 state 835
 
-  137 case_list: case_list "default (T_DEFAULT)" case_separator . @33 inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" case_separator . $@33 inner_statement_list
 
-    $default  reduce using rule 136 (@33)
+    $default  reduce using rule 136 ($@33)
 
-    @33  go to state 875
+    $@33  go to state 875
 
 
 state 836
@@ -22393,11 +22393,11 @@ state 837
 
 state 838
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name . @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name . $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 78 (@24)
+    $default  reduce using rule 78 ($@24)
 
-    @24  go to state 876
+    $@24  go to state 876
 
 
 state 839
@@ -22411,7 +22411,7 @@ state 839
 
 state 840
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property @67 method_or_not .
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property $@67 method_or_not .
 
     $default  reduce using rule 435 (variable_property)
 
@@ -22514,7 +22514,7 @@ state 847
 
 state 848
 
-  186 class_statement: variable_modifiers @36 class_variable_declaration . ';'
+  186 class_statement: variable_modifiers $@36 class_variable_declaration . ';'
   226 class_variable_declaration: class_variable_declaration . ',' "variable (T_VARIABLE)"
   227                           | class_variable_declaration . ',' "variable (T_VARIABLE)" '=' static_scalar
 
@@ -22524,7 +22524,7 @@ state 848
 
 state 849
 
-  190 class_statement: method_modifiers function is_reference . "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference . "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
     "identifier (T_STRING)"  shift, and go to state 892
 
@@ -22538,14 +22538,14 @@ state 850
 
 state 851
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list . '}'
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 894
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 852
@@ -22574,14 +22574,14 @@ state 854
 
 state 855
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   333 expr_without_variable: function is_reference '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 898
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 856
@@ -22635,7 +22635,7 @@ state 858
 
 state 859
 
-  439 method: '(' @68 function_call_parameter_list ')' .
+  439 method: '(' $@68 function_call_parameter_list ')' .
 
     $default  reduce using rule 439 (method)
 
@@ -22656,7 +22656,7 @@ state 861
 
 state 862
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" . '(' expr ')' ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" . '(' expr ')' ':' $@35 inner_statement_list
 
     '('  shift, and go to state 901
 
@@ -22670,14 +22670,14 @@ state 863
 
 state 864
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single . "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single . "endif (T_ENDIF)" ';'
 
     "endif (T_ENDIF)"  shift, and go to state 903
 
 
 state 865
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' . expr ')' @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' . expr ')' $@34 statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -22772,11 +22772,11 @@ state 867
 
 state 868
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' . @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' . $@15 for_statement
 
-    $default  reduce using rule 50 (@15)
+    $default  reduce using rule 50 ($@15)
 
-    @15  go to state 905
+    $@15  go to state 905
 
 
 state 869
@@ -22797,14 +22797,14 @@ state 870
 
 state 871
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement .
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement .
 
     $default  reduce using rule 72 (unticked_statement)
 
 
 state 872
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement .
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement .
 
     $default  reduce using rule 69 (unticked_statement)
 
@@ -22818,16 +22818,16 @@ state 873
 
 state 874
 
-  135 case_list: case_list "case (T_CASE)" expr case_separator . @32 inner_statement_list
+  135 case_list: case_list "case (T_CASE)" expr case_separator . $@32 inner_statement_list
 
-    $default  reduce using rule 134 (@32)
+    $default  reduce using rule 134 ($@32)
 
-    @32  go to state 907
+    $@32  go to state 907
 
 
 state 875
 
-  137 case_list: case_list "default (T_DEFAULT)" case_separator @33 . inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" case_separator $@33 . inner_statement_list
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -22836,21 +22836,21 @@ state 875
 
 state 876
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 . "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 . "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     "variable (T_VARIABLE)"  shift, and go to state 909
 
 
 state 877
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 910
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 878
@@ -22991,18 +22991,18 @@ state 890
 
 state 891
 
-  186 class_statement: variable_modifiers @36 class_variable_declaration ';' .
+  186 class_statement: variable_modifiers $@36 class_variable_declaration ';' .
 
     $default  reduce using rule 186 (class_statement)
 
 
 state 892
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" . @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" . $@37 '(' parameter_list ')' method_body
 
-    $default  reduce using rule 189 (@37)
+    $default  reduce using rule 189 ($@37)
 
-    @37  go to state 920
+    $@37  go to state 920
 
 
 state 893
@@ -23039,7 +23039,7 @@ state 893
 
 state 894
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}' .
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}' .
 
     $default  reduce using rule 99 (unticked_function_declaration_statement)
 
@@ -23115,7 +23115,7 @@ state 900
 
 state 901
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' . expr ')' ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' . expr ')' ':' $@35 inner_statement_list
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -23205,18 +23205,18 @@ state 902
 
 state 903
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" . ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" . ';'
 
     ';'  shift, and go to state 927
 
 
 state 904
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr . ')' @34 statement
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr . ')' $@34 statement
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -23238,8 +23238,8 @@ state 904
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -23272,7 +23272,7 @@ state 904
 
 state 905
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 . for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 . for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -23376,19 +23376,19 @@ state 905
 
 state 906
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   124 foreach_statement: ':' inner_statement_list . "endforeach (T_ENDFOREACH)" ';'
 
     "endforeach (T_ENDFOREACH)"  shift, and go to state 932
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 907
 
-  135 case_list: case_list "case (T_CASE)" expr case_separator @32 . inner_statement_list
+  135 case_list: case_list "case (T_CASE)" expr case_separator $@32 . inner_statement_list
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -23397,21 +23397,21 @@ state 907
 
 state 908
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-  137 case_list: case_list "default (T_DEFAULT)" case_separator @33 inner_statement_list .
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+  137 case_list: case_list "default (T_DEFAULT)" case_separator $@33 inner_statement_list .
 
     "endswitch (T_ENDSWITCH)"  reduce using rule 137 (case_list)
     "case (T_CASE)"            reduce using rule 137 (case_list)
     "default (T_DEFAULT)"      reduce using rule 137 (case_list)
     '}'                        reduce using rule 137 (case_list)
-    $default                   reduce using rule 26 (@4)
+    $default                   reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 909
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" . ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" . ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     ')'  shift, and go to state 934
 
@@ -23508,7 +23508,7 @@ state 919
 
 state 920
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 . '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 . '(' parameter_list ')' method_body
 
     '('  shift, and go to state 941
 
@@ -23543,11 +23543,11 @@ state 924
 
 state 925
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr . ')' ':' @35 inner_statement_list
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr . ')' ':' $@35 inner_statement_list
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -23569,8 +23569,8 @@ state 925
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -23603,29 +23603,29 @@ state 925
 
 state 926
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   151 new_else_single: "else (T_ELSE)" ':' inner_statement_list .
 
     "endif (T_ENDIF)"  reduce using rule 151 (new_else_single)
-    $default           reduce using rule 26 (@4)
+    $default           reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 927
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';' .
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';' .
 
     $default  reduce using rule 41 (unticked_statement)
 
 
 state 928
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' . @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' . $@34 statement
 
-    $default  reduce using rule 143 (@34)
+    $default  reduce using rule 143 ($@34)
 
-    @34  go to state 944
+    $@34  go to state 944
 
 
 state 929
@@ -23646,7 +23646,7 @@ state 930
 
 state 931
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement .
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement .
 
     $default  reduce using rule 51 (unticked_statement)
 
@@ -23660,25 +23660,25 @@ state 932
 
 state 933
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-  135 case_list: case_list "case (T_CASE)" expr case_separator @32 inner_statement_list .
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+  135 case_list: case_list "case (T_CASE)" expr case_separator $@32 inner_statement_list .
 
     "endswitch (T_ENDSWITCH)"  reduce using rule 135 (case_list)
     "case (T_CASE)"            reduce using rule 135 (case_list)
     "default (T_DEFAULT)"      reduce using rule 135 (case_list)
     '}'                        reduce using rule 135 (case_list)
-    $default                   reduce using rule 26 (@4)
+    $default                   reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 934
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' . @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' . $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 79 (@25)
+    $default  reduce using rule 79 ($@25)
 
-    @25  go to state 947
+    $@25  go to state 947
 
 
 state 935
@@ -23755,7 +23755,7 @@ state 940
 
 state 941
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' . parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' . parameter_list ')' method_body
 
     "identifier (T_STRING)"    shift, and go to state 116
     "array (T_ARRAY)"          shift, and go to state 608
@@ -23782,14 +23782,14 @@ state 942
 
 state 943
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' . ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' . ':' $@35 inner_statement_list
 
     ':'  shift, and go to state 952
 
 
 state 944
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' @34 . statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' $@34 . statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -23891,14 +23891,14 @@ state 944
 
 state 945
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   122 for_statement: ':' inner_statement_list . "endfor (T_ENDFOR)" ';'
 
     "endfor (T_ENDFOR)"  shift, and go to state 954
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 946
@@ -23910,7 +23910,7 @@ state 946
 
 state 947
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 . '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 . '{' inner_statement_list '}' $@26 additional_catches
 
     '{'  shift, and go to state 955
 
@@ -23943,23 +23943,23 @@ state 950
 
 state 951
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list . ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list . ')' method_body
 
     ')'  shift, and go to state 957
 
 
 state 952
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' . @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' . $@35 inner_statement_list
 
-    $default  reduce using rule 146 (@35)
+    $default  reduce using rule 146 ($@35)
 
-    @35  go to state 958
+    $@35  go to state 958
 
 
 state 953
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' @34 statement .
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' $@34 statement .
 
     $default  reduce using rule 144 (elseif_list)
 
@@ -23973,7 +23973,7 @@ state 954
 
 state 955
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' . inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' . inner_statement_list '}' $@26 additional_catches
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -23989,7 +23989,7 @@ state 956
 
 state 957
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' . method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' . method_body
 
     ';'  shift, and go to state 961
     '{'  shift, and go to state 962
@@ -23999,7 +23999,7 @@ state 957
 
 state 958
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' @35 . inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 . inner_statement_list
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -24015,14 +24015,14 @@ state 959
 
 state 960
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list . '}' @26 additional_catches
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list . '}' $@26 additional_catches
 
     '}'  shift, and go to state 965
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 961
@@ -24043,48 +24043,48 @@ state 962
 
 state 963
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body .
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body .
 
     $default  reduce using rule 190 (class_statement)
 
 
 state 964
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' @35 inner_statement_list .
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 inner_statement_list .
 
     "elseif (T_ELSEIF)"  reduce using rule 147 (new_elseif_list)
     "else (T_ELSE)"      reduce using rule 147 (new_elseif_list)
     "endif (T_ENDIF)"    reduce using rule 147 (new_elseif_list)
-    $default             reduce using rule 26 (@4)
+    $default             reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 965
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' . @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' . $@26 additional_catches
 
-    $default  reduce using rule 80 (@26)
+    $default  reduce using rule 80 ($@26)
 
-    @26  go to state 967
+    $@26  go to state 967
 
 
 state 966
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   213 method_body: '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 968
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 967
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 . additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 . additional_catches
 
     "catch (T_CATCH)"  shift, and go to state 969
 
@@ -24104,14 +24104,14 @@ state 968
 
 state 969
 
-   90 additional_catch: "catch (T_CATCH)" . '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" . '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     '('  shift, and go to state 973
 
 
 state 970
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches .
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches .
 
     $default  reduce using rule 81 (unticked_statement)
 
@@ -24137,7 +24137,7 @@ state 972
 
 state 973
 
-   90 additional_catch: "catch (T_CATCH)" '(' . fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' . fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     "identifier (T_STRING)"    shift, and go to state 116
     "namespace (T_NAMESPACE)"  shift, and go to state 514
@@ -24156,7 +24156,7 @@ state 974
 
 state 975
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name . @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name . @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     $default  reduce using rule 88 (@27)
 
@@ -24165,37 +24165,37 @@ state 975
 
 state 976
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 . "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 . "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     "variable (T_VARIABLE)"  shift, and go to state 977
 
 
 state 977
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" . ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" . ')' $@28 '{' inner_statement_list '}'
 
     ')'  shift, and go to state 978
 
 
 state 978
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' . @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' . $@28 '{' inner_statement_list '}'
 
-    $default  reduce using rule 89 (@28)
+    $default  reduce using rule 89 ($@28)
 
-    @28  go to state 979
+    $@28  go to state 979
 
 
 state 979
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 . '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 . '{' inner_statement_list '}'
 
     '{'  shift, and go to state 980
 
 
 state 980
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' . inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' . inner_statement_list '}'
 
     $default  reduce using rule 28 (inner_statement_list)
 
@@ -24204,18 +24204,18 @@ state 980
 
 state 981
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list . '}'
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 982
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
 state 982
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}' .
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}' .
 
     $default  reduce using rule 90 (additional_catch)
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 40fb57455..03cf334db 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 14 17:46:56 2012 */
+/* Generated by re2c 0.13.5 on Wed Mar 27 23:52:29 2013 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -595,7 +595,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
 		CG(active_op_array) = original_active_op_array;
 		if (compilation_successful) {
 			pass_two(op_array TSRMLS_CC);
-			zend_release_labels(TSRMLS_C);
+			zend_release_labels(0 TSRMLS_CC);
 		} else {
 			efree(op_array);
 			retval = NULL;
@@ -770,7 +770,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
 			zend_do_return(NULL, 0 TSRMLS_CC);
 			CG(active_op_array) = original_active_op_array;
 			pass_two(op_array TSRMLS_CC);
-			zend_release_labels(TSRMLS_C);
+			zend_release_labels(0 TSRMLS_CC);
 			retval = op_array;
 		}
 	}
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index cc54557b3..97c938ebf 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -593,7 +593,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
 		CG(active_op_array) = original_active_op_array;
 		if (compilation_successful) {
 			pass_two(op_array TSRMLS_CC);
-			zend_release_labels(TSRMLS_C);
+			zend_release_labels(0 TSRMLS_CC);
 		} else {
 			efree(op_array);
 			retval = NULL;
@@ -768,7 +768,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
 			zend_do_return(NULL, 0 TSRMLS_CC);
 			CG(active_op_array) = original_active_op_array;
 			pass_two(op_array TSRMLS_CC);
-			zend_release_labels(TSRMLS_C);
+			zend_release_labels(0 TSRMLS_CC);
 			retval = op_array;
 		}
 	}
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 9bde2a0e1..2e9b5c653 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Nov 14 17:46:56 2012 */
+/* Generated by re2c 0.13.5 on Wed Mar 27 23:52:29 2013 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e5cdd1d1f..393475259 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2657,11 +2657,6 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 	if (fbc->type == ZEND_INTERNAL_FUNCTION) {
 		temp_variable *ret = &EX_T(opline->result.var);
 
-		MAKE_STD_ZVAL(ret->var.ptr);
-		ZVAL_NULL(ret->var.ptr);
-		ret->var.ptr_ptr = &ret->var.ptr;
-		ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
-
 		if (fbc->common.arg_info) {
 			zend_uint i=0;
 			zval **p = (zval**)EX(function_state).arguments;
@@ -2673,15 +2668,22 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 			}
 		}
 
-		if (!zend_execute_internal) {
-			/* saves one function call if zend_execute_internal is not used */
-			fbc->internal_function.handler(opline->extended_value, ret->var.ptr, (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) ? &ret->var.ptr : NULL, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
-		} else {
-			zend_execute_internal(EXECUTE_DATA, RETURN_VALUE_USED(opline) TSRMLS_CC);
-		}
+		if (EXPECTED(EG(exception) == NULL)) {
+			MAKE_STD_ZVAL(ret->var.ptr);
+			ZVAL_NULL(ret->var.ptr);
+			ret->var.ptr_ptr = &ret->var.ptr;
+			ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
 
-		if (!RETURN_VALUE_USED(opline)) {
-			zval_ptr_dtor(&ret->var.ptr);
+			if (!zend_execute_internal) {
+				/* saves one function call if zend_execute_internal is not used */
+				fbc->internal_function.handler(opline->extended_value, ret->var.ptr, (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) ? &ret->var.ptr : NULL, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
+			} else {
+				zend_execute_internal(EXECUTE_DATA, RETURN_VALUE_USED(opline) TSRMLS_CC);
+			}
+
+			if (!RETURN_VALUE_USED(opline)) {
+				zval_ptr_dtor(&ret->var.ptr);
+			}
 		}
 	} else if (fbc->type == ZEND_USER_FUNCTION) {
 		EX(original_return_value) = EG(return_value_ptr_ptr);
@@ -3232,7 +3234,7 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST)
 
 	zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC);
 	var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->result.var TSRMLS_CC);
-	Z_DELREF_PP(var_ptr);
+	zval_ptr_dtor(var_ptr);
 	*var_ptr = assignment_value;
 
 	CHECK_EXCEPTION();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 97e5a8e93..81d368883 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -621,11 +621,6 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 	if (fbc->type == ZEND_INTERNAL_FUNCTION) {
 		temp_variable *ret = &EX_T(opline->result.var);
 
-		MAKE_STD_ZVAL(ret->var.ptr);
-		ZVAL_NULL(ret->var.ptr);
-		ret->var.ptr_ptr = &ret->var.ptr;
-		ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
-
 		if (fbc->common.arg_info) {
 			zend_uint i=0;
 			zval **p = (zval**)EX(function_state).arguments;
@@ -637,15 +632,22 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 			}
 		}
 
-		if (!zend_execute_internal) {
-			/* saves one function call if zend_execute_internal is not used */
-			fbc->internal_function.handler(opline->extended_value, ret->var.ptr, (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) ? &ret->var.ptr : NULL, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
-		} else {
-			zend_execute_internal(execute_data, RETURN_VALUE_USED(opline) TSRMLS_CC);
-		}
+		if (EXPECTED(EG(exception) == NULL)) {
+			MAKE_STD_ZVAL(ret->var.ptr);
+			ZVAL_NULL(ret->var.ptr);
+			ret->var.ptr_ptr = &ret->var.ptr;
+			ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
 
-		if (!RETURN_VALUE_USED(opline)) {
-			zval_ptr_dtor(&ret->var.ptr);
+			if (!zend_execute_internal) {
+				/* saves one function call if zend_execute_internal is not used */
+				fbc->internal_function.handler(opline->extended_value, ret->var.ptr, (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) ? &ret->var.ptr : NULL, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
+			} else {
+				zend_execute_internal(execute_data, RETURN_VALUE_USED(opline) TSRMLS_CC);
+			}
+
+			if (!RETURN_VALUE_USED(opline)) {
+				zval_ptr_dtor(&ret->var.ptr);
+			}
 		}
 	} else if (fbc->type == ZEND_USER_FUNCTION) {
 		EX(original_return_value) = EG(return_value_ptr_ptr);
@@ -1372,7 +1374,7 @@ static int ZEND_FASTCALL  ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 
 	zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC);
 	var_ptr = _get_zval_ptr_ptr_cv_BP_VAR_W(EX_CVs(), opline->result.var TSRMLS_CC);
-	Z_DELREF_PP(var_ptr);
+	zval_ptr_dtor(var_ptr);
 	*var_ptr = assignment_value;
 
 	CHECK_EXCEPTION();