Changeset 4566

Timestamp:

10/29/03 00:32:51 (18 years ago)

Author:

piso

Message:

SETQ

File:

• trunk/j/src/org/armedbear/lisp/SpecialOperators.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: SpecialOperators.java,v 1.10 2003-10-28 16:01:02 piso Exp $
+ * $Id: SpecialOperators.java,v 1.11 2003-10-29 00:32:51 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -343 +343 @@
                 Symbol symbol = checkSymbol(args.car());
                 args = args.cdr();
-                value = eval(args.car(), env, thread);
                 Binding binding = null;
                 if (symbol.isSpecialVariable()) {
@@ -357 +356 @@
                         LispObject expansion =
                             ((SymbolMacro)binding.value).getExpansion();
-                        LispObject form = list3(Symbol.SETF, expansion, value);
-                        eval(form, env, thread);
-                    } else
+                        LispObject form = list3(Symbol.SETF, expansion, args.car());
+                        value = eval(form, env, thread);
+                    } else {
+                        value = eval(args.car(), env, thread);
                         binding.value = value;
+                    }
                 } else {
                     if (symbol.getSymbolValue() instanceof SymbolMacro) {
                         LispObject expansion =
                             ((SymbolMacro)symbol.getSymbolValue()).getExpansion();
-                        LispObject form = list3(Symbol.SETF, expansion, value);
-                        eval(form, env, thread);
-                    } else
+                        LispObject form = list3(Symbol.SETF, expansion, args.car());
+                        value = eval(form, env, thread);
+                    } else {
+                        value = eval(args.car(), env, thread);
                         symbol.setSymbolValue(value);
+                    }
                 }
                 args = args.cdr();