git » jacl.git » commit 63a0dbf

diff --git a/jacl.js b/jacl.js
index becca80..ec22e30 100644
--- a/jacl.js
+++ b/jacl.js
@@ -701,7 +701,7 @@ const analyzeSpecials = new Map([
 
 const parseCall = (env, [func, ...args]) => {
   env = assoc(env, {context: "expr"});
-  const fenv = assoc(env, {context: "fexpr"})
+  const fenv = assoc(env, {context: "fun"})
   return {
     env: env,
     op: "call",
@@ -727,7 +727,7 @@ const analyzeList = (env, form) => {
 };
 
 const analyzeSymbol = (env, form) => {
-  if (env.context === "fexpr" || env.context === "expr") {
+  if (env.context === "fun" || env.context === "val") {
     if (env.locals[env.context].has(form)) {
       return {
         op: "local",
@@ -750,10 +750,10 @@ const analyzeSymbol = (env, form) => {
 
 const emptyEnv = { 
   locals: {
-    fexpr: new Map(),
-    expr: new Map()
+    fun: new Map(),
+    val: new Map()
   },
-  context: "expr"
+  context: "val"
 };
 
 const analyze = (env, form) => {
@@ -762,7 +762,7 @@ const analyze = (env, form) => {
   } else if (form instanceof Cons) {
     return analyzeList(env, form);
   } else {
-    return mapOf("op", "constant", "env", env, "form", form);
+    return { op: "constant", env: env, form: form };
   }
 };