Changeset 5022


Ignore:
Timestamp:
12/08/03 05:07:34 (17 years ago)
Author:
piso
Message:

Module.java is obsolete.

Location:
trunk/j/src/org/armedbear/lisp
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/Function.java

    r4531 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Function.java,v 1.25 2003-10-25 17:17:18 piso Exp $
     5 * $Id: Function.java,v 1.26 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    2424public abstract class Function extends Functional
    2525{
    26     private final Module module;
    2726    private final String name;
    2827    protected final int index;
     
    3433    protected Function()
    3534    {
    36         module = null;
    3735        name = null;
    3836        index = 0;
     
    4139    public Function(String name)
    4240    {
    43         module = null;
    4441        this.name = name != null ? name.toUpperCase() : null;
    4542        index = 0;
     
    6158                    String arglist, String docstring)
    6259    {
    63         module = null;
    6460        this.name = name != null ? name.toUpperCase() : null;
    6561        index = 0;
     
    8783            }
    8884        }
    89     }
    90 
    91     public Function(Module module, String name, int index)
    92     {
    93         this.module = module;
    94         this.name = name.toUpperCase();
    95         this.index = index;
    96         setLambdaName(Symbol.addFunction(this.name, this));
    9785    }
    9886
     
    136124    public LispObject execute(LispObject[] args) throws ConditionThrowable
    137125    {
    138         if (module != null)
    139             return module.dispatch(args, index);
    140126        throw new ConditionThrowable(new WrongNumberOfArgumentsException(name));
    141127    }
     
    144130    public LispObject execute(LispObject arg) throws ConditionThrowable
    145131    {
    146         if (module != null)
    147             return module.dispatch(arg, index);
    148132        LispObject[] args = new LispObject[1];
    149133        args[0] = arg;
     
    155139        throws ConditionThrowable
    156140    {
    157         if (module != null)
    158             return module.dispatch(first, second, index);
    159141        LispObject[] args = new LispObject[2];
    160142        args[0] = first;
  • trunk/j/src/org/armedbear/lisp/Makefile.in

    r5001 r5022  
    22
    33# Copyright (C) 2003 Peter Graves
    4 # $Id: Makefile.in,v 1.105 2003-12-07 17:02:17 piso Exp $
     4# $Id: Makefile.in,v 1.106 2003-12-08 05:07:34 piso Exp $
    55
    66# This program is free software; you can redistribute it and/or
     
    8181    MacroObject.class \
    8282    Main.class \
    83     Module.class \
    8483    Nil.class \
    8584    Package.class \
  • trunk/j/src/org/armedbear/lisp/Primitive.java

    r3871 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Primitive.java,v 1.6 2003-09-19 00:05:11 piso Exp $
     5 * $Id: Primitive.java,v 1.7 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4343    }
    4444
    45     public Primitive(Module module, String name, int index)
    46     {
    47         super(module, name, index);
    48     }
    49 
    5045    public LispObject execute() throws ConditionThrowable
    5146    {
  • trunk/j/src/org/armedbear/lisp/Primitive0.java

    r3883 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Primitive0.java,v 1.8 2003-09-19 01:46:42 piso Exp $
     5 * $Id: Primitive0.java,v 1.9 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4949    }
    5050
    51     public Primitive0(Module module, String name, int index)
    52     {
    53         super(module, name, index);
    54     }
    55 
    5651    public LispObject execute(LispObject first) throws ConditionThrowable
    5752    {
  • trunk/j/src/org/armedbear/lisp/Primitive1.java

    r3883 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Primitive1.java,v 1.8 2003-09-19 01:46:42 piso Exp $
     5 * $Id: Primitive1.java,v 1.9 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4949    }
    5050
    51     public Primitive1(Module module, String name, int index)
    52     {
    53         super(module, name, index);
    54     }
    55 
    5651    public LispObject execute() throws ConditionThrowable
    5752    {
  • trunk/j/src/org/armedbear/lisp/Primitive2.java

    r3883 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Primitive2.java,v 1.7 2003-09-19 01:46:42 piso Exp $
     5 * $Id: Primitive2.java,v 1.8 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4343    }
    4444
    45     public Primitive2(Module module, String name, int index)
    46     {
    47         super(module, name, index);
    48     }
    49 
    5045    public LispObject execute() throws ConditionThrowable
    5146    {
  • trunk/j/src/org/armedbear/lisp/Primitive3.java

    r3883 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: Primitive3.java,v 1.8 2003-09-19 01:46:42 piso Exp $
     5 * $Id: Primitive3.java,v 1.9 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    4343    }
    4444
    45     public Primitive3(Module module, String name, int index)
    46     {
    47         super(module, name, index);
    48     }
    49 
    5045    public LispObject execute() throws ConditionThrowable
    5146    {
  • trunk/j/src/org/armedbear/lisp/SpecialOperator.java

    r3871 r5022  
    33 *
    44 * Copyright (C) 2002-2003 Peter Graves
    5  * $Id: SpecialOperator.java,v 1.10 2003-09-19 00:05:11 piso Exp $
     5 * $Id: SpecialOperator.java,v 1.11 2003-12-08 05:06:10 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    2424public class SpecialOperator extends Functional
    2525{
    26     private final Module module;
    2726    private final String name;
    2827    private final int index;
     
    3231    public SpecialOperator(String name)
    3332    {
    34         this.module = null;
    3533        this.name = name.toUpperCase();
    3634        this.index = 0;
    37         setLambdaName(Symbol.addFunction(this.name, this));
    38     }
    39 
    40     public SpecialOperator(Module module, String name, int index)
    41     {
    42         this.module = module;
    43         this.name = name.toUpperCase();
    44         this.index = index;
    4535        setLambdaName(Symbol.addFunction(this.name, this));
    4636    }
     
    5444    {
    5545        return name;
    56     }
    57 
    58     public LispObject execute(LispObject args, Environment env)
    59         throws ConditionThrowable
    60     {
    61         return module.dispatch(args, env, index);
    6246    }
    6347
Note: See TracChangeset for help on using the changeset viewer.