re-org ADT

Author: xieyuheng

src/lang/neutral/Neutral.ts

@@ -1,11 +1,9 @@
 import { type FnRec, type Value } from "../value/index.ts"
 
 export type Neutral = Var | Ap | ApRecursive
-
-export type Var = {
-  kind: "Var"
-  name: string
-}
+export type Var = { kind: "Var"; name: string }
+export type Ap = { kind: "Ap"; target: Neutral; arg: Value }
+export type ApRecursive = { kind: "ApRecursive"; fn: FnRec; arg: Neutral }
 
 export function Var(name: string): Var {
   return {
@@ -14,12 +12,6 @@ export function Var(name: string): Var {
   }
 }
 
-export type Ap = {
-  kind: "Ap"
-  target: Neutral
-  arg: Value
-}
-
 export function Ap(target: Neutral, arg: Value): Ap {
   return {
     kind: "Ap",
@@ -28,12 +20,6 @@ export function Ap(target: Neutral, arg: Value): Ap {
   }
 }
 
-export type ApRecursive = {
-  kind: "ApRecursive"
-  fn: FnRec
-  arg: Neutral
-}
-
 export function ApRecursive(fn: FnRec, arg: Neutral): ApRecursive {
   return {
     kind: "ApRecursive",

src/lang/stmt/Stmt.ts

@@ -1,10 +1,19 @@
 import { type Exp } from "../exp/Exp.ts"
 
 export type Stmt = AssertEqual | AssertNotEqual | Compute | Define | Import
+export type AssertEqual = { kind: "AssertEqual"; exps: Array<Exp> }
+export type AssertNotEqual = { kind: "AssertNotEqual"; exps: Array<Exp> }
+export type Compute = { kind: "Compute"; exp: Exp }
+export type Define = { kind: "Define"; name: string; exp: Exp }
+export type Import = {
+  kind: "Import"
+  path: string
+  entries: Array<ImportEntry>
+}
 
-export type AssertEqual = {
-  kind: "AssertEqual"
-  exps: Array<Exp>
+export type ImportEntry = {
+  name: string
+  rename?: string
 }
 
 export function AssertEqual(exps: Array<Exp>): AssertEqual {
@@ -14,36 +23,20 @@ export function AssertEqual(exps: Array<Exp>): AssertEqual {
   }
 }
 
-export type AssertNotEqual = {
-  kind: "AssertNotEqual"
-  exps: Array<Exp>
-}
-
 export function AssertNotEqual(exps: Array<Exp>): AssertNotEqual {
   return {
     kind: "AssertNotEqual",
     exps,
   }
 }
 
-export type Compute = {
-  kind: "Compute"
-  exp: Exp
-}
-
 export function Compute(exp: Exp): Compute {
   return {
     kind: "Compute",
     exp,
   }
 }
 
-export type Define = {
-  kind: "Define"
-  name: string
-  exp: Exp
-}
-
 export function Define(name: string, exp: Exp): Define {
   return {
     kind: "Define",
@@ -52,17 +45,6 @@ export function Define(name: string, exp: Exp): Define {
   }
 }
 
-export type ImportEntry = {
-  name: string
-  rename?: string
-}
-
-export type Import = {
-  kind: "Import"
-  path: string
-  entries: Array<ImportEntry>
-}
-
 export function Import(path: string, entries: Array<ImportEntry>): Import {
   return {
     kind: "Import",

src/lang/value/Value.ts

@@ -4,10 +4,16 @@ import { type Mod } from "../mod/index.ts"
 import { type Neutral } from "../neutral/index.ts"
 
 export type Value = NotYet | Fn | FnRec | Lazy
-
-export type NotYet = {
-  kind: "NotYet"
-  neutral: Neutral
+export type NotYet = { kind: "NotYet"; neutral: Neutral }
+export type Lazy = { kind: "Lazy"; mod: Mod; env: Env; exp: Exp; cache?: Value }
+export type Fn = { kind: "Fn"; mod: Mod; env: Env; name: string; ret: Exp }
+export type FnRec = {
+  kind: "FnRec"
+  mod: Mod
+  env: Env
+  recName: string
+  name: string
+  ret: Exp
 }
 
 export function NotYet(neutral: Neutral): NotYet {
@@ -17,12 +23,14 @@ export function NotYet(neutral: Neutral): NotYet {
   }
 }
 
-export type Fn = {
-  kind: "Fn"
-  mod: Mod
-  env: Env
-  name: string
-  ret: Exp
+export function Lazy(mod: Mod, env: Env, exp: Exp, cache?: Value): Lazy {
+  return {
+    kind: "Lazy",
+    mod,
+    env,
+    exp,
+    cache,
+  }
 }
 
 export function Fn(mod: Mod, env: Env, name: string, ret: Exp): Fn {
@@ -35,15 +43,6 @@ export function Fn(mod: Mod, env: Env, name: string, ret: Exp): Fn {
   }
 }
 
-export type FnRec = {
-  kind: "FnRec"
-  mod: Mod
-  env: Env
-  recName: string
-  name: string
-  ret: Exp
-}
-
 export function FnRec(
   mod: Mod,
   env: Env,
@@ -60,21 +59,3 @@ export function FnRec(
     ret,
   }
 }
-
-export type Lazy = {
-  kind: "Lazy"
-  mod: Mod
-  env: Env
-  exp: Exp
-  cache?: Value
-}
-
-export function Lazy(mod: Mod, env: Env, exp: Exp, cache?: Value): Lazy {
-  return {
-    kind: "Lazy",
-    mod,
-    env,
-    exp,
-    cache,
-  }
-}