Changeset 15023

Timestamp:

06/01/17 06:45:14 (6 years ago)

Author:

Mark Evenson

Message:

Extract common integer check

(Olof-Joachim Frahm)

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (1 diff)
• logand.java (modified) (1 diff)
• logeqv.java (modified) (1 diff)
• logior.java (modified) (1 diff)
• logxor.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -1083 +1083 @@
   }
 
-  public static Symbol checkSymbol(LispObject obj)
+  public static final LispInteger checkInteger(LispObject obj) {
+    if (obj instanceof LispInteger)
+      return (LispInteger) obj;
+    return (LispInteger) // Not reached.
+      type_error(obj, Symbol.INTEGER);
+  }
+
+  public static final Symbol checkSymbol(LispObject obj)
   {             
           if (obj instanceof Symbol)      

trunk/abcl/src/org/armedbear/lisp/logand.java

@@ -55 +55 @@
     public LispObject execute(LispObject arg)
     {
-        if (arg instanceof Fixnum || arg instanceof Bignum)
-            return arg;
-        return type_error(arg, Symbol.INTEGER);
+        return checkInteger(arg);
     }
 

trunk/abcl/src/org/armedbear/lisp/logeqv.java

@@ -57 +57 @@
     public LispObject execute(LispObject arg)
     {
-        if (arg instanceof Fixnum)
-            return arg;
-        if (arg instanceof Bignum)
-            return arg;
-        return type_error(arg, Symbol.INTEGER);
+        return checkInteger(arg);
     }
 

trunk/abcl/src/org/armedbear/lisp/logior.java

@@ -53 +53 @@
     public LispObject execute(LispObject arg)
     {
-        if (arg instanceof Fixnum || arg instanceof Bignum)
-            return arg;
-        return type_error(arg, Symbol.INTEGER);
+        return checkInteger(arg);
     }
 

trunk/abcl/src/org/armedbear/lisp/logxor.java

@@ -53 +53 @@
     public LispObject execute(LispObject arg)
     {
-        if (arg instanceof Fixnum || arg instanceof Bignum)
-            return arg;
-        return type_error(arg, Symbol.INTEGER);
+        return checkInteger(arg);
     }