[armedbear-cvs] r11769 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Apr 20 04:31:34 2009
New Revision: 11769

Log:
Rename variables to be more in line with the env/ext pattern used elsewhere.

Modified:
   trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java

Modified: trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java	Mon Apr 20 04:31:34 2009
@@ -330,7 +330,7 @@
     LispObject defs = checkList(args.car());
     final LispThread thread = LispThread.currentThread();
     final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
-    final Environment ext = new Environment(env);
+    final Environment funEnv = new Environment(env);
     while (defs != NIL)
       {
         final LispObject def = checkList(defs.car());
@@ -373,16 +373,16 @@
           list(recursive ? Symbol.LABELS : Symbol.FLET, name);
         Closure closure =
           new Closure(lambda_name, lambda_expression,
-                      recursive ? ext : env);
-        ext.addFunctionBinding(name, closure);
+                      recursive ? funEnv : env);
+        funEnv.addFunctionBinding(name, closure);
         defs = defs.cdr();
       }
     try
       {
-        final Environment innerEnv = new Environment(ext);
+        final Environment ext = new Environment(funEnv);
         LispObject body = args.cdr();
-        body = innerEnv.processDeclarations(body);
-        return progn(body, innerEnv, thread);
+        body = ext.processDeclarations(body);
+        return progn(body, ext, thread);
       }
     finally
       {