OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 14-Nov-2002 10:00:53
Branch: HEAD Handle: 2002111409005200
Modified files:
openpkg-re openpkg-index
Log:
more warnings about ignored #if phrases
Summary:
Revision Changes Path
1.9 +8 -4 openpkg-re/openpkg-index
____________________________________________________________________________
Index: openpkg-re/openpkg-index
============================================================
$ cvs diff -u -r1.8 -r1.9 openpkg-index
--- openpkg-re/openpkg-index 13 Nov 2002 17:55:41 -0000 1.8
+++ openpkg-re/openpkg-index 14 Nov 2002 09:00:52 -0000 1.9
@@ -180,11 +180,15 @@
# operators ! && ||
#
$term = '';
- while ($p =~
/(?:(\!|\|\||\&\&|\(|\))|"\%\{([^}]+)\}"\s*==\s*"(yes|no)")/g) {
+ while ($p =~
/(!=)|(\!|\|\||\&\&|\(|\))|"\%\{([^}]+)\}"\s*==\s*"(yes|no)"|(\S+)/g) {
if (defined $1) {
- $term .= " $1 ";
- } elsif (exists $evar->{$2}) {
- $term .= ($3 eq 'no' ? '! ' : '').vsub($evar,'%{'.$2.'}');
+ warn "WARNING: unknown token '$1':\n< $l\n> $v\n";
+ } elsif (defined $5) {
+ warn "WARNING: unknown token '$5':\n< $l\n> $v\n";
+ } elsif (defined $2) {
+ $term .= " $2 ";
+ } elsif (exists $evar->{$3}) {
+ $term .= ($4 eq 'no' ? '! ' : '').vsub($evar,'%{'.$3.'}');
} else {
warn "WARNING: unknown conditional '$2':\n< $l\n> $v\n";
}
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
