Skip to content

Commit 31be7b4

Browse files
nikicnikic
committed
Update php-yacc, remove unused tokens
1 parent f6bf041 commit 31be7b4

File tree

5 files changed

+90
-108
lines changed

5 files changed

+90
-108
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0",
21-
"ircmaxell/php-yacc": "0.0.5"
21+
"ircmaxell/php-yacc": "^0.0.6"
2222
},
2323
"extra": {
2424
"branch-alias": {

‎grammar/tokens.y

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
%token T_VARIABLE
4242
%token T_NUM_STRING
4343
%token T_INLINE_HTML
44-
%token T_CHARACTER
45-
%token T_BAD_CHARACTER
4644
%token T_ENCAPSED_AND_WHITESPACE
4745
%token T_CONSTANT_ENCAPSED_STRING
4846
%token T_ECHO
@@ -97,12 +95,6 @@
9795
%token T_FUNC_C
9896
%token T_LINE
9997
%token T_FILE
100-
%token T_COMMENT
101-
%token T_DOC_COMMENT
102-
%token T_OPEN_TAG
103-
%token T_OPEN_TAG_WITH_ECHO
104-
%token T_CLOSE_TAG
105-
%token T_WHITESPACE
10698
%token T_START_HEREDOC
10799
%token T_END_HEREDOC
108100
%token T_DOLLAR_OPEN_CURLY_BRACES

‎lib/PhpParser/Parser/Php5.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class Php5 extends \PhpParser\ParserAbstract
1919
{
20-
protected $tokenToSymbolMapSize = 398;
20+
protected $tokenToSymbolMapSize = 390;
2121
protected $actionTableSize = 1061;
2222
protected $gotoTableSize = 580;
2323

@@ -227,15 +227,14 @@ class Php5 extends \PhpParser\ParserAbstract
227227
27, 28, 31, 32, 33, 37, 38, 39, 40, 41,
228228
43, 45, 46, 47, 55, 57, 58, 59, 60, 61,
229229
62, 63, 64, 65, 67, 69, 70, 71, 72, 73,
230-
74, 75, 76, 77, 78, 79, 80, 81, 82, 163,
231-
163, 83, 84, 85, 86, 87, 88, 89, 90, 91,
232-
92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
233-
102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
234-
112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
235-
122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
236-
132, 133, 134, 135, 136, 137, 138, 139, 140, 163,
237-
163, 163, 163, 163, 163, 141, 142, 143, 144, 145,
238-
146, 147, 148, 149, 150, 151, 152, 153
230+
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
231+
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
232+
94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
233+
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
234+
114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
235+
124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
236+
134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
237+
144, 145, 146, 147, 148, 149, 150, 151, 152, 153
239238
);
240239

241240
protected $action = array(

‎lib/PhpParser/Parser/Php7.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
class Php7 extends \PhpParser\ParserAbstract
1919
{
20-
protected $tokenToSymbolMapSize = 398;
20+
protected $tokenToSymbolMapSize = 390;
2121
protected $actionTableSize = 1009;
2222
protected $gotoTableSize = 527;
2323

@@ -227,15 +227,14 @@ class Php7 extends \PhpParser\ParserAbstract
227227
27, 28, 31, 32, 33, 37, 38, 39, 40, 41,
228228
43, 45, 46, 47, 55, 57, 58, 59, 60, 61,
229229
62, 63, 64, 65, 67, 69, 70, 71, 72, 73,
230-
74, 75, 76, 77, 78, 79, 80, 81, 82, 163,
231-
163, 83, 84, 85, 86, 87, 88, 89, 90, 91,
232-
92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
233-
102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
234-
112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
235-
122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
236-
132, 133, 134, 135, 136, 137, 138, 139, 140, 163,
237-
163, 163, 163, 163, 163, 141, 142, 143, 144, 145,
238-
146, 147, 148, 149, 150, 151, 152, 153
230+
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
231+
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
232+
94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
233+
104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
234+
114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
235+
124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
236+
134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
237+
144, 145, 146, 147, 148, 149, 150, 151, 152, 153
239238
);
240239

241240
protected $action = array(

‎lib/PhpParser/Parser/Tokens.php

Lines changed: 71 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -68,83 +68,75 @@ final class Tokens
6868
const T_VARIABLE = 316;
6969
const T_NUM_STRING = 317;
7070
const T_INLINE_HTML = 318;
71-
const T_CHARACTER = 319;
72-
const T_BAD_CHARACTER = 320;
73-
const T_ENCAPSED_AND_WHITESPACE = 321;
74-
const T_CONSTANT_ENCAPSED_STRING = 322;
75-
const T_ECHO = 323;
76-
const T_DO = 324;
77-
const T_WHILE = 325;
78-
const T_ENDWHILE = 326;
79-
const T_FOR = 327;
80-
const T_ENDFOR = 328;
81-
const T_FOREACH = 329;
82-
const T_ENDFOREACH = 330;
83-
const T_DECLARE = 331;
84-
const T_ENDDECLARE = 332;
85-
const T_AS = 333;
86-
const T_SWITCH = 334;
87-
const T_MATCH = 335;
88-
const T_ENDSWITCH = 336;
89-
const T_CASE = 337;
90-
const T_DEFAULT = 338;
91-
const T_BREAK = 339;
92-
const T_CONTINUE = 340;
93-
const T_GOTO = 341;
94-
const T_FUNCTION = 342;
95-
const T_FN = 343;
96-
const T_CONST = 344;
97-
const T_RETURN = 345;
98-
const T_TRY = 346;
99-
const T_CATCH = 347;
100-
const T_FINALLY = 348;
101-
const T_THROW = 349;
102-
const T_USE = 350;
103-
const T_INSTEADOF = 351;
104-
const T_GLOBAL = 352;
105-
const T_STATIC = 353;
106-
const T_ABSTRACT = 354;
107-
const T_FINAL = 355;
108-
const T_PRIVATE = 356;
109-
const T_PROTECTED = 357;
110-
const T_PUBLIC = 358;
111-
const T_VAR = 359;
112-
const T_UNSET = 360;
113-
const T_ISSET = 361;
114-
const T_EMPTY = 362;
115-
const T_HALT_COMPILER = 363;
116-
const T_CLASS = 364;
117-
const T_TRAIT = 365;
118-
const T_INTERFACE = 366;
119-
const T_EXTENDS = 367;
120-
const T_IMPLEMENTS = 368;
121-
const T_OBJECT_OPERATOR = 369;
122-
const T_LIST = 370;
123-
const T_ARRAY = 371;
124-
const T_CALLABLE = 372;
125-
const T_CLASS_C = 373;
126-
const T_TRAIT_C = 374;
127-
const T_METHOD_C = 375;
128-
const T_FUNC_C = 376;
129-
const T_LINE = 377;
130-
const T_FILE = 378;
131-
const T_COMMENT = 379;
132-
const T_DOC_COMMENT = 380;
133-
const T_OPEN_TAG = 381;
134-
const T_OPEN_TAG_WITH_ECHO = 382;
135-
const T_CLOSE_TAG = 383;
136-
const T_WHITESPACE = 384;
137-
const T_START_HEREDOC = 385;
138-
const T_END_HEREDOC = 386;
139-
const T_DOLLAR_OPEN_CURLY_BRACES = 387;
140-
const T_CURLY_OPEN = 388;
141-
const T_PAAMAYIM_NEKUDOTAYIM = 389;
142-
const T_NAMESPACE = 390;
143-
const T_NS_C = 391;
144-
const T_DIR = 392;
145-
const T_NS_SEPARATOR = 393;
146-
const T_ELLIPSIS = 394;
147-
const T_NAME_FULLY_QUALIFIED = 395;
148-
const T_NAME_QUALIFIED = 396;
149-
const T_NAME_RELATIVE = 397;
71+
const T_ENCAPSED_AND_WHITESPACE = 319;
72+
const T_CONSTANT_ENCAPSED_STRING = 320;
73+
const T_ECHO = 321;
74+
const T_DO = 322;
75+
const T_WHILE = 323;
76+
const T_ENDWHILE = 324;
77+
const T_FOR = 325;
78+
const T_ENDFOR = 326;
79+
const T_FOREACH = 327;
80+
const T_ENDFOREACH = 328;
81+
const T_DECLARE = 329;
82+
const T_ENDDECLARE = 330;
83+
const T_AS = 331;
84+
const T_SWITCH = 332;
85+
const T_MATCH = 333;
86+
const T_ENDSWITCH = 334;
87+
const T_CASE = 335;
88+
const T_DEFAULT = 336;
89+
const T_BREAK = 337;
90+
const T_CONTINUE = 338;
91+
const T_GOTO = 339;
92+
const T_FUNCTION = 340;
93+
const T_FN = 341;
94+
const T_CONST = 342;
95+
const T_RETURN = 343;
96+
const T_TRY = 344;
97+
const T_CATCH = 345;
98+
const T_FINALLY = 346;
99+
const T_THROW = 347;
100+
const T_USE = 348;
101+
const T_INSTEADOF = 349;
102+
const T_GLOBAL = 350;
103+
const T_STATIC = 351;
104+
const T_ABSTRACT = 352;
105+
const T_FINAL = 353;
106+
const T_PRIVATE = 354;
107+
const T_PROTECTED = 355;
108+
const T_PUBLIC = 356;
109+
const T_VAR = 357;
110+
const T_UNSET = 358;
111+
const T_ISSET = 359;
112+
const T_EMPTY = 360;
113+
const T_HALT_COMPILER = 361;
114+
const T_CLASS = 362;
115+
const T_TRAIT = 363;
116+
const T_INTERFACE = 364;
117+
const T_EXTENDS = 365;
118+
const T_IMPLEMENTS = 366;
119+
const T_OBJECT_OPERATOR = 367;
120+
const T_LIST = 368;
121+
const T_ARRAY = 369;
122+
const T_CALLABLE = 370;
123+
const T_CLASS_C = 371;
124+
const T_TRAIT_C = 372;
125+
const T_METHOD_C = 373;
126+
const T_FUNC_C = 374;
127+
const T_LINE = 375;
128+
const T_FILE = 376;
129+
const T_START_HEREDOC = 377;
130+
const T_END_HEREDOC = 378;
131+
const T_DOLLAR_OPEN_CURLY_BRACES = 379;
132+
const T_CURLY_OPEN = 380;
133+
const T_PAAMAYIM_NEKUDOTAYIM = 381;
134+
const T_NAMESPACE = 382;
135+
const T_NS_C = 383;
136+
const T_DIR = 384;
137+
const T_NS_SEPARATOR = 385;
138+
const T_ELLIPSIS = 386;
139+
const T_NAME_FULLY_QUALIFIED = 387;
140+
const T_NAME_QUALIFIED = 388;
141+
const T_NAME_RELATIVE = 389;
150142
}

0 commit comments

Comments
 (0)