From 0e6bfe4874f1aad8299ce9de6be76df5d05a123e Mon Sep 17 00:00:00 2001
From: Mathieu Darse <mdarse@jolicode.com>
Date: Wed, 15 Apr 2015 18:54:24 +0200
Subject: [PATCH 1/2] Fix context regression from #1347

---
 .../Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php
index 62b8b0ded0..e1a33255a6 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php
@@ -226,7 +226,7 @@ class QueryVisitor implements Visit
                 continue;
             }
             if ($node instanceof AST\Context) {
-                if ($root instanceof ContextAbleInterface) {
+                if ($root instanceof AST\ContextAbleInterface) {
                     $root = $root->withContext($node);
                 } else {
                     throw new \Exception('Unexpected context after non-contextualizable node');

From 8d767788fe37a363c402468cdd6d4b5986306f1e Mon Sep 17 00:00:00 2001
From: Mathieu Darse <mdarse@jolicode.com>
Date: Wed, 15 Apr 2015 19:07:00 +0200
Subject: [PATCH 2/2] Test raw string parsing

---
 .../Tests/Phrasea/SearchEngine/resources/queries.csv     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/resources/queries.csv b/tests/Alchemy/Tests/Phrasea/SearchEngine/resources/queries.csv
index 185f1f9959..dd7777690f 100644
--- a/tests/Alchemy/Tests/Phrasea/SearchEngine/resources/queries.csv
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/resources/queries.csv
@@ -9,6 +9,15 @@ foo bar (baz qux)|<text:"foo bar" context:"baz qux">
 [foo (bar)]|<term:"foo" context:"bar">
 [foo bar (baz qux)]|<term:"foo bar" context:"baz qux">
 
+# Raw string
+r"foo"|<raw:"foo">
+r"foo bar"|<raw:"foo bar">
+r"\"foo\""|<raw:""foo"">
+r"\o/"|<raw:"\o/">
+r"\\o/"|<raw:"\o/">
+r"foo \n bar"|<raw:"foo \n bar">
+r"foo\\nbar"|<raw:"foo\nbar">
+
 # Parenthesis grouping
 (foo)|<text:"foo">
 (foo bar)|<text:"foo bar">