Changeset 4543

Timestamp:

10/25/03 21:56:29 (18 years ago)

Author:

piso

Message:

SYMBOL-VALUE: symbol macro support.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (7 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.483 2003-10-25 18:55:08 dmcnaught Exp $
+ * $Id: Primitives.java,v 1.484 2003-10-25 21:56:29 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -75 +75 @@
     private static final int SYMBOL_PACKAGE             = 41;
     private static final int SYMBOL_PLIST               = 42;
-    private static final int SYMBOL_VALUE               = 43;
-    private static final int THIRD                      = 44;
-    private static final int UPPER_CASE_P               = 45;
-    private static final int VALUES_LIST                = 46;
-    private static final int VECTORP                    = 47;
+    private static final int THIRD                      = 43;
+    private static final int UPPER_CASE_P               = 44;
+    private static final int VALUES_LIST                = 45;
+    private static final int VECTORP                    = 46;
 
     // Primitive2
-    private static final int MEMBER                     = 48;
-    private static final int RPLACA                     = 49;
-    private static final int RPLACD                     = 50;
-    private static final int SET                        = 51;
+    private static final int MEMBER                     = 47;
+    private static final int RPLACA                     = 48;
+    private static final int RPLACD                     = 49;
+    private static final int SET                        = 50;
 
     private Primitives()
@@ -132 +131 @@
         definePrimitive1("symbol-package", SYMBOL_PACKAGE);
         definePrimitive1("symbol-plist", SYMBOL_PLIST);
-        definePrimitive1("symbol-value", SYMBOL_VALUE);
         definePrimitive1("third", THIRD);
         definePrimitive1("upper-case-p", UPPER_CASE_P);
@@ -243 +241 @@
             case SYMBOL_PACKAGE:                // ### symbol-package
                 return checkSymbol(arg).getPackage();
-            case SYMBOL_VALUE:                  // ### symbol-value
-                if (arg == T)
-                    return T;
-                if (arg == NIL)
-                    return NIL;
-                return checkSymbol(arg).symbolValue();
             case SYMBOL_FUNCTION: {             // ### symbol-function
                 LispObject function = arg.getSymbolFunction();
@@ -503 +495 @@
     };
 
+    // ### symbol-value
+    private static final Primitive1 SYMBOL_VALUE = new Primitive1("symbol-value")
+    {
+        public LispObject execute(LispObject arg) throws ConditionThrowable
+        {
+            if (arg == T)
+                return T;
+            if (arg == NIL)
+                return NIL;
+            LispObject value = checkSymbol(arg).symbolValue();
+            if (value instanceof SymbolMacro)
+                throw new ConditionThrowable(new LispError(arg + " has no dynamic value"));
+            return value;
+        }
+    };
+
     // ### +
-    private static final Primitive ADD = new Primitive("+") {
+    private static final Primitive ADD = new Primitive("+")
+    {
         public LispObject execute(LispObject first, LispObject second)
             throws ConditionThrowable
@@ -521 +530 @@
 
     // ### -
-    private static final Primitive SUBTRACT = new Primitive("-") {
+    private static final Primitive SUBTRACT = new Primitive("-")
+    {
         public LispObject execute(LispObject first, LispObject second)
             throws ConditionThrowable
@@ -4522 +4532 @@
                 abs = (LispFloat)((Complex)obj).ABS();
                 return Complex.getInstance(new LispFloat(Math.log(abs.getValue())), phase);
-            }           
-        }
-            
+            }
+        }
+
         throw new ConditionThrowable(new TypeError(obj, "number"));
     }