+ fixed bug introduced in r1920

(ustring parser includes single quotes - remove extra '\'' in match/replace)
2010-06-28 22:43:35 +00:00 · 2010-06-28 22:43:35 +00:00 · a486aed3af
commit a486aed3af
parent 70b2453065
1 changed files with 2 additions and 7 deletions
--- a/include/mapnik/expression_grammar.hpp
+++ b/include/mapnik/expression_grammar.hpp
@ -166,21 +166,16 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
        
        regex_match_expr = lit(".match")
            >> lit('(') 
-            >> lit('\'')
-            >> ustring [_val = _1]
-            >> lit('\'') 
+            >> ustring [_val = _1] 
            >> lit(')')
            ;
        
        regex_replace_expr = 
            lit(".replace")
            >> lit('(') 
-            >> lit('\'')
            >> ustring           [_a = _1]
-            >> lit('\'') >> lit(',') 
-            >> lit('\'') 
+            >> lit(',') 
            >> ustring           [_b = _1]
-            >> lit('\'')
            >> lit(')')          [_val = regex_replace_(_r1,_a,_b)]
            ;