Merge pull request #110 from calcit-lang/key-match

improvements on key-match
calcit-lang · Oct 21, 2021 · 621edee · 621edee
2 parents 1ffc990 + 3f847fa
commit 621edee
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "calcit_runner"
-version = "0.5.0-a11"
+version = "0.5.0-a12"
 authors = ["jiyinyiyong <jiyinyiyong@gmail.com>"]
 edition = "2018"
 license = "MIT"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.0-a11",
+  "version": "0.5.0-a12",
   "main": "./lib/calcit.procs.js",
   "devDependencies": {
     "@types/node": "^16.10.5",

diff --git a/src/bin/injection/mod.rs b/src/bin/injection/mod.rs
@@ -125,16 +125,21 @@ pub fn callback_dylib_edn(xs: &CalcitItems) -> Result<Calcit, CalcitErr> {
     };
     if let Calcit::Fn(_, def_ns, _, def_scope, args, body) = callback {
       let r = runner::run_fn(&im::vector![result], &def_scope, &args, &body, &def_ns);
-      println!("callback result: {:?}", r);
+      match r {
+        Ok(ret) => {
+          if ret != Calcit::Nil {
+            println!("[Thread] callback result: {}", ret);
+          }
+        }
+        Err(e) => {
+          println!("[Error] thread callback failed: {}", e)
+        }
+      }
 
       track::track_task_release();
       Ok(Calcit::Nil)
     } else {
-      track::track_task_release();
-      return Err(CalcitErr::use_string(format!(
-        "expected last argument to be callback fn, got: {}",
-        callback
-      )));
+      unreachable!(format!("expected last argument to be callback fn, got: {}", callback));
     }
   });
 

diff --git a/src/cirru/calcit-core.cirru b/src/cirru/calcit-core.cirru
@@ -349,32 +349,44 @@
                             ~ $ &list:nth else 0
                             ~@ $ &list:rest else
 
-        |key-match $ quote
+        |&key-match-internal $ quote
           defmacro key-match (value & body)
             if (&list:empty? body)
               quasiquote
-                &let nil
-                  echo "|[warn] key-match found no matched case, missing `_` case?" ~value
+                println "|[Warn] key-match found no matched case, missing `_` case?" ~value
               &let
                 pair (&list:first body)
                 assert "|key-match expected pairs"
                   and (list? pair) (&= 2 (&list:count pair))
-                let[] (pattern branch) pair
-                  if (&= pattern '_) branch
-                    &let nil
-                      assert "|pattern in a list" (list? pattern)
-                      &let
-                        k (&list:first pattern)
-                        &let (v# (gensym 'v))
-                          quasiquote
-                            &let (~v# ~value)
-                              if (&= (&list:first ~v#) ~k)
-                                let
-                                  ~ $ map-indexed (&list:rest pattern) $ defn %key-match (idx x)
-                                    [] x $ quasiquote
-                                      &list:nth ~v# (~ (inc idx))
-                                  , ~branch
-                                key-match ~value (~@ (&list:rest body))
+                let
+                    pattern $ &list:nth pair 0
+                    branch $ &list:nth pair 1
+                  if (list? pattern)
+                    &let
+                      k (&list:first pattern)
+                      quasiquote
+                        if (&= (&list:first ~value) ~k)
+                          let
+                            ~ $ map-indexed (&list:rest pattern) $ defn %key-match (idx x)
+                              [] x $ quasiquote
+                                &list:nth ~value (~ (inc idx))
+                            , ~branch
+                          &key-match-internal ~value $ ~@ (&list:rest body)
+                    if (&= pattern '_) branch
+                      raise $ str "|unknown supported pattern: " pair
+
+        |key-match $ quote
+          defmacro key-match (value & body)
+            if (&list:empty? body)
+              quasiquote
+                println "|[Error] key-match expected some patterns and matches" ~value
+              if (list? value)
+                &let (v# (gensym 'v))
+                  quasiquote
+                    &let (~v# ~value)
+                      &key-match-internal ~v# $ ~@ body
+                quasiquote
+                  &key-match-internal ~value $ ~@ body
 
         |&case $ quote
           defmacro &case (item default pattern & others)

diff --git a/ts-src/calcit.procs.ts b/ts-src/calcit.procs.ts
@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.5.0-a11";
+export const calcit_version = "0.5.0-a12";
 
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { parse, ICirruNode } from "@cirru/parser.ts";