summaryrefslogtreecommitdiff
path: root/Zend/zend_ini_scanner.l
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_ini_scanner.l')
-rw-r--r--Zend/zend_ini_scanner.l14
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)++;