From 7bd660a8c61540adcd0998122d89b3692cd127f8 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 30 Apr 2012 01:11:28 +0000 Subject: * lisp/core.lisp.in (fixnum?): New. * algebra/sex.spad.pamphlet: Use %float? instead of RNUM. Use %integer? instead of INTP. * interp/g-timer.boot: Use float? instead of RNUMP. * interp/i-coerce.boot: Use fixnum? instead of SINTP or SMINTP. * interp/i-intern.boot: Likewise. * interp/lisp-backend.boot: Likewise. * interp/slam.boot: Likewise. * interp/trace.boot: Likewise. * interp/vmlisp.lisp: Likewise. (INTP): Remove. (BINTP): Likewise. (LESSP): Likewise. (LINTP): Likewise. (MAKESTRING): Likewise. (MAPELT): Likewise. (NUMP): Likewise. (RNUMP): Likewise. (SINTP): Likewise. (SMINTP): Likewise. --- src/algebra/sex.spad.pamphlet | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/algebra') diff --git a/src/algebra/sex.spad.pamphlet b/src/algebra/sex.spad.pamphlet index cf7d13fb..7348c933 100644 --- a/src/algebra/sex.spad.pamphlet +++ b/src/algebra/sex.spad.pamphlet @@ -95,6 +95,7 @@ SExpressionOf(Str, Sym, Int, Flt, Expr): Decl == Body where Body ==> add import %integer?: % -> Boolean from Foreign Builtin + import %float?: % -> Boolean from Foreign Builtin import %string?: % -> Boolean from Foreign Builtin import %ident?: % -> Boolean from Foreign Builtin import %pair?: % -> Boolean from Foreign Builtin @@ -133,13 +134,13 @@ SExpressionOf(Str, Sym, Int, Flt, Expr): Decl == Body where string? b == %string? b symbol? b == %ident? b integer? b == %integer? b - float? b == RNUMP(b)$Lisp + float? b == %float? b destruct b == (list? b => b pretend List %; error "Non-list") string b == (%string? b => b pretend Str; error "Non-string") symbol b == (%ident? b => b pretend Sym;error "Non-symbol") - float b == (RNUMP(b)$Lisp => b pretend Flt;error "Non-float") - integer b == (INTP(b)$Lisp => b pretend Int;error "Non-integer") + float b == (%float? b => b pretend Flt;error "Non-float") + integer b == (%integer? b => b pretend Int;error "Non-integer") expr b == b pretend Expr convert(l: List %) == l pretend % -- cgit v1.2.3