Changeset 4045

Timestamp:

09/25/03 00:40:16 (20 years ago)

Author:

piso

Message:

VECTOR-SUBSEQ: signal an error if start > end.

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.435 2003-09-24 22:50:56 piso Exp $
+ * $Id: Primitives.java,v 1.436 2003-09-25 00:40:16 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3895 +3895 @@
     };
 
+    // ### vector-subseq
+    // vector-subseq vector start &optional end => subsequence
     private static final Primitive3 VECTOR_SUBSEQ =
-        new Primitive3("vector-subseq", PACKAGE_SYS, false) {
-        public LispObject execute(LispObject vector, LispObject start,
-            LispObject end) throws ConditionThrowable
-        {
-            AbstractVector v = checkVector(vector);
-            return v.subseq(Fixnum.getValue(start),
-                end == NIL ? v.length() : Fixnum.getValue(end));
+        new Primitive3("vector-subseq", PACKAGE_SYS, false)
+    {
+        public LispObject execute(LispObject first, LispObject second,
+                                  LispObject third)
+            throws ConditionThrowable
+        {
+            AbstractVector v = checkVector(first);
+            int start = Fixnum.getValue(second);
+            int end = third != NIL ? Fixnum.getValue(third) : v.length();
+            if (start > end)
+                throw new ConditionThrowable(new TypeError("start is greater than end"));
+            return v.subseq(start, end);
         }
     };