refine error message from parsing; bump 0.1.5

Cirru · Jul 24, 2021 · e98860d · e98860d
1 parent a788a3c
commit e98860d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cirru_edn"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2018"
 license = "MIT"

diff --git a/src/lib.rs b/src/lib.rs
@@ -108,7 +108,8 @@ fn extract_cirru_edn(node: &Cirru) -> Result<Edn, String> {
                           (Ok(k), Ok(v)) => {
                             zs.insert(k, v);
                           }
-                          (e1, e2) => return Err(format!("invalid map entry pair: {:?} {:?}", e1, e2)),
+                          (Err(e), _) => return Err(format!("invalid map entry `{}` from `{}`", e, &ys[0])),
+                          (Ok(k), Err(e)) => return Err(format!("invalid map entry for `{}`, got {}", k, e)),
                         }
                       }
                     }
@@ -136,7 +137,10 @@ fn extract_cirru_edn(node: &Cirru) -> Result<Edn, String> {
                               fields.push(s.clone());
                               values.push(v);
                             }
-                            (e1, e2) => return Err(format!("invalid map entry: {:?} {:?}", e1, e2)),
+                            (Cirru::Leaf(s), Err(e)) => {
+                              return Err(format!("invalid record value for `{}`, got: {}", s, e))
+                            }
+                            (Cirru::List(zs), _) => return Err(format!("invalid list as record key: {:?}", zs)),
                           }
                         }
                       }

diff --git a/src/main.rs b/src/main.rs
@@ -1,6 +1,13 @@
 use std::fs;
 use std::io::Error;
 
+const DEMO_INVALID: &str = r#"
+{}
+  :a $ {}
+    :b $ {}
+      :1 E
+"#;
+
 fn main() -> Result<(), Error> {
   // let large_file_path = "/Users/chen/repo/calcit-lang/runner.rs/src/cirru/calcit-core.cirru";
   let large_file_path = "/Users/chen/repo/cirru/calcit-editor/calcit.cirru";
@@ -9,5 +16,7 @@ fn main() -> Result<(), Error> {
 
   println!("{}", cirru_edn::format(&d, true).unwrap());
 
+  println!("{:?}", cirru_edn::parse(DEMO_INVALID));
+
   Ok(())
 }