Merge branch 'master' of github.com:kodowa/eve-native

Author: joshuafcole

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 build/
 dist/
 .vscode/tasks.json
+examples/test.eve

src/parser.rs

@@ -71,7 +71,7 @@ parser!(number(state) -> Node<'a> {
 
 whitespace_parser!(escaped_quote(state) -> Node<'a> {
     tag!(state, "\\");
-    let escaped = alt_tag!(state, ["\"" "n" "t"]);
+    let escaped = alt_tag!(state, ["\"" "\\" "n" "t"]);
     let ch = match escaped {
         "n" => "\n",
         "t" => "\t",
@@ -94,7 +94,7 @@ whitespace_parser!(string_bracket(state) -> Node<'a> {
 });
 
 whitespace_parser!(string_chars(state) -> Node<'a> {
-    let chars = any_except!(state, "\"{");
+    let chars = any_except!(state, "\\\"{");
     result!(state, Node::RawString(chars))
 });
 

tests/base.rs

@@ -251,6 +251,38 @@ test!(base_join_nested_record, {
     end
 });
 
+//--------------------------------------------------------------------
+// Strings
+//--------------------------------------------------------------------
+
+test!(base_string, {
+    search
+        baz = "Hello"
+    bind
+        [#foo baz]
+    end
+
+    search
+        [#foo baz: "Hello"]
+    bind
+        [#success]
+    end
+});
+
+test!(base_string_escape_chars, {
+    search
+        baz = "Hello \\ \n \"World\" "
+    bind
+        [#foo baz]
+    end
+
+    search
+        [#foo baz: "Hello \\ \n \"World\" "]
+    bind
+        [#success]
+    end
+});
+
 //--------------------------------------------------------------------
 // Interpolation
 //--------------------------------------------------------------------