diff options
| author | Anatol Belski <ab@php.net> | 2014-10-24 22:28:32 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-24 22:28:32 +0200 |
| commit | c51a42076c0f92988115a25068b8ab01dfb8a6ff (patch) | |
| tree | 87e1a4f1eec114067ca1d66beb02fb7ddd477cd6 /sapi/phpdbg/phpdbg_parser.h | |
| parent | 9cbdf3e66a76895861b6f39e1b1ef5cc46d76654 (diff) | |
| parent | 1b4fd5825a820873e4ed0f326bcb890e660dc39c (diff) | |
| download | php-git-c51a42076c0f92988115a25068b8ab01dfb8a6ff.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (214 commits)
fix datatype mismatch warnings
fix datatype mismatches
fix datatype mismatches
fix datatype mismatches
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warning
fix datatype mismatches
fix datatype mismatch warnings
Re-add phpdbg to travis
Added some NEWS
Make xml valid (missing space between attrs)
Fix info classes file name in xml
Add note about <eval> tag for errors in xml.md
Name the tag <eval> if the error id during ev cmd
Do not print out xml as PHP print...
Fix output to wrong function
Fixed parameter order on %.*s
Too much copypaste...
...
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sapi/phpdbg/phpdbg_parser.h b/sapi/phpdbg/phpdbg_parser.h index b3aadb9c62..e8ab7a6503 100644 --- a/sapi/phpdbg/phpdbg_parser.h +++ b/sapi/phpdbg/phpdbg_parser.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.2. */ +/* A Bison parser, made by GNU Bison 2.6. */ /* Bison interface for Yacc-like parsers in C @@ -40,8 +40,9 @@ extern int phpdbg_debug; #endif /* "%code requires" blocks. */ -/* Line 2055 of yacc.c */ -#line 31 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y" + +/* Line 2056 of yacc.c */ +#line 31 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_parser.y" #include "phpdbg.h" #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -50,8 +51,9 @@ typedef void* yyscan_t; #endif -/* Line 2055 of yacc.c */ -#line 55 "sapi/phpdbg/phpdbg_parser.h" + +/* Line 2056 of yacc.c */ +#line 57 "sapi/phpdbg/phpdbg_parser.h" /* Tokens. */ #ifndef YYTOKENTYPE @@ -76,7 +78,8 @@ typedef void* yyscan_t; T_OPCODE = 272, T_ID = 273, T_INPUT = 274, - T_UNEXPECTED = 275 + T_UNEXPECTED = 275, + T_REQ_ID = 276 }; #endif /* Tokens. */ @@ -98,6 +101,7 @@ typedef void* yyscan_t; #define T_ID 273 #define T_INPUT 274 #define T_UNEXPECTED 275 +#define T_REQ_ID 276 |