diff options
| author | Anatol Belski <ab@php.net> | 2015-07-21 12:27:50 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-21 12:27:50 +0200 |
| commit | b148ef44965651fcbe93e8ee35a14edc087ef17c (patch) | |
| tree | f5c53fb3d448d0174610d077e0bf3c8bd76834b2 /sapi/phpdbg/phpdbg_lexer.l | |
| parent | ad8a73dd55c087de465ad80e8715611693bb1460 (diff) | |
| parent | 6065b29fe41f09e01dd06ba21980e0344f13230c (diff) | |
| download | php-git-b148ef44965651fcbe93e8ee35a14edc087ef17c.tar.gz | |
Merge branch 'master' into PHP-7.0.0
* master: (204 commits)
Reverted ad4533fdbabcc3e545277e30023b2fdce16297a0
update UPGRADING
updated NEWS
fix comment
libwebp support for linux
Replaced libvpx by libwebp (first draft; Windows only)
update news with bug #70022
Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.
Add tests for json_last_error()/json_last_error_msg() failures
updated NEWS
updated NEWS
Exclude opcache from a few opcode related tests
updated NEWS
updated NEWS
Fix #66387: Stack overflow with imagefilltoborder
Fix various Windows issues (e.g. dir separators)
Remove bogus exception_save() from FETCH_CLASS
Fix readline/libedit build
Do not use readline when not having a tty This is important for e.g. run-tests.php
Add show_unexecuted option to phpdbg_end_oplog()
...
Conflicts:
Zend/tests/temporary_cleaning_001.phpt
Zend/tests/temporary_cleaning_003.phpt
Zend/tests/temporary_cleaning_004.phpt
Zend/tests/temporary_cleaning_005.phpt
Zend/zend_compile.c
Zend/zend_compile.h
sapi/phpdbg/phpdbg_opcode.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_lexer.l')
| -rw-r--r-- | sapi/phpdbg/phpdbg_lexer.l | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l index b9cdc65d22..7fca70f57a 100644 --- a/sapi/phpdbg/phpdbg_lexer.l +++ b/sapi/phpdbg/phpdbg_lexer.l @@ -14,6 +14,7 @@ #define YYGETCONDITION() LEX(state) #define YYCURSOR LEX(cursor) #define YYMARKER LEX(marker) +#define YYCTXMARKER LEX(ctxmarker) #define yyleng LEX(len) #define yytext ((char*) LEX(text)) #undef YYDEBUG @@ -94,7 +95,7 @@ INPUT [^\n\000]+ <NORMAL>[:]{2} { return T_DCOLON; } -<NORMAL>[:]{1} { +<NORMAL>[:]{1}/[^\\] { return T_COLON; } |