Merge pull request #36 from mkantor/housekeeping

Miscellaneous housekeeping

Author: mkantor

README.md

@@ -49,7 +49,7 @@ data representation implied by the fact that a value is an atom (e.g. the atom
 `2` may be an integer in memory).
 
 Bare words not containing any
-[reserved character sequences](./src/language/parsing/atom.ts#L24-L46) are
+[reserved character sequences](./src/language/parsing/atom.ts#L19-L41) are
 atoms:
 
 ```
@@ -210,8 +210,8 @@ languages:
 
 `plz` has a specific textual representation, but `plo` & `plt` could be encoded
 in any format in which hierarchial key/value pairs of strings are representable
-(currently only JSON is implemented, but YAML, TOML, HOCON, BSON, MessagePack,
-etc could be supported).
+(currently only JSON is implemented, but YAML, TOML, HOCON, BSON, S-expressions,
+MessagePack, CBOR, etc could be supported).
 
 Take this example `plz` program:
 

src/end-to-end.test.ts

@@ -120,17 +120,17 @@ testCases(endToEnd, code => code)('end-to-end tests', [
   [':flow({ :atom.append(a) :atom.append(b) })(z)', either.makeRight('zab')],
   [
     `{
-        // foo: bar
-        "static data":"blah blah blah"
-        "evaluated data": {
-          0:@runtime
-          function:{
-            0:@apply
-            function:{0:@lookup query:{0:object 1:lookup}}
-            argument:"key which does not exist in runtime context"
-          }
+      // foo: bar
+      "static data":"blah blah blah"
+      "evaluated data": {
+        0:@runtime
+        function:{
+          0:@apply
+          function:{0:@lookup query:{0:object 1:lookup}}
+          argument:"key which does not exist in runtime context"
         }
-      }`,
+      }
+    }`,
     either.makeRight({
       'static data': 'blah blah blah',
       'evaluated data': { tag: 'none', value: {} },

src/language/parsing/atom.ts

@@ -16,11 +16,6 @@ import { whitespace } from './trivia.js'
 
 export type Atom = string
 
-export const isAtom = (value: unknown): value is Atom =>
-  typeof value === 'string'
-
-export const unit = '' as const
-
 const atomComponentsRequiringQuotation = [
   whitespace,
   literal('"'),

src/language/parsing/molecule.ts

@@ -20,8 +20,6 @@ import { trivia } from './trivia.js'
 
 export type Molecule = { readonly [key: Atom]: Molecule | Atom }
 
-export const unit: Molecule = {}
-
 export const moleculeParser: Parser<Molecule> = lazy(
   () => potentiallySugaredMolecule,
 )

src/language/semantics/function-node.ts

@@ -7,6 +7,7 @@ import type {
   UnserializableValueError,
 } from '../errors.js'
 import type { Atom } from '../parsing.js'
+import type { ObjectNode } from './object-node.js'
 import {
   nodeTag,
   serialize,
@@ -21,7 +22,7 @@ export type FunctionNode = ((
   readonly [nodeTag]: 'function'
   readonly parameterName: Option<Atom>
   readonly signature: FunctionType['signature']
-  readonly serialize: () => Either<UnserializableValueError, SemanticGraph>
+  readonly serialize: () => Either<UnserializableValueError, ObjectNode>
 }
 
 export const isFunctionNode = (node: SemanticGraph) =>