Changeset 3845

Timestamp:

09/17/03 15:12:41 (20 years ago)

Author:

piso

Message:

typeOf(), classOf(), typep()

Location:

trunk/j/src/org/armedbear/lisp

Files:

• HashTable.java (modified) (2 diffs)
• LispFloat.java (modified) (3 diffs)

trunk/j/src/org/armedbear/lisp/HashTable.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: HashTable.java,v 1.16 2003-09-09 23:16:37 piso Exp $
+ * $Id: HashTable.java,v 1.17 2003-09-17 15:12:41 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -60 +60 @@
         buckets = new HashEntry[size];
         threshold = (int) (size * loadFactor);
+    }
+
+    public LispObject typeOf()
+    {
+        return Symbol.HASH_TABLE;
+    }
+
+    public LispClass classOf()
+    {
+        return LispClass.HASH_TABLE;
+    }
+
+    public LispObject typep(LispObject typeSpecifier) throws LispError
+    {
+        if (typeSpecifier == Symbol.HASH_TABLE)
+            return T;
+        if (typeSpecifier == LispClass.HASH_TABLE)
+            return T;
+        return super.typep(typeSpecifier);
     }
 

trunk/j/src/org/armedbear/lisp/LispFloat.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispFloat.java,v 1.42 2003-09-14 17:36:11 piso Exp $
+ * $Id: LispFloat.java,v 1.43 2003-09-17 15:09:56 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -36 +36 @@
     public LispObject typeOf()
     {
-        return Symbol.SINGLE_FLOAT;
+        return Symbol.FLOAT;
     }
 
     public LispClass classOf()
     {
-        return LispClass.findClass(Symbol.SINGLE_FLOAT);
+        return LispClass.FLOAT;
     }
 
     public LispObject typep(LispObject typeSpecifier) throws LispError
     {
+        if (typeSpecifier == Symbol.FLOAT)
+            return T;
+        if (typeSpecifier == LispClass.FLOAT)
+            return T;
+        if (typeSpecifier == Symbol.REAL)
+            return T;
+        if (typeSpecifier == Symbol.NUMBER)
+            return T;
         if (typeSpecifier == Symbol.SINGLE_FLOAT)
             return T;
@@ -53 +61 @@
             return T;
         if (typeSpecifier == Symbol.LONG_FLOAT)
-            return T;
-        if (typeSpecifier == Symbol.FLOAT)
-            return T;
-        if (typeSpecifier == Symbol.REAL)
-            return T;
-        if (typeSpecifier == Symbol.NUMBER)
             return T;
         return super.typep(typeSpecifier);