Here's a patch to remove another FIXME. I don't think there is any need to escape any of the +'s -- for example the expressions \[0-9\]+ and \[ \t\]+ clearly don't need escaped +.
Okay to commit?
Ben
diff --git a/lib/dg.exp b/lib/dg.exp
index dfd6a6c..8b4e3c0 100644
--- a/lib/dg.exp
+++ b/lib/dg.exp
@@ -189,9 +189,7 @@ proc dg-get-options { prog } {
set tmp [grep $prog "{\[ \t\]\+dg-\[-a-z\]\+\[ \t\]\+.*\[ \t\]\+}" line]
if {![string match "" $tmp]} {
foreach i $tmp {
- # FIXME: When to use "+" and "\+" isn't clear.
- # Seems to me it took awhile to get this to work.
- regexp "(\[0-9\]\+)\[ \t\]\+{\[ \t\]+(dg-\[-a-z\]+)\[ \t\]\+(.*)\[
\t\]+}\[^\}\]*(\n|$)" $i i line cmd args
+ regexp "(\[0-9\]+)\[ \t\]+{\[ \t\]+(dg-\[-a-z\]+)\[ \t\]+(.*)\[
\t\]+}\[^\}\]*(\n|$)" $i i line cmd args
append result " { $cmd $line $args }"
}
}
signature.asc
Description: Digital signature
_______________________________________________ DejaGnu mailing list DejaGnu@gnu.org https://lists.gnu.org/mailman/listinfo/dejagnu
