From bd9ffed9db00e31e4ad526f4558d0d2929c8ac39 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 2 Feb 2009 15:17:02 -0400
Subject: Calculate the right-hand side O_MATCH, now that masks are values.

---
 src/op.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/op.cc b/src/op.cc
index 588adc4b..237426f7 100644
--- a/src/op.cc
+++ b/src/op.cc
@@ -150,9 +150,11 @@ value_t expr_t::op_t::opcalc(scope_t& scope)
   }
 
   case O_MATCH:
+#if 0
     if (! right()->is_value() || ! right()->as_value().is_mask())
       throw_(calc_error, "Right-hand argument to match operator must be a regex");
-    return right()->as_value().as_mask().match(left()->opcalc(scope).to_string());
+#endif
+    return right()->opcalc(scope).as_mask().match(left()->opcalc(scope).to_string());
 
   case INDEX: {
     const call_scope_t& args(downcast<const call_scope_t>(scope));
-- 
cgit v1.2.3