Changeset 4090

Timestamp:

09/28/03 00:47:10 (20 years ago)

Author:

piso

Message:

Moved QUOTE, IF, LET, LET* to SpecialOperators?.java.

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.445 2003-09-27 18:31:20 piso Exp $
+ * $Id: Primitives.java,v 1.446 2003-09-28 00:47:10 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -456 +456 @@
     };
 
-    // ### quote
-    private static final SpecialOperator QUOTE = new SpecialOperator("quote") {
-        public LispObject execute(LispObject args, Environment env)
-            throws ConditionThrowable
-        {
-            return args.car();
-        }
-    };
-
     // ### atom
     private static final Primitive1 ATOM = new Primitive1("atom") {
@@ -590 +581 @@
                     return result;
                 }
-            }
-        }
-    };
-
-    // ### if
-    private static final SpecialOperator IF = new SpecialOperator("if") {
-        public LispObject execute(LispObject args, Environment env)
-            throws ConditionThrowable
-        {
-            final LispThread thread = LispThread.currentThread();
-            switch (args.length()) {
-                case 2: {
-                    if (eval(args.car(), env, thread) != NIL)
-                        return eval(args.cadr(), env, thread);
-                    return NIL;
-                }
-                case 3: {
-                    if (eval(args.car(), env, thread) != NIL)
-                        return eval(args.cadr(), env, thread);
-                    return eval(args.cdr().cadr(), env, thread);
-                }
-                default:
-                    throw new ConditionThrowable(new WrongNumberOfArgumentsException("IF"));
             }
         }
@@ -2786 +2754 @@
     };
 
-    private static final SpecialOperator LET = new SpecialOperator("let") {
-        public LispObject execute(LispObject args, Environment env)
-            throws ConditionThrowable
-        {
-            return _let(args, env, false);
-        }
-    };
-
-    private static final SpecialOperator LETX = new SpecialOperator("let*") {
-        public LispObject execute(LispObject args, Environment env)
-            throws ConditionThrowable
-        {
-            return _let(args, env, true);
-        }
-    };
-
-    private static final LispObject _let(LispObject args, Environment env,
-                                         boolean sequential)
-        throws ConditionThrowable
-    {
-        LispObject varList = checkList(args.car());
-        final LispThread thread = LispThread.currentThread();
-        LispObject result = NIL;
-        if (varList != NIL) {
-            Environment oldDynEnv = thread.getDynamicEnvironment();
-            try {
-                Environment ext = new Environment(env);
-                Environment evalEnv = sequential ? ext : env;
-                for (int i = varList.length(); i-- > 0;) {
-                    LispObject obj = varList.car();
-                    varList = varList.cdr();
-                    if (obj instanceof Cons) {
-                        bind(checkSymbol(obj.car()),
-                             eval(obj.cadr(), evalEnv, thread),
-                             ext);
-                    } else
-                        bind(checkSymbol(obj), NIL, ext);
-                }
-                LispObject body = args.cdr();
-                while (body != NIL) {
-                    result = eval(body.car(), ext, thread);
-                    body = body.cdr();
-                }
-            }
-            finally {
-                thread.setDynamicEnvironment(oldDynEnv);
-            }
-        } else {
-            LispObject body = args.cdr();
-            while (body != NIL) {
-                result = eval(body.car(), env, thread);
-                body = body.cdr();
-            }
-        }
-        return result;
-    }
-
     private static final LispObject _flet(LispObject args, Environment env,
         boolean recursive) throws ConditionThrowable