From: Nicolas Luck <nicolas@lucksus.eu>
Date: Tue, 22 Aug 2023 20:46:00 +0000 (+0200)
Subject: Fix list result parsing
X-Git-Tag: remove^2~34
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=7e97f16f4126d1a30e813a110b45341d6bfa11d8;p=scryer-prolog.git

Fix list result parsing
---

diff --git a/src/machine/lib_machine.rs b/src/machine/lib_machine.rs
index a90e7adc..9c524588 100644
--- a/src/machine/lib_machine.rs
+++ b/src/machine/lib_machine.rs
@@ -171,6 +171,26 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn list_results() {
+        let mut machine = Machine::new_lib();
+        machine.load_module_string(
+            "facts",
+                r#"
+                list([1,2,3]).
+            "#.to_string());
+
+        let result = machine.run_query(String::from("list(X)."));
+        assert_eq!(
+            result,
+            Ok(QueryResolution::Matches(vec![
+                QueryMatch::from(btreemap! {
+                    "X" => Value::List(Vec::from([Value::from("1"), Value::from("2"), Value::from("3")]))
+                }),
+            ]))
+        );
+    }
+
 
     #[tokio::test]
     async fn consult() {
diff --git a/src/machine/parsed_results.rs b/src/machine/parsed_results.rs
index aaec386d..ec9b92b8 100644
--- a/src/machine/parsed_results.rs
+++ b/src/machine/parsed_results.rs
@@ -120,7 +120,7 @@ impl From<Vec<QueryResolutionLine>> for QueryResolution {
 fn parse_prolog_response(input: &str) -> HashMap<String, String> {
     let mut map: HashMap<String, String> = HashMap::new();
     // Use regex to match strings including commas inside them
-    let re = Regex::new(r"(\w+)\s=\s([^,]*'[^']*'[^,]*|[^,]*)").unwrap();
+    let re = Regex::new(r"(\w+)\s=\s((?:[^,\[]|\[[^\]]*\])*)").unwrap();
     
     for cap in re.captures_iter(input) {
         let key = cap[1].to_string();