Changeset 4170

Timestamp:

10/02/03 00:20:02 (20 years ago)

Author:

piso

Message:

Moved FUNCTION and SETQ to SpecialOperators?.java.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (2 diffs)
• SpecialOperators.java (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.459 2003-10-02 00:02:56 piso Exp $
+ * $Id: Primitives.java,v 1.460 2003-10-02 00:20:02 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3081 +3081 @@
     };
 
-    // ### function
-    private static final SpecialOperator FUNCTION =
-        new SpecialOperator("function")
-    {
-        public LispObject execute(LispObject args, Environment env)
-            throws ConditionThrowable
-        {
-            final LispObject arg = args.car();
-            if (arg instanceof Symbol) {
-                LispObject functional = env.lookupFunctional(arg);
-                if (functional instanceof Autoload) {
-                    Autoload autoload = (Autoload) functional;
-                    autoload.load();
-                    functional = autoload.getSymbol().getSymbolFunction();
-                }
-                if (functional instanceof Function)
-                    return functional;
-                throw new ConditionThrowable(new UndefinedFunction(arg));
-            }
-            if (arg instanceof Cons) {
-                if (arg.car() == Symbol.LAMBDA)
-                    return new Closure(arg.cadr(), arg.cddr(), env);
-                if (arg.car() == Symbol.SETF) {
-                    LispObject f = get(checkSymbol(arg.cadr()),
-                                       PACKAGE_SYS.intern("SETF-FUNCTION"));
-                    if (f instanceof Function)
-                        return f;
-                }
-            }
-            throw new ConditionThrowable(new UndefinedFunction(arg));
-        }
-    };
-
-    // ### setq
-    private static final SpecialOperator SETQ = new SpecialOperator("setq") {
-        public LispObject execute(LispObject args, Environment env)
-            throws ConditionThrowable
-        {
-            LispObject value = Symbol.NIL;
-            final LispThread thread = LispThread.currentThread();
-            while (args != NIL) {
-                Symbol symbol = checkSymbol(args.car());
-                args = args.cdr();
-                value = eval(args.car(), env, thread);
-                if (symbol.isSpecialVariable()) {
-                    Environment dynEnv = thread.getDynamicEnvironment();
-                    if (dynEnv != null) {
-                        Binding binding = dynEnv.getBinding(symbol);
-                        if (binding != null) {
-                            binding.value = value;
-                            args = args.cdr();
-                            continue;
-                        }
-                    }
-                    symbol.setSymbolValue(value);
-                    args = args.cdr();
-                    continue;
-                }
-                // Not special.
-                Binding binding = env.getBinding(symbol);
-                if (binding != null)
-                    binding.value = value;
-                else
-                    symbol.setSymbolValue(value);
-                args = args.cdr();
-            }
-            return value;
-        }
-    };
-
     // ### multiple-value-bind
     // multiple-value-bind (var*) values-form declaration* form*

trunk/j/src/org/armedbear/lisp/SpecialOperators.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: SpecialOperators.java,v 1.2 2003-09-28 01:16:25 piso Exp $
+ * $Id: SpecialOperators.java,v 1.3 2003-10-02 00:19:50 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -250 +250 @@
         }
     };
+
+    // ### function
+    private static final SpecialOperator FUNCTION =
+        new SpecialOperator("function")
+    {
+        public LispObject execute(LispObject args, Environment env)
+            throws ConditionThrowable
+        {
+            final LispObject arg = args.car();
+            if (arg instanceof Symbol) {
+                LispObject functional = env.lookupFunctional(arg);
+                if (functional instanceof Autoload) {
+                    Autoload autoload = (Autoload) functional;
+                    autoload.load();
+                    functional = autoload.getSymbol().getSymbolFunction();
+                }
+                if (functional instanceof Function)
+                    return functional;
+                throw new ConditionThrowable(new UndefinedFunction(arg));
+            }
+            if (arg instanceof Cons) {
+                if (arg.car() == Symbol.LAMBDA)
+                    return new Closure(arg.cadr(), arg.cddr(), env);
+                if (arg.car() == Symbol.SETF) {
+                    LispObject f = get(checkSymbol(arg.cadr()),
+                                       PACKAGE_SYS.intern("SETF-FUNCTION"));
+                    if (f instanceof Function)
+                        return f;
+                }
+            }
+            throw new ConditionThrowable(new UndefinedFunction(arg));
+        }
+    };
+
+    // ### setq
+    private static final SpecialOperator SETQ = new SpecialOperator("setq") {
+        public LispObject execute(LispObject args, Environment env)
+            throws ConditionThrowable
+        {
+            LispObject value = Symbol.NIL;
+            final LispThread thread = LispThread.currentThread();
+            while (args != NIL) {
+                Symbol symbol = checkSymbol(args.car());
+                args = args.cdr();
+                value = eval(args.car(), env, thread);
+                if (symbol.isSpecialVariable()) {
+                    Environment dynEnv = thread.getDynamicEnvironment();
+                    if (dynEnv != null) {
+                        Binding binding = dynEnv.getBinding(symbol);
+                        if (binding != null) {
+                            binding.value = value;
+                            args = args.cdr();
+                            continue;
+                        }
+                    }
+                    symbol.setSymbolValue(value);
+                    args = args.cdr();
+                    continue;
+                }
+                // Not special.
+                Binding binding = env.getBinding(symbol);
+                if (binding != null)
+                    binding.value = value;
+                else
+                    symbol.setSymbolValue(value);
+                args = args.cdr();
+            }
+            return value;
+        }
+    };
 }