[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2010-02-07 Thread Jani Taskinen 
jani Sun, 07 Feb 2010 11:42:52 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=294697

Log:
touch

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h
U   php/php-src/trunk/Zend/zend_ini_scanner.c
U   php/php-src/trunk/Zend/zend_ini_scanner_defs.h

Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c	2010-02-07 11:41:44 UTC (rev 294696)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c	2010-02-07 11:42:52 UTC (rev 294697)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Dec  8 12:24:52 2009 */
+/* Generated by re2c 0.13.5 on Sun Feb  7 13:25:37 2010 */
 #line 1 Zend/zend_ini_scanner.l
 /*
+--+
@@ -1273,7 +1273,7 @@
 		YYDEBUG(84, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych = ',') {
+		if (yych = '-') {
 			if (yych = ' ') {
 if (yych = '\n') {
 	if (yych = 0x08) goto yy86;
@@ -1284,29 +1284,30 @@
 	if (yych = ' ') goto yy88;
 }
 			} else {
-if (yych = '#') {
+if (yych = '$') {
 	if (yych == '') goto yy91;
+	if (yych = '$') goto yy93;
 } else {
-	if (yych = '$') goto yy93;
 	if (yych == '\'') goto yy94;
+	if (yych = '-') goto yy95;
 }
 			}
 		} else {
-			if (yych = '@') {
-if (yych = '/') {
-	if (yych = '-') goto yy95;
+			if (yych = 'Z') {
+if (yych = '9') {
 	if (yych = '.') goto yy96;
+	if (yych = '0') goto yy97;
 } else {
-	if (yych = '9') goto yy97;
 	if (yych == ';') goto yy89;
+	if (yych = 'A') goto yy99;
 }
 			} else {
-if (yych = '\\') {
-	if (yych = 'Z') goto yy99;
-	if (yych = '\\') goto yy101;
+if (yych = '^') {
+	if (yych = '[') goto yy86;
+	if (yych = '\\') goto yy101;
+	if (yych = ']') goto yy102;
 } else {
-	if (yych = ']') goto yy102;
-	if (yych = '`') goto yy86;
+	if (yych == '`') goto yy86;
 	if (yych = 'z') goto yy99;
 }
 			}
@@ -1323,7 +1324,7 @@
 		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-#line 1327 Zend/zend_ini_scanner.c
+#line 1328 Zend/zend_ini_scanner.c
 yy88:
 		YYDEBUG(88, *YYCURSOR);
 		yyaccept = 0;
@@ -1344,7 +1345,7 @@
 		{
 	return 0;
 }
-#line 1348 Zend/zend_ini_scanner.c
+#line 1349 Zend/zend_ini_scanner.c
 yy91:
 		YYDEBUG(91, *YYCURSOR);
 		++YYCURSOR;
@@ -1356,7 +1357,7 @@
 	yy_push_state(ST_DOUBLE_QUOTES TSRMLS_CC);
 	return '';
 }
-#line 1360 Zend/zend_ini_scanner.c
+#line 1361 Zend/zend_ini_scanner.c
 yy93:
 		YYDEBUG(93, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1422,7 +1423,7 @@
 		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-#line 1426 Zend/zend_ini_scanner.c
+#line 1427 Zend/zend_ini_scanner.c
 yy99:
 		YYDEBUG(99, *YYCURSOR);
 		yyaccept = 3;
@@ -1452,7 +1453,7 @@
 		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-#line 1456 Zend/zend_ini_scanner.c
+#line 1457 Zend/zend_ini_scanner.c
 yy101:
 		YYDEBUG(101, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1468,7 +1469,7 @@
 	BEGIN(INITIAL);
 	return ']';
 }
-#line 1472 Zend/zend_ini_scanner.c
+#line 1473 Zend/zend_ini_scanner.c
 yy104:
 		YYDEBUG(104, *YYCURSOR);
 		yyaccept = 0;
@@ -1767,7 +1768,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1771 Zend/zend_ini_scanner.c
+#line 1772 Zend/zend_ini_scanner.c
 yy129:
 		YYDEBUG(129, *YYCURSOR);
 		++YYCURSOR;
@@ -1778,7 +1779,7 @@
 	yy_push_state(ST_VARNAME TSRMLS_CC);
 	return TC_DOLLAR_CURLY;
 }
-#line 1782 Zend/zend_ini_scanner.c
+#line 1783 Zend/zend_ini_scanner.c
 yy131:
 		YYDEBUG(131, *YYCURSOR);
 		yyaccept = 0;
@@ -1891,7 +1892,7 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 1895 Zend/zend_ini_scanner.c
+#line 1896 Zend/zend_ini_scanner.c
 yy139:
 		YYDEBUG(139, *YYCURSOR);
 		yyaccept = 0;
@@ -1919,7 +1920,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 1923 Zend/zend_ini_scanner.c
+#line 1924 Zend/zend_ini_scanner.c
 yy142:
 		YYDEBUG(142, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1937,7 +1938,7 @@
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-#line 1941 Zend/zend_ini_scanner.c
+#line 1942 Zend/zend_ini_scanner.c
 yy145:
 		YYDEBUG(145, *YYCURSOR);
 		++YYCURSOR;
@@ -1961,7 +1962,7 @@
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-#line 1965 Zend/zend_ini_scanner.c
+#line 1966 Zend/zend_ini_scanner.c
 yy149:
 		YYDEBUG(149, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2063,7 +2064,7 @@
 		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-#line 2067 Zend/zend_ini_scanner.c
+#line 2068 Zend/zend_ini_scanner.c
 yy160:
 		YYDEBUG(160, *YYCURSOR);
 		++YYCURSOR;
@@ -2073,7 +2074,7 @@
 		{
 	return 0;
 }
-#line 2077 Zend/zend_ini_scanner.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-12-01 Thread Jani Taskinen 

On 12/01/2009 01:22 AM, Gwynne Raskind wrote:

On Nov 30, 2009, at 5:45 PM, Jani Taskinen wrote:

1. Does not deal with utf8 stuff very well..?
2. Paths..?
3. Diff..?

I'd say revert whatever you did..


Having taken another look at the UTF-8 issue, I'd say this was a problem with 
your SVN, not anything here. The log message got entered into SVN with the 
escapes that way; by the time it reached the server it was already wrong. Check 
your ~/.subversion/config for the log-encoding setting; if it's set correctly 
let me know and I'll dig further. I'll commit a robust fix for the lengths 
issue shortly.


It should default to UTF-8? It's not set in my .subversion/config 
(commented out) so it should use the native locale? And for me it's 
always utf-8 on all of my machines.


--Jani


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-12-01 Thread Gwynne Raskind 
On Dec 1, 2009, at 3:08 AM, Jani Taskinen wrote:
 Having taken another look at the UTF-8 issue, I'd say this was a problem 
 with your SVN, not anything here. The log message got entered into SVN with 
 the escapes that way; by the time it reached the server it was already 
 wrong. Check your ~/.subversion/config for the log-encoding setting; if it's 
 set correctly let me know and I'll dig further. I'll commit a robust fix for 
 the lengths issue shortly.
 It should default to UTF-8? It's not set in my .subversion/config (commented 
 out) so it should use the native locale? And for me it's always utf-8 on all 
 of my machines.


And you were right again :). It turned out to be an issue with SVN requiring 
locale settings, which is completely ridiculous. Show me another program that 
needs the system locale to be exactly correct in order to handle UTF-8 
correctly... anyway, it's fixed now.

-- Gwynne


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-12-01 Thread Jani Taskinen 

On 12/01/2009 02:00 PM, Gwynne Raskind wrote:

On Dec 1, 2009, at 3:08 AM, Jani Taskinen wrote:

Having taken another look at the UTF-8 issue, I'd say this was a
problem with your SVN, not anything here. The log message got
entered into SVN with the escapes that way; by the time it
reached the server it was already wrong. Check your
~/.subversion/config for the log-encoding setting; if it's set
correctly let me know and I'll dig further. I'll commit a robust
fix for the lengths issue shortly.

It should default to UTF-8? It's not set in my .subversion/config
(commented out) so it should use the native locale? And for me it's
always utf-8 on all of my machines.


And you were right again :). It turned out to be an issue with SVN
requiring locale settings, which is completely ridiculous. Show me
another program that needs the system locale to be exactly correct in
order to handle UTF-8 correctly... anyway, it's fixed now.


Thanks. I'll test sometime soon again. :D

--Jani


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-11-30 Thread Jani Taskinen 
jani Mon, 30 Nov 2009 22:39:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=291526

Log:
- Touch?\195?\169 fil?\195?\169s

Changed paths:
changed paths exceeded maximum size

diffs exceeded maximum size
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-11-30 Thread Jani Taskinen 

1. Does not deal with utf8 stuff very well..?
2. Paths..?
3. Diff..?

I'd say revert whatever you did..

--Jani


Jani Taskinen wrote:

jani Mon, 30 Nov 2009 22:39:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=291526

Log:
- Touch?\195?\169 fil?\195?\169s

Changed paths:
changed paths exceeded maximum size

diffs exceeded maximum size




--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-11-30 Thread Gwynne Raskind 
On Nov 30, 2009, at 5:45 PM, Jani Taskinen wrote:
 1. Does not deal with utf8 stuff very well..?
 2. Paths..?
 3. Diff..?
 
 I'd say revert whatever you did..
 
 --Jani

The missing paths are Philip's fault (the diffs size shouldn't have been used 
in determining whether to hide the paths), the UTF-8 problems were there before 
(and shouldn't have been, thus my fault). I'll fix.

 Jani Taskinen wrote:
 jani Mon, 30 Nov 2009 22:39:59 +
 Revision: http://svn.php.net/viewvc?view=revisionrevision=291526
 Log:
 - Touch?\195?\169 fil?\195?\169s
 Changed paths:
 changed paths exceeded maximum size
 diffs exceeded maximum size


-- Gwynne


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-11-30 Thread Gwynne Raskind 
On Nov 30, 2009, at 5:45 PM, Jani Taskinen wrote:
 1. Does not deal with utf8 stuff very well..?
 2. Paths..?
 3. Diff..?
 
 I'd say revert whatever you did..

Having taken another look at the UTF-8 issue, I'd say this was a problem with 
your SVN, not anything here. The log message got entered into SVN with the 
escapes that way; by the time it reached the server it was already wrong. Check 
your ~/.subversion/config for the log-encoding setting; if it's set correctly 
let me know and I'll dig further. I'll commit a robust fix for the lengths 
issue shortly.

-- Gwynne


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/zend_ini_scanner.c branches/PHP_5_3/Zend/zend_ini_scanner_defs.h trunk/Zend/zend_ini_scanner.c trunk/Zend/zend_ini_scanner_defs.h

2009-08-03 Thread Jani Taskinen 
jani Tue, 04 Aug 2009 02:35:38 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286780

Log:
- Generated files

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
U   php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner_defs.h
U   php/php-src/trunk/Zend/zend_ini_scanner.c
U   php/php-src/trunk/Zend/zend_ini_scanner_defs.h

diffs exceeded maximum size
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php