update x-data -- distinguish symbol from string

Author: xieyuheng

package-lock.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@xieyuheng/commander.js": "^0.1.3",
-    "@xieyuheng/x-data.js": "^0.1.7"
+    "@xieyuheng/x-data.js": "^0.1.9"
   },
   "devDependencies": {
     "@types/node": "^24.1.0",

package.json

@@ -5,7 +5,7 @@ import { bindsFromArray, type Bind, type Exp } from "../exp/index.ts"
 const expMatcher: X.Matcher<Exp> = X.matcherChoice<Exp>([
   X.matcher("`(lambda ,names ,exp)", ({ names, exp }) =>
     X.dataToArray(names)
-      .map(X.dataToString)
+      .map(X.symbolToString)
       .reduceRight((fn, name) => Exps.Lambda(name, fn), matchExp(exp)),
   ),
 
@@ -22,7 +22,7 @@ const expMatcher: X.Matcher<Exp> = X.matcherChoice<Exp>([
       .reduce((result, arg) => Exps.Apply(result, arg), matchExp(target)),
   ),
 
-  X.matcher("name", ({ name }) => Exps.Var(X.dataToString(name))),
+  X.matcher("name", ({ name }) => Exps.Var(X.symbolToString(name))),
 ])
 
 export function matchExp(data: X.Data): Exp {
@@ -32,7 +32,7 @@ export function matchExp(data: X.Data): Exp {
 export function matchBind(data: X.Data): Bind {
   return X.match(
     X.matcher("`(,name ,exp)", ({ name, exp }) => ({
-      name: X.dataToString(name),
+      name: X.symbolToString(name),
       exp: matchExp(exp),
     })),
     data,

src/lang/parse/matchExp.ts

@@ -7,15 +7,15 @@ import { matchExp } from "./matchExp.ts"
 const stmtMatcher: X.Matcher<Stmt> = X.matcherChoice<Stmt>([
   X.matcher("`(define ,(cons name args) ,exp)", ({ name, args, exp }) =>
     Stmts.Define(
-      X.dataToString(name),
+      X.symbolToString(name),
       X.dataToArray(args)
-        .map(X.dataToString)
+        .map(X.symbolToString)
         .reduceRight((fn, name) => Exps.Lambda(name, fn), matchExp(exp)),
     ),
   ),
 
   X.matcher("`(define ,name ,exp)", ({ name, exp }) =>
-    Stmts.Define(X.dataToString(name), matchExp(exp)),
+    Stmts.Define(X.symbolToString(name), matchExp(exp)),
   ),
 
   X.matcher("(cons 'import body)", ({ body }) => {
@@ -52,11 +52,11 @@ function matchImportEntry(data: X.Data): Stmts.ImportEntry {
   return X.match(
     X.matcherChoice([
       X.matcher("`(rename ,name ,rename)", ({ name, rename }) => ({
-        name: X.dataToString(name),
-        rename: X.dataToString(rename),
+        name: X.symbolToString(name),
+        rename: X.symbolToString(rename),
       })),
 
-      X.matcher("name", ({ name }) => ({ name: X.dataToString(name) })),
+      X.matcher("name", ({ name }) => ({ name: X.symbolToString(name) })),
     ]),
     data,
   )