MFZE1

Ilia Alshanetsky · Ilia Alshanetsky · commit fac8eaff1a07 · 2002-10-14T23:41:32.000Z
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
@@ -252,6 +252,7 @@ struct _zend_scanner_globals {
 	char *c_buf_p;
 	int init;
 	int start;
+	int lineno;
 	char _yy_hold_char;
 	int yy_n_chars;
 	int _yy_did_buffer_switch_on_eof;
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
@@ -57,7 +57,6 @@ zval yylval;
 #ifndef ZTS
 extern int ini_lex(zval *ini_lval TSRMLS_DC);
 extern FILE *ini_in;
-extern int ini_lineno;
 extern void init_cfg_scanner(void);
 #endif
 
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
@@ -49,15 +49,15 @@ ZEND_API zend_scanner_globals ini_scanner_globals;
 
 static char *ini_filename;
 
-void init_ini_scanner()
+void init_ini_scanner(TSRMLS_D)
 {
-	ini_lineno=1;
+       SCNG(lineno)=1;
 }
 
 
 int zend_ini_scanner_get_lineno(TSRMLS_D)
 {
-	return ini_lineno;
+       return SCNG(lineno);
 }
 
 
@@ -83,7 +83,7 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh TSRMLS_DC)
 			return FAILURE;
 	}
 
-	init_ini_scanner();
+	init_ini_scanner(TSRMLS_C);
 	yyin = fp;
 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE TSRMLS_CC) TSRMLS_CC);
 	ini_filename = fh->filename;
@@ -105,7 +105,6 @@ void zend_ini_close_file(zend_file_handle *fh TSRMLS_DC)
 NEWLINE ("\r"|"\n"|"\r\n")
 
 %option noyywrap
-%option yylineno
 
 %%
 
@@ -134,6 +133,8 @@ NEWLINE ("\r"|"\n"|"\r\n")
 		yytext[yyleng]=0;
 	}
 
+	SCNG(lineno)++;
+
 	/* eat leading [ */
 	yytext++;
 	yyleng--;
@@ -200,15 +201,20 @@ NEWLINE ("\r"|"\n"|"\r\n")
 
 
 <INITIAL>[=\n] {
+	if (yytext[0] == '\n') {
+		SCNG(lineno)++;
+	}	
 	return yytext[0];
 }
 
 <INITIAL>{NEWLINE} {
+	SCNG(lineno)++;
 	return '\n';
 }
 
 <INITIAL>[;][^\r\n]*{NEWLINE}? {
 	/* comment */
+	SCNG(lineno)++;
 	return '\n';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,15 @@ ZEND_API zend_scanner_globals ini_scanner_globals;`
`49`	`49`
`50`	`50`	`static char *ini_filename;`
`51`	`51`
`52`		`-void init_ini_scanner()`
	`52`	`+void init_ini_scanner(TSRMLS_D)`
`53`	`53`	`{`
`54`		`- ini_lineno=1;`
	`54`	`+ SCNG(lineno)=1;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`
`58`	`58`	`int zend_ini_scanner_get_lineno(TSRMLS_D)`
`59`	`59`	`{`
`60`		`- return ini_lineno;`
	`60`	`+ return SCNG(lineno);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`
`@@ -83,7 +83,7 @@ int zend_ini_open_file_for_scanning(zend_file_handle *fh TSRMLS_DC)`
`83`	`83`	`return FAILURE;`
`84`	`84`	`}`
`85`	`85`
`86`		`- init_ini_scanner();`
	`86`	`+ init_ini_scanner(TSRMLS_C);`
`87`	`87`	`yyin = fp;`
`88`	`88`	`yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE TSRMLS_CC) TSRMLS_CC);`
`89`	`89`	`ini_filename = fh->filename;`
`@@ -105,7 +105,6 @@ void zend_ini_close_file(zend_file_handle *fh TSRMLS_DC)`
`105`	`105`	`NEWLINE ("\r"\|"\n"\|"\r\n")`
`106`	`106`
`107`	`107`	`%option noyywrap`
`108`		`-%option yylineno`
`109`	`108`
`110`	`109`	`%%`
`111`	`110`
`@@ -134,6 +133,8 @@ NEWLINE ("\r"\|"\n"\|"\r\n")`
`134`	`133`	`yytext[yyleng]=0;`
`135`	`134`	`}`
`136`	`135`
	`136`	`+ SCNG(lineno)++;`
	`137`	`+`
`137`	`138`	`/* eat leading [ */`
`138`	`139`	`yytext++;`
`139`	`140`	`yyleng--;`
`@@ -200,15 +201,20 @@ NEWLINE ("\r"\|"\n"\|"\r\n")`
`200`	`201`
`201`	`202`
`202`	`203`	`<INITIAL>[=\n] {`
	`204`	`+ if (yytext[0] == '\n') {`
	`205`	`+ SCNG(lineno)++;`
	`206`	`+ }`
`203`	`207`	`return yytext[0];`
`204`	`208`	`}`
`205`	`209`
`206`	`210`	`<INITIAL>{NEWLINE} {`
	`211`	`+ SCNG(lineno)++;`
`207`	`212`	`return '\n';`
`208`	`213`	`}`
`209`	`214`
`210`	`215`	`<INITIAL>[;][^\r\n]*{NEWLINE}? {`
`211`	`216`	`/* comment */`
	`217`	`+ SCNG(lineno)++;`
`212`	`218`	`return '\n';`
`213`	`219`	`}`
`214`	`220`