Changeset 11478


Ignore:
Timestamp:
12/25/08 11:46:10 (13 years ago)
Author:
ehuelsmann
Message:

Cleanup: remove dead code (including a redefinition of 'equals' which is the same as its super definition); add @Override annotations.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
6 edited

Legend:

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

    r11391 r11478  
    137137    }
    138138
     139    @Override
    139140    public LispObject typeOf()
    140141    {
     
    142143    }
    143144
     145    @Override
    144146    public LispObject classOf()
    145147    {
     
    147149    }
    148150
     151    @Override
    149152    public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
    150153    {
     
    158161    }
    159162
     163    @Override
    160164    public final LispObject getPropertyList()
    161165    {
     
    165169    }
    166170
     171    @Override
    167172    public final void setPropertyList(LispObject obj)
    168173    {
     
    178183    }
    179184
     185    @Override
    180186    public LispObject execute() throws ConditionThrowable
    181187    {
     
    183189    }
    184190
     191    @Override
    185192    public LispObject execute(LispObject arg) throws ConditionThrowable
    186193    {
     
    188195    }
    189196
     197    @Override
    190198    public LispObject execute(LispObject first, LispObject second)
    191199        throws ConditionThrowable
     
    194202    }
    195203
     204    @Override
    196205    public LispObject execute(LispObject first, LispObject second,
    197206                              LispObject third)
     
    201210    }
    202211
     212    @Override
    203213    public LispObject execute(LispObject first, LispObject second,
    204214                              LispObject third, LispObject fourth)
     
    208218    }
    209219
     220    @Override
    210221    public LispObject execute(LispObject first, LispObject second,
    211222                              LispObject third, LispObject fourth,
     
    216227    }
    217228
     229    @Override
    218230    public LispObject execute(LispObject first, LispObject second,
    219231                              LispObject third, LispObject fourth,
     
    224236    }
    225237
     238    @Override
    226239    public LispObject execute(LispObject first, LispObject second,
    227240                              LispObject third, LispObject fourth,
     
    233246    }
    234247
     248    @Override
    235249    public LispObject execute(LispObject first, LispObject second,
    236250                              LispObject third, LispObject fourth,
     
    242256    }
    243257
     258    @Override
    244259    public LispObject execute(LispObject[] args) throws ConditionThrowable
    245260    {
     
    247262    }
    248263
     264    @Override
    249265    public String writeToString() throws ConditionThrowable
    250266    {
     
    291307    }
    292308
     309    @Override
    293310    // Profiling.
    294311    public final int getCallCount()
     
    297314    }
    298315
     316    @Override
    299317    public void setCallCount(int n)
    300318    {
     
    302320    }
    303321
     322    @Override
    304323    public final void incrementCallCount()
    305324    {
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r11391 r11478  
    19341934    new Primitive("remember", PACKAGE_SYS, true)
    19351935    {
     1936      @Override
    19361937      public LispObject execute(LispObject key, LispObject value)
    19371938        throws ConditionThrowable
     
    24802481  public static final LispObject UNBOUND_VALUE = new LispObject()
    24812482    {
     2483      @Override
    24822484      public String writeToString()
    24832485      {
     
    24882490  public static final LispObject NULL_VALUE = new LispObject()
    24892491    {
     2492      @Override
    24902493      public String writeToString()
    24912494      {
  • trunk/abcl/src/org/armedbear/lisp/Operator.java

    r11391 r11478  
    6060    }
    6161
     62    @Override
    6263    public LispObject getParts() throws ConditionThrowable
    6364    {
  • trunk/abcl/src/org/armedbear/lisp/SocketStream.java

    r11391 r11478  
    4646    }
    4747
     48    @Override
    4849    public LispObject typeOf()
    4950    {
     
    5152    }
    5253
     54    @Override
    5355    public LispObject classOf()
    5456    {
     
    5658    }
    5759
     60    @Override
    5861    public LispObject typep(LispObject type) throws ConditionThrowable
    5962    {
     
    6568    }
    6669
     70    @Override
    6771    public LispObject close(LispObject abort) throws ConditionThrowable
    6872    {
     
    7680    }
    7781
     82    @Override
    7883    public String toString()
    7984    {
  • trunk/abcl/src/org/armedbear/lisp/Symbol.java

    r11391 r11478  
    9696  }
    9797
     98  @Override
    9899  public LispObject typeOf()
    99100  {
     
    105106  }
    106107
     108  @Override
    107109  public LispObject classOf()
    108110  {
     
    110112  }
    111113
     114  @Override
    112115  public LispObject getDescription() throws ConditionThrowable
    113116  {
     
    138141  }
    139142
     143  @Override
    140144  public LispObject getParts() throws ConditionThrowable
    141145  {
     
    151155  }
    152156
     157  @Override
    153158  public LispObject typep(LispObject type) throws ConditionThrowable
    154159  {
     
    164169  }
    165170
     171  @Override
    166172  public final LispObject SYMBOLP()
    167173  {
     
    169175  }
    170176
     177  @Override
    171178  public boolean constantp()
    172179  {
     
    174181  }
    175182
     183  @Override
    176184  public final LispObject STRING()
    177185  {
     
    189197  }
    190198
     199  @Override
    191200  public final boolean isSpecialOperator()
    192201  {
     
    194203  }
    195204
     205  @Override
    196206  public final boolean isSpecialVariable()
    197207  {
     
    275285
    276286  // Raw accessor.
     287  @Override
    277288  public LispObject getSymbolValue()
    278289  {
     
    327338  }
    328339
     340  @Override
    329341  public LispObject getSymbolFunction()
    330342  {
     
    332344  }
    333345
     346  @Override
    334347  public final LispObject getSymbolFunctionOrDie() throws ConditionThrowable
    335348  {
     
    360373  }
    361374
     375  @Override
    362376  public final LispObject getPropertyList()
    363377  {
     
    367381  }
    368382
     383  @Override
    369384  public final void setPropertyList(LispObject obj)
    370385  {
     
    374389  }
    375390
     391  @Override
    376392  public String writeToString() throws ConditionThrowable
    377393  {
     
    686702  }
    687703
     704  @Override
    688705  public final int sxhash()
    689706  {
     
    697714  }
    698715
    699   public final boolean equals(Object obj)
    700   {
    701     return this == obj;
    702   }
    703 
     716  @Override
    704717  public LispObject execute() throws ConditionThrowable
    705718  {
     
    714727  }
    715728
     729  @Override
    716730  public LispObject execute(LispObject arg) throws ConditionThrowable
    717731  {
     
    726740  }
    727741
     742  @Override
    728743  public LispObject execute(LispObject first, LispObject second)
    729744    throws ConditionThrowable
     
    739754  }
    740755
     756  @Override
    741757  public LispObject execute(LispObject first, LispObject second,
    742758                            LispObject third)
     
    753769  }
    754770
     771  @Override
    755772  public LispObject execute(LispObject first, LispObject second,
    756773                            LispObject third, LispObject fourth)
     
    767784  }
    768785
     786  @Override
    769787  public LispObject execute(LispObject first, LispObject second,
    770788                            LispObject third, LispObject fourth,
     
    782800  }
    783801
     802  @Override
    784803  public LispObject execute(LispObject first, LispObject second,
    785804                            LispObject third, LispObject fourth,
     
    798817  }
    799818
     819  @Override
    800820  public LispObject execute(LispObject first, LispObject second,
    801821                            LispObject third, LispObject fourth,
     
    817837  }
    818838
     839  @Override
    819840  public LispObject execute(LispObject first, LispObject second,
    820841                            LispObject third, LispObject fourth,
     
    836857  }
    837858
     859  @Override
    838860  public LispObject execute(LispObject[] args) throws ConditionThrowable
    839861  {
     
    849871        return handleNPE(e, list);
    850872      }
    851   }
    852 
    853   private final LispObject signalNPE(NullPointerException e)
    854     throws ConditionThrowable
    855   {
    856     if (function == null)
    857       return error(new UndefinedFunction(this));
    858     Debug.trace(e);
    859     return error(new LispError("Null pointer exception"));
    860873  }
    861874
     
    870883  }
    871884
     885  @Override
    872886  public void incrementCallCount()
    873887  {
  • trunk/abcl/src/org/armedbear/lisp/socket_stream.java

    r11434 r11478  
    4444    }
    4545
     46    @Override
    4647    public LispObject execute(LispObject first, LispObject second, LispObject third)
    4748        throws ConditionThrowable
Note: See TracChangeset for help on using the changeset viewer.