armedbear-devel November 2009

armedbear-devel@common-lisp.net

12 participants
38 discussions

Re: [armedbear-devel] DEFUN (SETF ...)s
by logicmoo＠gmail.com 23 Nov '09

23 Nov '09

It looks to be a loadtime thing (offline Erik thought maybe it was so) See this output: Armed Bear Common Lisp 0.18.0-dev (built Mon Nov 23 2009 12:07:35 PST) Java 1.6.0_10 Sun Microsystems Inc. Java HotSpot(TM) 64-Bit Server VM Low-level initialization completed in 0.658 seconds. Startup completed in 1.516 seconds. Type ":help" for a list of available commands. CL-USER(1): (jfield "dmiles.TestClass" "StaticField") "fresh" CL-USER(2): (setf (jfield "dmiles.TestClass" "StaticField") "stuff") Debugger invoked on condition of type UNDEFINED-FUNCTION: The function (SETF JFIELD) is undefined. Restarts: 0: TOP-LEVEL Return to top level. [1] CL-USER(3): 0 CL-USER(4): (setf (jfield "dmiles.TestClass" "StaticField") "stuff") Debugger invoked on condition of type UNDEFINED-FUNCTION: The function (SETF JFIELD) is undefined. Restarts: 0: TOP-LEVEL Return to top level. [1] CL-USER(5): :bt 0: (SYSTEM:BACKTRACE) 1: (INVOKE-DEBUGGER #<UNDEFINED-FUNCTION {27F40B69}>) 2: org.armedbear.lisp.Lisp.error(Lisp.java:365) 3: org.armedbear.lisp.SpecialOperators$14.execute(SpecialOperators.java:493) 4: org.armedbear.lisp.Lisp.eval(Lisp.java:461) 5: org.armedbear.lisp.Lisp.evalCall(Lisp.java:501) 6: org.armedbear.lisp.Lisp.eval(Lisp.java:471) 7: org.armedbear.lisp.Lisp.progn(Lisp.java:640) [1] CL-USER(6): 0 CL-USER(7): (setf (jfield "dmiles.TestClass" "StaticField") "stuff") "stuff" CL-USER(8):

2 1

[armedbear-devel] DEFUN (SETF ...)s
by logicmoo＠gmail.com 23 Nov '09

23 Nov '09

Help me out! I made a class called: TestClass ------------------------src/dmiles/TestClass.java--------------------- package dmiles public class TestClass { static public String StaticField = "fresh"; } ------------------------------------------------------------------------- Now in the REPL everything works fine. Armed Bear Common Lisp 0.18.0-dev (built Mon Nov 23 2009 06:46:01 PST) Java 1.6.0_10 Sun Microsystems Inc. Java HotSpot(TM) 64-Bit Server VM Low-level initialization completed in 0.658 seconds. Startup completed in 1.877 seconds. Type ":help" for a list of available commands. CL-USER(1): (defun (setf jfield) (newvalue class-ref-or-field field-or-instance &optional ( instance :noinst) unused-value) (declare (ignorable unused-value)) (if (eq instance :noinst) (jfield class-ref-or-field field-or-instance newvalue) (jfield class-ref-or-field field-or-instance instance newvalue))) (SETF JFIELD) CL-USER(2): (jfield "dmiles.TestClass" "StaticField") "fresh" CL-USER(3): (define-symbol-macro %TESTSYM (jfield "dmiles.TestClass" "StaticField")) %TESTSYM CL-USER(4): CL-USER(4): %TESTSYM "fresh" CL-USER(5): (setf %TESTSYM "flithy") "flithy" CL-USER(6): %TESTSYM "flithy" CL-USER(7): (jfield "dmiles.TestClass" "StaticField") "flithy" CL-USER(8): --------------------------------------------------------------------------------- Question: locally I added this to the bottem of java.lisp (defun (setf jfield) (newvalue class-ref-or-field field-or-instance &optional ( instance :noinst) unused-value) (declare (ignorable unused-value)) (if (eq instance :noinst) (jfield class-ref-or-field field-or-instance newvalue) (jfield class-ref-or-field field-or-instance instance newvalue))) Cleaned and rebuilt the system.. To test it: Armed Bear Common Lisp 0.18.0-dev (built Mon Nov 23 2009 12:07:35 PST) Java 1.6.0_10 Sun Microsystems Inc. Java HotSpot(TM) 64-Bit Server VM Low-level initialization completed in 0.564 seconds. Startup completed in 1.651 seconds. Type ":help" for a list of available commands. CL-USER(1): (jfield "dmiles.TestClass" "StaticField") "fresh" CL-USER(2): (define-symbol-macro %TESTSYM (jfield "dmiles.TestClass" "StaticField")) %TESTSYM CL-USER(3): %TESTSYM "fresh" CL-USER(4): (setf %TESTSYM "flithy") Debugger invoked on condition of type UNDEFINED-FUNCTION: The function (SETF JFIELD) is undefined. Restarts: 0: TOP-LEVEL Return to top level. [1] CL-USER(5): :bt 0: (SYSTEM:BACKTRACE) 1: (INVOKE-DEBUGGER #<UNDEFINED-FUNCTION {50E26AE7}>) 2: org.armedbear.lisp.Lisp.error(Lisp.java:365) 3: org.armedbear.lisp.SpecialOperators$14.execute(SpecialOperators.java:493) 4: org.armedbear.lisp.Lisp.eval(Lisp.java:461) 5: org.armedbear.lisp.Lisp.evalCall(Lisp.java:501) 6: org.armedbear.lisp.Lisp.eval(Lisp.java:471) 7: org.armedbear.lisp.Lisp.progn(Lisp.java:640) [1] CL-USER(6): Hw do a add a new (defun (setf ..) .. .) to the library?

1 0

Re: [armedbear-devel] SETF for JFEILDS
by dmiles＠users.sourceforge.net 23 Nov '09

23 Nov '09

> ----- Original Message ----- > From: "Alessio Stalla" <alessiostalla(a)gmail.com> > To: <dmiles(a)users.sourceforge.net> > Cc: "Armed Bear" <armedbear-devel(a)common-lisp.net> > Sent: Monday, November 23, 2009 9:18 AM > Subject: Re: [armedbear-devel] SETF for JFEILDS > > > On Mon, Nov 23, 2009 at 5:57 PM, <logicmoo(a)gmail.com> wrote: >> Ok even Allegro uses T and NIL for the Booleans.. which is why >> >>> CL-USER(17): (jclass-of (jfield "java.lang.Boolean" "TRUE")) >>> NIL >>> NIL >> >> was still correct.. I think the closer we stick with Allegro the better. >> >> >> >> for future reference (to myself) to make a boolean one does: >> >> >> CL-USER(21): (jnew (jconstructor "java.lang.Boolean" "java.lang.String") "True") >> #<java.lang.Boolean true {44AC5E}> >> CL-USER(22): (jclass-of (jnew (jconstructor "java.lang.Boolean" "java.lang.String") "True")) >> "java.lang.Boolean" >> "java.lang.Boolean" > > If you want a boolean (primitive type) I believe you can do > (make-immediate-object T-or-NIL :boolean) (make-immediate-object t :boolean) #<java.lang.Boolean true {1C904F75}> Neat, I hadn't known (or forgot) about Arg2 of #'make-immediate-object ! Thx > If you want Boolean.TRUE or Boolean.FALSE the cleaner way would be to > have a jfield-raw like jcall-raw, if I understand it correctly. CL-USER(24): (jfield-raw "java.lang.Boolean" "TRUE") #<java.lang.Boolean true {465098F9}> Indeed. >> >> >> If there is any action items out of all this: >> >> Perhaps: javaInstance() on Nil returns Boolean.FALSE? > > This would break a lot of existing code, I'm afraid. NIL is often used > to mean null. *nod* well either meaning is just as dubious.. but as you say allot of existing code likes NIL to mean EMPTY which sounds more like a 'null' than a 'false'. > >> Then in Symbol.java >> >> Object javaInstance() { >> if (this == T) return Boolean.TRUE; >> return super.javaInstance(); >> } >> > > I don't agree for consistency with NIL and for similar concerns on > existing code. However, hold on... > >> >> And in LispObject itself any thoughts on? >> >> LispObject.this.javaInstance(Class c) { >> if (c.isInstance(this)) return this; >> // widen and resubmit for subclasses >> if (c==int.class) return javaInstance(Integer.class); >> if (c==boolean.class) return javaInstance(Boolean.class); >> // they requested a boolean.. give it to them >> if (c==Boolean.class) return getBooleanValue(); >> ..... >> //hit the error logic >> } > > Now for javaInstance(Class) I completely agree with you: it should > mean - everywhere! - "convert this object to a Java object of the > given class, if possible". > > So LispObject.javaInstance(Class c) should be like you said, and in > some subclasses (Fixnum, AbstractString come to my mind) it should be > overridden. Good > At that point we could even generify it: > > public <T> T javaInstance(Class<T> c) > > So users might write, e.g., String s = myLispObject.javaInstance(String.class); > I like the generics for it as well > Just my €.02 > > Alessio > >> >> >> ----- Original Message ----- >> From: <dmiles(a)users.sourceforge.net> >> To: "Armed Bear" <armedbear-devel(a)common-lisp.net> >> Sent: Monday, November 23, 2009 7:42 AM >> Subject: Re: [armedbear-devel] SETF for JFEILDS >> >> >>> >>> These 3 look good >>> >>> >>> CL-USER(2): (jclass-of (jfield "java.lang.System" "out")) >>> "java.io.PrintStream" >>> "java.io.PrintStream" >>> >>> CL-USER(4): (jclass-of 1) >>> NIL >>> NIL >>> >>> CL-USER(5): (jclass-of (make-immediate-object 1)) >>> "java.lang.Integer" >>> "java.lang.Integer" >>> >>> >>> >>> But is this correct? >>> >>> >>> CL-USER(17): (jclass-of (jfield "java.lang.Boolean" "TRUE")) >>> NIL >>> NIL >>> CL-USER(18): (jclass-of (jfield "java.lang.Boolean" "FALSE")) >>> NIL >>> NIL >>> >>> >>> >>> >> >> _______________________________________________ >> armedbear-devel mailing list >> armedbear-devel(a)common-lisp.net >> http://common-lisp.net/cgi-bin/mailman/listinfo/armedbear-devel >> > > _______________________________________________ > armedbear-devel mailing list > armedbear-devel(a)common-lisp.net > http://common-lisp.net/cgi-bin/mailman/listinfo/armedbear-devel

1 0

Re: [armedbear-devel] SETF for JFEILDS
by logicmoo＠gmail.com 23 Nov '09

23 Nov '09

Ok even Allegro uses T and NIL for the Booleans.. which is why > CL-USER(17): (jclass-of (jfield "java.lang.Boolean" "TRUE")) > NIL > NIL was still correct.. I think the closer we stick with Allegro the better. for future reference (to myself) to make a boolean one does: CL-USER(21): (jnew (jconstructor "java.lang.Boolean" "java.lang.String") "True") #<java.lang.Boolean true {44AC5E}> CL-USER(22): (jclass-of (jnew (jconstructor "java.lang.Boolean" "java.lang.String") "True")) "java.lang.Boolean" "java.lang.Boolean" If there is any action items out of all this: Perhaps: javaInstance() on Nil returns Boolean.FALSE? Then in Symbol.java Object javaInstance() { if (this == T) return Boolean.TRUE; return super.javaInstance(); } And in LispObject itself any thoughts on? LispObject.this.javaInstance(Class c) { if (c.isInstance(this)) return this; // widen and resubmit for subclasses if (c==int.class) return javaInstance(Integer.class); if (c==boolean.class) return javaInstance(Boolean.class); // they requested a boolean.. give it to them if (c==Boolean.class) return getBooleanValue(); ..... //hit the error logic } ----- Original Message ----- From: <dmiles(a)users.sourceforge.net> To: "Armed Bear" <armedbear-devel(a)common-lisp.net> Sent: Monday, November 23, 2009 7:42 AM Subject: Re: [armedbear-devel] SETF for JFEILDS > > These 3 look good > > > CL-USER(2): (jclass-of (jfield "java.lang.System" "out")) > "java.io.PrintStream" > "java.io.PrintStream" > > CL-USER(4): (jclass-of 1) > NIL > NIL > > CL-USER(5): (jclass-of (make-immediate-object 1)) > "java.lang.Integer" > "java.lang.Integer" > > > > But is this correct? > > > CL-USER(17): (jclass-of (jfield "java.lang.Boolean" "TRUE")) > NIL > NIL > CL-USER(18): (jclass-of (jfield "java.lang.Boolean" "FALSE")) > NIL > NIL > > > >

2 1

Re: [armedbear-devel] SETF for JFEILDS
by logicmoo＠gmail.com 23 Nov '09

23 Nov '09

Does anyone object to adding this to java.lisp? If not could it be done? (defun (setf jfield) (newvalue class-ref-or-field field-or-instance &optional ( instance :noinst) (value :novalue)) (if (eq instance :noinst) (jfield class-ref-or-field field-or-instance newvalue) (jfield class-ref-or-field field-or-instance instance newvalue))) ----- Original Message ----- From: <dmiles(a)users.sourceforge.net> To: "Armed Bear" <armedbear-devel(a)common-lisp.net> Sent: Tuesday, November 10, 2009 12:24 AM Subject: SETF for JFEILDS > Hi, > > Could we add add something like this to java.lisp? > > (defun (setf jfield) > (newvalue class-ref-or-field field-or-instance &optional ( instance :noinst) (value :novalue)) > (if (eq instance :noinst) > (jfield class-ref-or-field field-or-instance newvalue) > (jfield class-ref-or-field field-or-instance instance newvalue))) > > -Thx

2 3

Re: [armedbear-devel] SETF for JFEILDS
by logicmoo＠gmail.com 23 Nov '09

23 Nov '09

So actually (defun (setf jfield) (newvalue class-ref-or-field field-or-instance &optional ( instance :noinst) unusedvalue) (if (eq instance :noinst) (jfield class-ref-or-field field-or-instance newvalue) (jfield class-ref-or-field field-or-instance instance newvalue))) Would be a little better.. good eye. ----- Original Message ----- From: <dmiles(a)users.sourceforge.net> To: "Alessio Stalla" <alessiostalla(a)gmail.com> Cc: "Armed Bear" <armedbear-devel(a)common-lisp.net> Sent: Monday, November 23, 2009 6:27 AM Subject: Re: [armedbear-devel] SETF for JFEILDS > > ----- Original Message ----- > From: "Alessio Stalla" <alessiostalla(a)gmail.com> > To: <dmiles(a)users.sourceforge.net> > Cc: "Armed Bear" <armedbear-devel(a)common-lisp.net> > Sent: Monday, November 23, 2009 5:42 AM > Subject: Re: [armedbear-devel] SETF for JFEILDS > > > On Mon, Nov 23, 2009 at 2:36 PM, <logicmoo(a)gmail.com> wrote: >>> Does anyone object to adding this to java.lisp? If not could it be done? >>> >>> (defun (setf jfield) >>> (newvalue class-ref-or-field field-or-instance &optional ( instance :noinst) (value :novalue)) >>> (if (eq instance :noinst) >>> (jfield class-ref-or-field field-or-instance newvalue) >>> (jfield class-ref-or-field field-or-instance instance newvalue))) > >>It seems a nice idea to me, but there are a couple of things that I >>don't understand: > > A>- why :noinst and not simply nil? > > JFIELD is defined as: class-ref-or-field field-or-instance &optional instance value > The valid argument patterns for this operation are: > (class-ref field-name): to retrieve the value of a static field. > (class-ref field-name instance-ref): to retrieve the value of a class field of the instance. > (class-ref field-name primitive-value:) to store primitive-value in a static field. > (class-ref field-name instance-ref value): to store value in a class field of the instance. > (class-ref field-name nil value): to store value in a static field (when value may be confused with an instance-ref). > (field-name instance): to retrieve the value of a field of the instance. The class is derived from the instance. > (field-name instance value): to store value in a field of the instance. The class is derived from the instance. > > JFIELD doesn't distingusih between static and non static fields > > Also cases of "class-ref field-name instance-ref value" (accessing superclass field) > > Depending on how the field is defined > > (setf (jfield *MyClass* "someStaticBooleanField") NIL) > it is distinguable from > (setf (jfield *MySuperClass* "nonStaticBooleanField" *my-instance* ) NIL) > > > -------------------------------------------------------------------------------------------------------------------------- > A>- value is not used, what's the point of it? > > correct the "default :novalue" is not needed. > (I was debugging and trying to find corner cases with all those bizzare legal jfield signatures ) > > > but... "value" as an &optional was needed to match the signature of what is legal for jfield so things like this can work: > > (define-symbol-macro %iscold (jfield "org.armedbear.lisp.Lisp" "cold")) > %iscold ;; ==> NIL > (setq %iscold T) ;; ==> T > %iscold ;; ==> T > (setq %iscold NIL) ;; ==> NIL > >

1 0

[armedbear-devel] PATCH to StopExtendingLisp for 12281
by logicmoo＠gmail.com 23 Nov '09

23 Nov '09

PATCH to StopExtendingLisp for trunk 12281 This patch uncompressed to 105k and it effects many files It has a some goals: When foreign libs instancing a subclass of LispObject to not get Lisp.<clinit> called until its time. Removes an invoke-special from bytecode of LispObject Marks Lisp class as final - (A new file LispTrampolinesFile.java is put in as a historical placeholder for static trampoline classes that once extended Lisp) Does not pass or fail any extra ANSI-TESTS

1 0

Re: [armedbear-devel] [j-devel] Compilation Problem in ABCL 0.17
by Mark Evenson 15 Nov '09

15 Nov '09

On 11/15/09 10:03 PM, Dr. Thomas Sturm wrote: > I am using a 64-bit Mac with Snow Leopard (Mac OSX 10.6.2). I didi not do anything special but simply went (compile-file "test") in a fresh session. > > Here is my banner of ABCL: > > sturm@lennier[~] abcl > Armed Bear Common Lisp 0.17.0 > Java 1.6.0_15 Apple Inc. > Java HotSpot(TM) 64-Bit Server VM > Low-level initialization completed in 0.348 seconds. > Startup completed in 0.936 seconds. > Type ":help" for a list of available commands. > CL-USER(1): > > The ABCL is not from the svn but the 0.17.0 distribution as of last Saturday. […] I can reproduce your problem as well with ABCL trunk under the same OS/JVM. No idea yet on fixing it, but I will file a bug report for you. Mark -- "A screaming comes across the sky. It has happened before, but there is nothing to compare to it now."

1 0

Re: [armedbear-devel] Inline primitives as static method calls
by logicmoo＠gmail.com 11 Nov '09

11 Nov '09

> > ----- Original Message ----- > From: "Alessio Stalla" <alessiostalla(a)gmail.com> > To: <dmiles(a)users.sourceforge.net> > Cc: "Armed Bear" <armedbear-devel(a)common-lisp.net> > Sent: Tuesday, November 10, 2009 1:12 AM > Subject: Re: [armedbear-devel] Inline primitives as static method calls > > > On Tue, Nov 10, 2009 at 9:01 AM, <logicmoo(a)gmail.com> wrote: >> Alessio, >> Excellent Work! >> >> Your .patch is what I meant. > > Thanks! > >> >>> when compiled it is translated as a direct call to the static >>> method, without passing through the symbol, which is faster than now >> >> Perfect - Yeah >> >> >> >> A Side note: >>> >>> When interpreted or passed as a higher-order function an >>> InlinedPrimitive calls the static method through reflection, resulting >>> in slower performance than now. >> >> I wrote a workaround for this into LarKC because of the performance >> degradation. >> >> So later on.... >> Like after we have everything working/vetted calling static inlines as much >> as possible. >> And using InlinePrimtives to call reflection... >> >> >> >> We'll have some options like: "FixedArityFunctor": >> >> http://larkc.svn.sourceforge.net/viewvc/larkc/trunk/platform/src/com/cyc/to… >> >> What I did was created a new Class via ASM that contains a single >> execute(a,b,c,d,e,f) signature per "args used". >> That simply calls the static method . >> >> So in InlinePrimitive later suplimented with some extras like: >> >> //The methodWith0Args - methodWithNArgs is what that .java url above >> generates. >> LispObject execute() { >> return methodWith0Args.evaluate(); >> } >> LispObject execute(LispObject a0) { >> return methodWith1Args.evaluate(a0); >> } >> LispObject execute(LispObject a0,LispObject a1) { >> return methodWith2Args.evaluate(a0,a1); >> } >> etc >> >> >> Figured I should mention the "FixedArityFunctor" so we dont get scared off >> by any performance >> degration of higher level calls before we learn all the benefits of inlining >> static functions! > > Ok, I'm not sure I followed everything. Oh the above was attempting to describe LarKC SubLisp implementation of this article: http://www.ibm.com/developerworks/java/library/j-dyn0610/ I couldnt find it before sending the email! The intial LarKC implemention used reflection in the same maner as InlinedPrimive does. The after reading that article, I found I could replace Method[] cache inside InlinedPrimive with generated methodStubs produced runtime for reflection performance. > but consider also that the > implementation through reflection is the default one, for convenience, > but you can still override the various execute() methods and call the > static method directly (of course, you have to make sure the method > you call is the same as the one you pass in the constructor, or things > start to behave differently in interpreted vs compiled code and that's > definitely not good :D). Something like > > new InlinedPrimitive(My.class, "myMethod", ...) { > public LispObject execute(LispObject arg) { > return My.myMethod(arg); > } > } Yup, InlinePrimtive still leaves that option open. If someone really wanted to, they can do that with a couple of their InlinedPrimtives if they noticed one particualtar method was getting called quite a bit. Making the instance execute call the static function (Like EQ/EQL/EQUAL for instance avoiding reflection.) > > The class I posted lacks the constructors taking the class and the > method, because I have been lazy ;), but they can easily be added - > with the caveat that, since the call to super() must be the first and > for Function super() sometimes (always?) installs the function in a > symbol (iirc), if you pass a wrong class/method to InlinedPrimitive > and as a result an exception is thrown, you'll have a symbol pointing > to an invalid function. I realy do like how you did it as factory method: public static final Primitive COPY_TREE = InlinedPrimitive.get(Primitives.class, "copyTree", Symbol.COPY_TREE, "object"); And depending on safety/speed you could save the string name of the class and method name for later and not even try to resolve the method[] until first time call.. and signal an error then if not found. This could be used like autoloading. > > Bye, > Ale

2 1

[armedbear-devel] Array Cleanup Example
by logicmoo＠gmail.com 11 Nov '09

11 Nov '09

Here is an example of an array cleanup that might be usefull. * It uses Arrays.fill(...) when it can * throwing badMajorRowIndex from one array (repeated code) This one is a bit questionable: * It started out as int32[] backing becasue we needed one extra signless bit to represent a 'unit16' PROS: Also notice the previous was constantly: store -> unboxing , get -> reboxing So almost anytime we wanted to store .. we took a submitted valid Fixnum.. then forgot about it. Then when we want a value: we have to recreate a fixnum to replace the one we had previously lost. CONS: On a 32bit machine the new represention takes the same ram 64 bit machine takes twice the ram after the refactor. Later on we might decide to allow this array to participate in the JavaObject ontology .. if so, then this is a neat object for storing unsigned shorts.. however would JavaObject ever rerpresent Unsigned numbers? ----------------------------------------------------------------------------------- Index: src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java =================================================================== --- src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java (revision 12275) +++ src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java (working copy) @@ -33,17 +33,19 @@ package org.armedbear.lisp; +import java.util.Arrays; + public final class SimpleArray_UnsignedByte16 extends AbstractArray { private final int[] dimv; private final int totalSize; - private final int[] data; + private final Fixnum[] data; public SimpleArray_UnsignedByte16(int[] dimv) { this.dimv = dimv; totalSize = computeTotalSize(dimv); - data = new int[totalSize]; + data = new Fixnum[totalSize]; } public SimpleArray_UnsignedByte16(int[] dimv, LispObject initialContents) @@ -57,7 +59,7 @@ rest = rest.elt(0); } totalSize = computeTotalSize(dimv); - data = new int[totalSize]; + data = new Fixnum[totalSize]; setInitialContents(0, dimv, initialContents, 0); } @@ -75,7 +77,7 @@ rest = rest.elt(0); } totalSize = computeTotalSize(dimv); - data = new int[totalSize]; + data = new Fixnum[totalSize]; setInitialContents(0, dimv, initialContents, 0); } @@ -85,7 +87,7 @@ { if (dims.length == 0) { try { - data[index] = coerceLispObjectToJavaByte(contents); + data[index] = checkValue(contents); } catch (ArrayIndexOutOfBoundsException e) { error(new LispError("Bad initial contents for array.")); @@ -192,10 +194,10 @@ public int aref(int index) { try { - return data[index]; + return data[index].value; } catch (ArrayIndexOutOfBoundsException e) { - error(new TypeError("Bad row major index " + index + ".")); + badRowMajorIndex(index); // Not reached. return 0; } @@ -205,21 +207,33 @@ public LispObject AREF(int index) { try { - return Fixnum.getInstance(data[index]); + return data[index]; } catch (ArrayIndexOutOfBoundsException e) { - return error(new TypeError("Bad row major index " + index + ".")); + return badRowMajorIndex(index); } } + + private LispObject badRowMajorIndex(int index) { + return error(new TypeError("Bad row major index " + index + ".")); + } + public static Fixnum checkValue(LispObject obj) + { + if (obj instanceof Fixnum) { + return (Fixnum)obj; + } + return (Fixnum)type_error(obj, UNSIGNED_BYTE_16); + } + @Override public void aset(int index, LispObject obj) { try { - data[index] = Fixnum.getValue(obj); + data[index] = checkValue(obj); } catch (ArrayIndexOutOfBoundsException e) { - error(new TypeError("Bad row major index " + index + ".")); + badRowMajorIndex(index); } } @@ -259,11 +273,10 @@ public LispObject get(int[] subscripts) { try { - return Fixnum.getInstance(data[getRowMajorIndex(subscripts)]); + return data[getRowMajorIndex(subscripts)]; } catch (ArrayIndexOutOfBoundsException e) { - return error(new TypeError("Bad row major index " + - getRowMajorIndex(subscripts) + ".")); + return badRowMajorIndex(getRowMajorIndex(subscripts)); } } @@ -272,20 +285,17 @@ { try { - data[getRowMajorIndex(subscripts)] = Fixnum.getValue(obj); + data[getRowMajorIndex(subscripts)] = checkValue(obj); } catch (ArrayIndexOutOfBoundsException e) { - error(new TypeError("Bad row major index " + - getRowMajorIndex(subscripts) + ".")); + badRowMajorIndex(getRowMajorIndex(subscripts)); } } @Override public void fill(LispObject obj) { - int n = Fixnum.getValue(obj); - for (int i = totalSize; i-- > 0;) - data[i] = n; + Arrays.fill(data, 0, totalSize, checkValue(obj)); } @Override

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

armedbear-devel November 2009