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

[Erik Huelsmann]

Author: ehuelsmann
Date: Tue Nov 10 14:34:18 2009
New Revision: 12274

Log:
Convert some uses of LispObject to Symbol.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Environment.java
   trunk/abcl/src/org/armedbear/lisp/Lisp.java

Modified: trunk/abcl/src/org/armedbear/lisp/Environment.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Environment.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Environment.java	Tue Nov 10 14:34:18 2009
@@ -235,7 +235,7 @@
      * If there is no binding in the current (lexical) environment,
      * the current dynamic environment (thread) is checked.
      */
-  public boolean isDeclaredSpecial(LispObject var)
+  public boolean isDeclaredSpecial(Symbol var)
   {
     Binding binding = getBinding(var);
     return (binding != null) ? binding.specialp :

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Tue Nov 10 14:34:18 2009
@@ -423,21 +423,22 @@
       throw new ThreadDestroyed();
     if (obj instanceof Symbol)
       {
+        Symbol symbol = (Symbol)obj;
         LispObject result;
-        if (obj.isSpecialVariable())
+        if (symbol.isSpecialVariable())
           {
-            if (obj.constantp())
-              return obj.getSymbolValue();
+            if (symbol.constantp())
+              return symbol.getSymbolValue();
             else
-              result = thread.lookupSpecial(obj);
+              result = thread.lookupSpecial(symbol);
           }
-        else if (env.isDeclaredSpecial(obj))
-          result = thread.lookupSpecial(obj);
+        else if (env.isDeclaredSpecial(symbol))
+          result = thread.lookupSpecial(symbol);
         else
-          result = env.lookup(obj);
+          result = env.lookup(symbol);
         if (result == null)
           {
-            result = obj.getSymbolValue();
+            result = symbol.getSymbolValue();
             if (result == null)
               return error(new UnboundVariable(obj));
           }