attrmap: extend -remove to allow removing attributes with any value.

Currently, `-remove foo` would only remove an attribute `foo = ""`,
which doesn't work on an attribute like `src` that may have any
value. Extend `-remove` to handle both cases. `-remove foo=""` has
the old behavior, and `-remove foo` will remove the attribute with
whatever value it may have, which is still compatible with the old
behavior.

diff --git a/passes/techmap/attrmap.cc b/passes/techmap/attrmap.cc
index 0b5576b064e4fde180743f82766d4744c0428b9e..aa48e11255f4f2a3557a38a3450f74a273f26f58 100644 (file)
--- a/passes/techmap/attrmap.cc
+++ b/passes/techmap/attrmap.cc
@@ -111,9 +111,10 @@ struct AttrmapMap : AttrmapAction {
 };
 
 struct AttrmapRemove : AttrmapAction {
+       bool has_value;
        string name, value;
        bool apply(IdString &id, Const &val) YS_OVERRIDE {
-               return !(match_name(name, id) && match_value(value, val));
+               return !(match_name(name, id) && (!has_value || match_value(value, val)));
        }
 };
 
@@ -235,6 +236,7 @@ struct AttrmapPass : public Pass {
                                }
                                auto action = new AttrmapRemove;
                                action->name = arg1;
+                               action->has_value = (p != string::npos);
                                action->value = val1;
                                actions.push_back(std::unique_ptr<AttrmapAction>(action));
                                continue;