Changeset 12274

Timestamp:

11/10/09 19:34:18 (14 years ago)

Author:

ehuelsmann

Message:

Convert some uses of LispObject to Symbol.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Environment.java (modified) (1 diff)
• Lisp.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Environment.java

@@ -236 +236 @@
      * the current dynamic environment (thread) is checked.
      */
-  public boolean isDeclaredSpecial(LispObject var)
+  public boolean isDeclaredSpecial(Symbol var)
   {
     Binding binding = getBinding(var);

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -424 +424 @@
     if (obj instanceof Symbol)
       {
+        Symbol symbol = (Symbol)obj;
         LispObject result;
-        if (obj.isSpecialVariable())
-          {
-            if (obj.constantp())
-              return obj.getSymbolValue();
+        if (symbol.isSpecialVariable())
+          {
+            if (symbol.constantp())
+              return symbol.getSymbolValue();
             else
-              result = thread.lookupSpecial(obj);
-          }
-        else if (env.isDeclaredSpecial(obj))
-          result = thread.lookupSpecial(obj);
+              result = thread.lookupSpecial(symbol);
+          }
+        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));