Skip to content

Commit f49e9fd

Browse files
committed
Revert "Alias T_AMPERSAND"
This reverts commit bad3cab.
1 parent 5a2f384 commit f49e9fd

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

ext/tokenizer/tokenizer_data.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
171171
REGISTER_LONG_CONSTANT("T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG", T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG, CONST_CS | CONST_PERSISTENT);
172172
REGISTER_LONG_CONSTANT("T_BAD_CHARACTER", T_BAD_CHARACTER, CONST_CS | CONST_PERSISTENT);
173173
REGISTER_LONG_CONSTANT("T_DOUBLE_COLON", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);
174-
REGISTER_LONG_CONSTANT("T_AMPERSAND", T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG, CONST_CS | CONST_PERSISTENT);
175174
}
176175

177176
char *get_token_type_name(int token_type)
@@ -321,7 +320,7 @@ char *get_token_type_name(int token_type)
321320
case T_POW: return "T_POW";
322321
case T_POW_EQUAL: return "T_POW_EQUAL";
323322
case T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG: return "T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG";
324-
case T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG: return "T_AMPERSAND";
323+
case T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG: return "T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG";
325324
case T_BAD_CHARACTER: return "T_BAD_CHARACTER";
326325

327326
}

ext/tokenizer/tokenizer_data_gen.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
$result .= "\tREGISTER_LONG_CONSTANT(\"$tokenName\", $tokenName, CONST_CS | CONST_PERSISTENT);\n";
5959
}
6060
$result .= "\tREGISTER_LONG_CONSTANT(\"T_DOUBLE_COLON\", T_PAAMAYIM_NEKUDOTAYIM, CONST_CS | CONST_PERSISTENT);\n";
61-
$result .= "\tREGISTER_LONG_CONSTANT(\"T_AMPERSAND\", T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG, CONST_CS | CONST_PERSISTENT);\n";
6261

6362
$result .= <<<CODE
6463
}
@@ -76,8 +75,6 @@
7675
}
7776
if ($tokenName === 'T_PAAMAYIM_NEKUDOTAYIM') {
7877
$result .= "\t\tcase T_PAAMAYIM_NEKUDOTAYIM: return \"T_DOUBLE_COLON\";\n";
79-
} else if ($tokenName === 'T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG') {
80-
$result .= "\t\tcase T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG: return \"T_AMPERSAND\";\n";
8178
} else {
8279
$result .= "\t\tcase $tokenName: return \"$tokenName\";\n";
8380
}

0 commit comments

Comments
 (0)