Remove ark/index.ts

ursalang · Dec 1, 2023 · 74eb523 · 74eb523
1 parent e1254e6
commit 74eb523
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 24 deletions.
diff --git a/src/ark/index.ts b/src/ark/index.ts
diff --git a/src/ursa/basics.test.ts b/src/ursa/basics.test.ts
@@ -4,13 +4,14 @@
 // Released under the MIT license.
 
 import test from 'ava'
-
 import assert from 'assert'
+
 import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   debug,
-  ArkState, toJs,
-} from '../ark/index.js'
+  ArkState,
+} from '../ark/interpreter.js'
+import {toJs} from '../ark/ffi.js'
 
 import {compile, UrsaCompilerError} from './compiler.js'
 

diff --git a/src/ursa/cli.ts b/src/ursa/cli.ts
@@ -10,10 +10,14 @@ import {ArgumentParser, RawDescriptionHelpFormatter} from 'argparse'
 import assert from 'assert'
 
 import {
-  debug, ArkState, toJs,
+  debug, ArkState,
   ArkUndefined, ArkNull, ArkObject, ArkList, ArkValRef, ArkString, globals,
-  Environment, PartialCompiledArk, compile as arkCompile, serializeVal,
-} from '../ark/index.js'
+} from '../ark/interpreter.js'
+import {
+  Environment, CompiledArk, PartialCompiledArk, compile as arkCompile,
+} from '../ark/parser.js'
+import {toJs} from '../ark/ffi.js'
+import {serializeVal} from '../ark/serialize.js'
 
 import programVersion from '../version.js'
 import {runWithTraceback, compile as ursaCompile} from './compiler.js'
@@ -61,9 +65,17 @@ interface Args {
 }
 const args: Args = parser.parse_args() as Args
 
-function compile(exp: string, env: Environment = new Environment(), startRule?: string) {
-  const compiler = args.syntax === 'json' ? arkCompile : ursaCompile
-  const compiled = compiler(exp, env, startRule)
+function compile(
+  exp: string,
+  env: Environment = new Environment(),
+  startRule?: string,
+): CompiledArk {
+  let compiled: CompiledArk
+  if (args.syntax === 'json') {
+    compiled = arkCompile(exp, env)
+  } else {
+    compiled = ursaCompile(exp, env, startRule)
+  }
   if (process.env.DEBUG) {
     console.log('Compiled Ark')
     debug(compiled, null)

diff --git a/src/ursa/compiler.ts b/src/ursa/compiler.ts
@@ -9,13 +9,16 @@ import grammar, {UrsaSemantics} from '../grammar/ursa.ohm-bundle.js'
 import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   debug,
-  ArkState, intrinsics, ArkRuntimeError, ArkCompilerError, FreeVars,
-  ArkVal, ArkExp, ArkNull, ArkBoolean, ArkNumber, ArkString,
+  ArkState, intrinsics, ArkRuntimeError,
+  ArkVal, ArkExp, ArkLiteral, ArkNull, ArkBoolean, ArkNumber, ArkString,
   ArkSequence, ArkIf, ArkLoop, ArkAnd, ArkOr,
   ArkObjectLiteral, ArkListLiteral, ArkMapLiteral,
   ArkCall, ArkLet, ArkFn, ArkProperty, ArkGet, ArkSet,
-  CompiledArk, symRef, Environment, PartialCompiledArk, checkParamList, ArkLiteral,
-} from '../ark/index.js'
+} from '../ark/interpreter.js'
+import {
+  ArkCompilerError, FreeVars,
+  CompiledArk, symRef, Environment, PartialCompiledArk, checkParamList,
+} from '../ark/parser.js'
 
 // Specify precise type so semantics can be precisely type-checked.
 const semantics: UrsaSemantics = grammar.createSemantics()

diff --git a/src/ursa/testutil.ts b/src/ursa/testutil.ts
@@ -7,9 +7,9 @@ import test from 'ava'
 import tmp from 'tmp'
 import {execa} from 'execa'
 
-import {
-  ArkState, debug, toJs, compile as arkCompile, CompiledArk,
-} from '../ark/index.js'
+import {ArkState, debug} from '../ark/interpreter.js'
+import {compile as arkCompile, CompiledArk} from '../ark/parser.js'
+import {toJs} from '../ark/ffi.js'
 
 import {compile as ursaCompile} from './compiler.js'