diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-03-28 08:44:05 +0100 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-03-28 08:57:19 +0100 |
| commit | 68990224be30c18e833efae5b5d25ccc5b193101 (patch) | |
| tree | a7659f0938f1883003b893ce9d61be67d83e3e91 /Zend/zend_language_scanner_defs.h | |
| parent | c195596280c2e48f68b6c1c97215b8c4417e2274 (diff) | |
| parent | 067603106eba10e7648ccfe11834b10580fde2a9 (diff) | |
| download | php-git-68990224be30c18e833efae5b5d25ccc5b193101.tar.gz | |
Merge branch '5.3' into 5.4
Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
Diffstat (limited to 'Zend/zend_language_scanner_defs.h')
| -rw-r--r-- | Zend/zend_language_scanner_defs.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h index 06841c2be7..015a903ded 100644 --- a/Zend/zend_language_scanner_defs.h +++ b/Zend/zend_language_scanner_defs.h @@ -1,15 +1,15 @@ -/* Generated by re2c 0.13.5 on Wed Mar 28 01:54:21 2012 */
-#line 3 "Zend/zend_language_scanner_defs.h"
-
-enum YYCONDTYPE {
- yycST_IN_SCRIPTING,
- yycST_LOOKING_FOR_PROPERTY,
- yycST_BACKQUOTE,
- yycST_DOUBLE_QUOTES,
- yycST_HEREDOC,
- yycST_LOOKING_FOR_VARNAME,
- yycST_VAR_OFFSET,
- yycINITIAL,
- yycST_END_HEREDOC,
- yycST_NOWDOC,
-};
+/* Generated by re2c 0.13.5 on Thu Mar 1 21:27:30 2012 */ +#line 3 "Zend/zend_language_scanner_defs.h" + +enum YYCONDTYPE { + yycST_IN_SCRIPTING, + yycST_LOOKING_FOR_PROPERTY, + yycST_BACKQUOTE, + yycST_DOUBLE_QUOTES, + yycST_HEREDOC, + yycST_LOOKING_FOR_VARNAME, + yycST_VAR_OFFSET, + yycINITIAL, + yycST_END_HEREDOC, + yycST_NOWDOC, +}; |