1 files changed, 31 insertions, 22 deletions

diff --git a/src/query.cc b/src/query.cc
index 1f086df8..363c6f73 100644
--- a/src/query.cc
+++ b/src/query.cc
@@ -53,45 +53,51 @@ query_t::lexer_t::token_t query_t::lexer_t::next_token()
     }
   }
 
-  if (consume_next_arg) {
-    consume_next_arg = false;
-    arg_i = arg_end;
-    return token_t(token_t::TERM, (*begin).as_string());
-  }
-
- resume:
-  bool consume_next = false;
   switch (*arg_i) {
-  case ' ':
-  case '\t':
-  case '\r':
-  case '\n':
-    if (++arg_i == arg_end)
-      return next_token();
-  goto resume;
-
+  case '\'':
+  case '"':
   case '/': {
     string pat;
-    bool found_end_slash = false;
+    char   closing	 = *arg_i;
+    bool   found_closing = false;
     for (++arg_i; arg_i != arg_end; ++arg_i) {
       if (*arg_i == '\\') {
 	if (++arg_i == arg_end)
 	  throw_(parse_error, _("Unexpected '\\' at end of pattern"));
       }
-      else if (*arg_i == '/') {
+      else if (*arg_i == closing) {
 	++arg_i;
-	found_end_slash = true;
+	found_closing = true;
 	break;
       }
       pat.push_back(*arg_i);
     }
-    if (! found_end_slash)
-      throw_(parse_error, _("Expected '/' at end of pattern"));
+    if (! found_closing)
+      throw_(parse_error, _("Expected '%1' at end of pattern") << closing);
     if (pat.empty())
       throw_(parse_error, _("Match pattern is empty"));
 
     return token_t(token_t::TERM, pat);
   }
+  }
+
+  if (multiple_args && consume_next_arg) {
+    consume_next_arg = false;
+    token_t tok(token_t::TERM, string(arg_i, arg_end));
+    arg_i = arg_end;
+    return tok;
+  }
+
+ resume:
+  bool consume_next = false;
+  switch (*arg_i) {
+  case ' ':
+  case '\t':
+  case '\r':
+  case '\n':
+    if (++arg_i == arg_end)
+      return next_token();
+  goto resume;
 
   case '(': ++arg_i; return token_t(token_t::LPAREN);
   case ')': ++arg_i; return token_t(token_t::RPAREN);
@@ -101,7 +107,10 @@ query_t::lexer_t::token_t query_t::lexer_t::next_token()
   case '@': ++arg_i; return token_t(token_t::TOK_PAYEE);
   case '#': ++arg_i; return token_t(token_t::TOK_CODE);
   case '%': ++arg_i; return token_t(token_t::TOK_META);
-  case '=': ++arg_i; return token_t(token_t::TOK_EQ);
+  case '=':
+    ++arg_i;
+    consume_next_arg = true;
+    return token_t(token_t::TOK_EQ);
 
   case '\\':
     consume_next = true;