Update of /cvsroot/tmda/tmda/TMDA
In directory usw-pr-cvs1:/tmp/cvs-serv10163
Modified Files:
ChangeLog FilterParser.py
Log Message:
Fixed bug in macro expansion where expanding a macro more than once in the
same rule destroyed the earlier portion of the rule.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog 21 Sep 2002 00:27:43 -0000 1.229
+++ ChangeLog 27 Sep 2002 04:31:25 -0000 1.230
@@ -1,3 +1,9 @@
+2002-09-26 Tim Legant <[EMAIL PROTECTED]>
+
+ * FilterParser.py (FilterParser.__expandmacros): Fixed bug where
+ more than one instance of the same macro in a rule failed
+ miserably.
+
2002-09-20 Jason R. Mastaler <[EMAIL PROTECTED]>
* Util.py (decode_header): New function.
Index: FilterParser.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/FilterParser.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- FilterParser.py 13 Sep 2002 05:42:11 -0000 1.45
+++ FilterParser.py 27 Sep 2002 04:31:25 -0000 1.46
@@ -466,10 +466,11 @@
text = ''
while rhs:
try:
- (text, rhs) = macro.findname(rhs)
+ (lhs, rhs) = macro.findname(rhs)
except ValueError:
text += rhs
break
+ text += lhs
(args, rhs) = macro.getargs(rhs)
definition = macro.expandargs(args)
# Create a copy of the list of macros and remove
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
