diff options
| author | Andrei Zmievski <andrei@php.net> | 2004-05-17 20:09:37 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2004-05-17 20:09:37 +0000 |
| commit | 427561446fe3b43619d53590da27f9ca9e8d0830 (patch) | |
| tree | 8de5cc52ab1a022db8fa3aad6e4651ec026a11f5 /Zend/zend_ini_scanner.l | |
| parent | cf4127b6b9134afb417e83779955ffe5b7c9ff2a (diff) | |
| download | php-git-427561446fe3b43619d53590da27f9ca9e8d0830.tar.gz | |
Revert the .ini vars patch. Will have to try again next Christmas
apparently.
Diffstat (limited to 'Zend/zend_ini_scanner.l')
| -rw-r--r-- | Zend/zend_ini_scanner.l | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index 3217e08f56..f2da5998e3 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -153,20 +153,12 @@ NEWLINE ("\r"|"\n"|"\r\n") return TC_ENCAPSULATED_STRING; } -<INITIAL>[&|~$(){}!] { +<INITIAL>[&|~()!] { return yytext[0]; } -<INITIAL>"${" { - return TC_DOLLAR_CURLY; -} - -<INITIAL>"}" { - ini_lval->value.lval = (long) yytext[0]; - return yytext[0]; -} -<INITIAL>[^=\n\r\t;|&$~(){}!"\[]+ { +<INITIAL>[^=\n\r\t;|&~()!"\[]+ { /* STRING */ register int i; @@ -198,6 +190,8 @@ NEWLINE ("\r"|"\n"|"\r\n") } } + + <INITIAL>[=\n] { if (yytext[0] == '\n') { SCNG(lineno)++; |