cvs: php4 /main configuration-parser.y configuration-scanner.l
| From: | Zeev Suraski | Date: | Mon, 26 Jun 2000 18:15:50 +0000 |
| Subject: | cvs: php4 /main configuration-parser.y configuration-scanner.l | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-492@lists.php.net to get a copy of this message | ||
zeev Mon Jun 26 11:15:50 2000 EDT
Modified files:
/php4/main configuration-parser.y configuration-scanner.l
Log:
Support boolean NOT in the php.ini processor
Index: php4/main/configuration-parser.y
diff -u php4/main/configuration-parser.y:1.48 php4/main/configuration-parser.y:1.49
--- php4/main/configuration-parser.y:1.48 Thu Jun 8 19:18:50 2000
+++ php4/main/configuration-parser.y Mon Jun 26 11:15:49 2000
@@ -19,7 +19,7 @@
-/* $Id: configuration-parser.y,v 1.48 2000/06/09 02:18:50 zeev Exp $ */
+/* $Id: configuration-parser.y,v 1.49 2000/06/26 18:15:49 zeev Exp $ */
#define DEBUG_CFG_PARSER 0
#include "php.h"
@@ -384,6 +384,9 @@
case '~':
i_result = ~i_op1;
break;
+ case '!':
+ i_result = !i_op1;
+ break;
default:
i_result = 0;
break;
@@ -429,7 +432,7 @@
%token T_ZEND_EXTENSION_DEBUG
%token T_ZEND_EXTENSION_DEBUG_TS
%left '|' '&'
-%right '~'
+%right '~' '!'
%%
@@ -568,6 +571,7 @@
| expr '|' expr { do_cfg_op('|', &$$, &$1, &$3); }
| expr '&' expr { do_cfg_op('&', &$$, &$1, &$3); }
| '~' expr { do_cfg_op('~', &$$, &$2, NULL); }
+ | '!' expr { do_cfg_op('!', &$$, &$2, NULL); }
| '(' expr ')' { $$ = $2; }
;
Index: php4/main/configuration-scanner.l
diff -u php4/main/configuration-scanner.l:1.12 php4/main/configuration-scanner.l:1.13
--- php4/main/configuration-scanner.l:1.12 Thu May 18 08:34:21 2000
+++ php4/main/configuration-scanner.l Mon Jun 26 11:15:49 2000
@@ -119,12 +119,12 @@
return TC_ENCAPSULATED_STRING;
}
-<INITIAL>[&|~()] {
+<INITIAL>[&|~()!] {
return yytext[0];
}
-<INITIAL>[^=\n\r\t;|&~()"]+ {
+<INITIAL>[^=\n\r\t;|&~()!"]+ {
/* STRING */
register int i;