use colon as a tuple shorthand; tag 0.7.2

calcit-lang · Jun 18, 2023 · aff900c · aff900c
1 parent 131d1ac
commit aff900c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "calcit"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 license = "MIT"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.2.5",

diff --git a/src/cirru/calcit-core.cirru b/src/cirru/calcit-core.cirru
@@ -1817,3 +1817,10 @@
             if (some? y)
               range (inc (&- (&+ x x) y)) y
               range (inc (negate x)) x
+
+        |: $ quote
+          defmacro : (tag & args)
+            quasiquote
+              ::
+                ~ $ turn-tag tag
+                ~@ args
diff --git a/src/data/cirru.rs b/src/data/cirru.rs
@@ -27,7 +27,7 @@ pub fn code_to_calcit(xs: &Cirru, ns: Arc<str>, def: Arc<str>, coord: &[u8]) ->
         location: Some(coord.to_vec()),
       }),
       _ => match s.chars().next().expect("load first char") {
-        ':' => Ok(Calcit::tag(&s[1..])),
+        ':' if s.len() > 1 && s.chars().nth(1) != Some(':') => Ok(Calcit::tag(&s[1..])),
         '.' => {
           if let Some(stripped) = s.strip_prefix(".-") {
             Ok(Calcit::Method(stripped.into(), MethodKind::Access))

diff --git a/src/primes.rs b/src/primes.rs
@@ -187,12 +187,10 @@ impl fmt::Display for Calcit {
       Calcit::Tuple(tag, extra, _class) => {
         let mut extra_str = String::from("");
         for item in extra {
-          if !extra_str.is_empty() {
-            extra_str.push(' ');
-          }
+          extra_str.push(' ');
           extra_str.push_str(&item.to_string())
         }
-        f.write_str(&format!("(:: {tag} {extra_str})"))
+        f.write_str(&format!("(:: {tag}{extra_str})"))
       }
       Calcit::Buffer(buf) => {
         f.write_str("(&buffer")?;

diff --git a/ts-src/calcit.procs.mts b/ts-src/calcit.procs.mts
@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.7.1";
+export const calcit_version = "0.7.2";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";