remove quote

TODO.md

@@ -1,7 +1,8 @@
-remove quote and eval
-
 `datatype` -- `Data` should have `type` and `kind`
 
+[maybe] remove eval
+[maybe] remove print -- find should print
+
 type constraint should not be `String(x)`
 
 - should be `The(String, x)`

docs/tests/basic/let.ch

@@ -3,6 +3,3 @@ assert equal(x, 1)
 
 let [x, y] = [1, 2]
 assert equal([x, y], [1, 2])
-
-let f(x, y) = quote f(1, 2)
-assert equal([x, y], [1, 2])

docs/tests/globals/equal.ch

@@ -1,7 +1,2 @@
-print find x {
-  Equal(x, 1)
-}
-
 assert equal(1, 1)
-assert equal(quote a, quote a)
-assert not equal(quote a, quote b)
+assert not equal(1, 2)

docs/tests/goal/goal.ch

@@ -1,10 +1,3 @@
-clause Exp(var(name)) -- { String(name) }
-clause Exp(fn(name, ret)) -- { String(name) Exp(ret) }
-clause Exp(ap(target, arg)) -- { Exp(target) Exp(arg) }
-
-print Exp
-print Exp(quote var("x"))
-
 // TypeConstraint
 
 print Number

docs/tests/goal/goal.ch.out

@@ -1,4 +1,2 @@
-$Relation(Exp, 1)
-$Goal(Exp(var("x")))
 $TypeConstraint(Number)
 $Goal(Number(1))

src/lang/evaluate/evaluate.ts

@@ -91,10 +91,6 @@ export function evaluate(mod: Mod, env: Env, exp: Exp): Value {
       )
     }
 
-    case "Quote": {
-      return quote(mod, env, exp.exp)
-    }
-
     case "Eval": {
       return evaluate(mod, env, exp.exp)
     }

src/lang/exp/Exp.ts

@@ -14,7 +14,6 @@ export type Exp =
   | Dot
   | Ap
   | Fn
-  | Quote
   | Eval
   | Find
   | And
@@ -203,21 +202,6 @@ export function Fn(patterns: Array<Exp>, stmts: Array<Stmt>, span: Span): Fn {
   }
 }
 
-export type Quote = {
-  "@type": "Exp"
-  "@kind": "Quote"
-  exp: Exp
-  span: Span
-}
-
-export function Quote(exp: Exp, span: Span): Quote {
-  return {
-    "@type": "Exp",
-    "@kind": "Quote",
-    exp,
-    span,
-  }
-}
 
 export type Eval = {
   "@type": "Exp"

src/lang/format/formatExp.ts

@@ -66,10 +66,6 @@ export function formatExp(exp: Exp): string {
         : `(${patterns}) => {\n${indent(stmts.join("\n"))}\n}`
     }
 
-    case "Quote": {
-      return `quote ${formatExp(exp.exp)}`
-    }
-
     case "Eval": {
       return `eval ${formatExp(exp.exp)}`
     }

src/lang/quote/quote.ts

@@ -78,12 +78,6 @@ export function quote(mod: Mod, env: Env, exp: Exp): Value {
       )
     }
 
-    case "Quote": {
-      throw new Errors.LangError(`[quote] can not handle nested quote`, {
-        span: exp.span,
-      })
-    }
-
     case "Eval": {
       return evaluate(mod, env, exp.exp)
     }

src/lang/syntax-old/grammars/exp.ts

@@ -58,7 +58,6 @@ export const operand = {
       '"}"',
     ],
     "operand:fn_with_exp": [{ patterns: "args" }, '"="', '">"', { ret: "exp" }],
-    "operand:quote": ['"quote"', { exp: "exp" }],
     "operand:eval": ['"eval"', { exp: "exp" }],
     "operand:find": [
       '"find"',

src/lang/syntax-old/matchers/exp_matcher.ts

@@ -85,8 +85,6 @@ export function operand_matcher(tree: pt.Tree): Exp {
         [Stmts.Return(matchers.exp_matcher(ret), span)],
         span,
       ),
-    "operand:quote": ({ exp }, { span }) =>
-      Exps.Quote(matchers.exp_matcher(exp), span),
     "operand:eval": ({ exp }, { span }) =>
       Exps.Eval(matchers.exp_matcher(exp), span),
     "operand:find": ({ pattern, limit, goals }, { span }) => {

src/lang/var-collection/varCollectionFromExp.ts

@@ -51,10 +51,6 @@ export function varCollectionFromExp(exp: Exp): VarCollection {
       return createVarCollection()
     }
 
-    case "Quote": {
-      return varCollectionFromExp(exp.exp)
-    }
-
     case "Eval": {
       return createVarCollection()
     }