cvs: ZendEngine2(PHP_5_3) / zend_ini_scanner.c zend_ini_scanner_defs.h zend_language_scanner.c zend_language_scanner_defs.h

rasmus		Sat Feb 14 21:20:17 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_ini_scanner.c zend_ini_scanner_defs.h 
                	zend_language_scanner.c zend_language_scanner_defs.h 
  Log:
  Unmangle
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.c?r1=1.1.2.16&r2=1.1.2.17&diff_format=u
Index: ZendEngine2/zend_ini_scanner.c
diff -u ZendEngine2/zend_ini_scanner.c:1.1.2.16 ZendEngine2/zend_ini_scanner.c:1.1.2.17
--- ZendEngine2/zend_ini_scanner.c:1.1.2.16	Sat Feb 14 21:08:00 2009
+++ ZendEngine2/zend_ini_scanner.c	Sat Feb 14 21:20:14 2009
@@ -1,16 +1,4 @@
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */
-=======
-/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */
->>>>>>> 1.1.2.10
-=======
-/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
->>>>>>> 1.1.2.12
-=======
 /* Generated by re2c 0.13.6.dev on Mon Feb  2 19:23:18 2009 */
->>>>>>> 1.1.2.15
 #line 1 "Zend/zend_ini_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -34,19 +22,7 @@
    +----------------------------------------------------------------------+
 */
 
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-<<<<<<< zend_ini_scanner.c
-/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
-=======
-/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
->>>>>>> 1.1.2.10
-=======
-/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
->>>>>>> 1.1.2.12
-=======
-/* $Id: zend_ini_scanner.c,v 1.1.2.16 2009/02/14 21:08:00 rasmus Exp $ */
->>>>>>> 1.1.2.15
+/* $Id: zend_ini_scanner.c,v 1.1.2.17 2009/02/14 21:20:14 rasmus Exp $ */
 
 #include <errno.h>
 #include "zend.h"
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.1.2.13&r2=1.1.2.14&diff_format=u
Index: ZendEngine2/zend_ini_scanner_defs.h
diff -u ZendEngine2/zend_ini_scanner_defs.h:1.1.2.13 ZendEngine2/zend_ini_scanner_defs.h:1.1.2.14
--- ZendEngine2/zend_ini_scanner_defs.h:1.1.2.13	Sat Feb 14 21:08:01 2009
+++ ZendEngine2/zend_ini_scanner_defs.h	Sat Feb 14 21:20:14 2009
@@ -1,16 +1,4 @@
-<<<<<<< zend_ini_scanner_defs.h
-<<<<<<< zend_ini_scanner_defs.h
-<<<<<<< zend_ini_scanner_defs.h
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:39 2008 */
-=======
-/* Generated by re2c 0.13.5 on Wed Sep 10 18:54:04 2008 */
->>>>>>> 1.1.2.8
-=======
-/* Generated by re2c 0.13.5 on Wed Nov  5 22:35:51 2008 */
->>>>>>> 1.1.2.10
-=======
 /* Generated by re2c 0.13.6.dev on Mon Feb  2 19:23:18 2009 */
->>>>>>> 1.1.2.12
 #line 3 "Zend/zend_ini_scanner_defs.h"
 
 enum YYCONDTYPE {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.1.2.32&r2=1.1.2.33&diff_format=u
Index: ZendEngine2/zend_language_scanner.c
diff -u ZendEngine2/zend_language_scanner.c:1.1.2.32 ZendEngine2/zend_language_scanner.c:1.1.2.33
--- ZendEngine2/zend_language_scanner.c:1.1.2.32	Sat Feb 14 21:08:01 2009
+++ ZendEngine2/zend_language_scanner.c	Sat Feb 14 21:20:14 2009
@@ -1,12 +1,4 @@
-<<<<<<< zend_language_scanner.c
-<<<<<<< zend_language_scanner.c
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */
-=======
-/* Generated by re2c 0.13.6.dev on Tue Nov  4 01:40:34 2008 */
->>>>>>> 1.1.2.28
-=======
 /* Generated by re2c 0.13.5 on Fri Jan  9 12:08:49 2009 */
->>>>>>> 1.1.2.31
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -31,15 +23,7 @@
    +----------------------------------------------------------------------+
 */
 
-<<<<<<< zend_language_scanner.c
-<<<<<<< zend_language_scanner.c
-/* $Id: zend_language_scanner.c,v 1.1.2.32 2009/02/14 21:08:01 rasmus Exp $ */
-=======
-/* $Id: zend_language_scanner.c,v 1.1.2.32 2009/02/14 21:08:01 rasmus Exp $ */
->>>>>>> 1.1.2.28
-=======
-/* $Id: zend_language_scanner.c,v 1.1.2.32 2009/02/14 21:08:01 rasmus Exp $ */
->>>>>>> 1.1.2.31
+/* $Id: zend_language_scanner.c,v 1.1.2.33 2009/02/14 21:20:14 rasmus Exp $ */
 
 #if 0
 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner_defs.h?r1=1.1.2.22&r2=1.1.2.23&diff_format=u
Index: ZendEngine2/zend_language_scanner_defs.h
diff -u ZendEngine2/zend_language_scanner_defs.h:1.1.2.22 ZendEngine2/zend_language_scanner_defs.h:1.1.2.23
--- ZendEngine2/zend_language_scanner_defs.h:1.1.2.22	Sat Feb 14 21:08:02 2009
+++ ZendEngine2/zend_language_scanner_defs.h	Sat Feb 14 21:20:16 2009
@@ -1,12 +1,4 @@
-<<<<<<< zend_language_scanner_defs.h
-<<<<<<< zend_language_scanner_defs.h
-/* Generated by re2c 0.13.5 on Fri Aug 29 13:01:13 2008 */
-=======
-/* Generated by re2c 0.13.6.dev on Tue Nov  4 01:40:34 2008 */
->>>>>>> 1.1.2.20
-=======
 /* Generated by re2c 0.13.5 on Fri Jan  9 12:08:49 2009 */
->>>>>>> 1.1.2.21
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {