Changeset 4072

Timestamp:

09/26/03 16:52:56 (20 years ago)

Author:

piso

Message:

SYS::%DEFUN: don't allow special operators to be redefined.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.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.441 2003-09-26 14:21:22 piso Exp $
+ * $Id: Primitives.java,v 1.442 2003-09-26 16:52:56 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1311 +1311 @@
     // %defun name arglist body => name
     private static final Primitive3 _DEFUN =
-        new Primitive3("%defun", PACKAGE_SYS, false) {
+        new Primitive3("%defun", PACKAGE_SYS, false)
+    {
         public LispObject execute(LispObject first, LispObject second,
-            LispObject third) throws ConditionThrowable
+                                  LispObject third)
+            throws ConditionThrowable
         {
             Symbol symbol = checkSymbol(first);
+            if (symbol.getSymbolFunction() instanceof SpecialOperator) {
+                String message =
+                    symbol.getName() + " is a special operator and may not be redefined";
+                throw new ConditionThrowable(new ProgramError(message));
+            }
             LispObject arglist = checkList(second);
             LispObject body = checkList(third);