Changeset 5909


Ignore:
Timestamp:
02/24/04 00:32:03 (17 years ago)
Author:
piso
Message:

Moved ARRAY-DISPLACEMENT from DisplacedArray?.java to Primitives.java.

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

Legend:

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

    r5892 r5909  
    33 *
    44 * Copyright (C) 2003-2004 Peter Graves
    5  * $Id: Autoload.java,v 1.161 2004-02-22 23:59:38 piso Exp $
     5 * $Id: Autoload.java,v 1.162 2004-02-24 00:32:03 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    210210        autoload("acos", "MathFunctions");
    211211        autoload("acosh", "MathFunctions");
    212         autoload("array-displacement", "DisplacedArray");
    213212        autoload("ash", "ash");
    214213        autoload("asin", "MathFunctions");
  • trunk/j/src/org/armedbear/lisp/DisplacedArray.java

    r5908 r5909  
    33 *
    44 * Copyright (C) 2003-2004 Peter Graves
    5  * $Id: DisplacedArray.java,v 1.25 2004-02-23 19:56:55 piso Exp $
     5 * $Id: DisplacedArray.java,v 1.26 2004-02-24 00:31:35 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    242242        return sb.toString();
    243243    }
    244 
    245     // ### array-displacement
    246     // array-displacement array => displaced-to, displaced-index-offset
    247     private static final Primitive1 ARRAY_DISPLACEMENT =
    248         new Primitive1("array-displacement","array")
    249     {
    250         public LispObject execute(LispObject arg) throws ConditionThrowable
    251         {
    252             return checkArray(arg).arrayDisplacement();
    253         }
    254     };
    255244}
  • trunk/j/src/org/armedbear/lisp/Primitives.java

    r5908 r5909  
    33 *
    44 * Copyright (C) 2002-2004 Peter Graves
    5  * $Id: Primitives.java,v 1.576 2004-02-23 19:56:55 piso Exp $
     5 * $Id: Primitives.java,v 1.577 2004-02-24 00:31:45 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    17161716    };
    17171717
     1718    // ### array-displacement
     1719    // array-displacement array => displaced-to, displaced-index-offset
     1720    private static final Primitive1 ARRAY_DISPLACEMENT =
     1721        new Primitive1("array-displacement", "array")
     1722    {
     1723        public LispObject execute(LispObject arg) throws ConditionThrowable
     1724        {
     1725            return checkArray(arg).arrayDisplacement();
     1726        }
     1727    };
     1728
    17181729    // ### array-in-bounds-p
    17191730    // array-in-bounds-p array &rest subscripts => generalized-boolean
     
    17991810
    18001811    private static final int arrayRowMajorIndex(AbstractArray array,
    1801                                                 LispObject[] subscripts) throws ConditionThrowable
     1812                                                LispObject[] subscripts)
     1813        throws ConditionThrowable
    18021814    {
    18031815        final int rank = array.getRank();
Note: See TracChangeset for help on using the changeset viewer.