From c8e50c69725188f4a48d1e215d00d917dfc7c3d1 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 19 Jan 2011 09:06:24 +0000 Subject: * interp/vmlisp.lisp (FIXP): Remove. * interp/alql.boot: Use integer? instead of FIXP. * interp/br-con.boot: Likewise. * interp/br-op1.boot: Likewise. * interp/c-util.boot: Likewise. * interp/fnewmeta.lisp: Likewise. * interp/ht-root.boot: Likewise. * interp/i-analy.boot: Likewise. * interp/i-syscmd.boot: Likewise. * interp/i-toplev.boot: Likewise. * interp/interop.boot: Likewise. * interp/lisplib.boot: Likewise. * interp/mark.boot: Likewise. * interp/newfort.boot: Likewise. * interp/nrunfast.boot: Likewise. * interp/pspad1.boot: Likewise. * interp/setvars.boot: Likewise. * interp/showimp.boot: Likewise. * interp/slam.boot: Likewise. * interp/topics.boot: Likewise. * interp/trace.boot: Likewise. * interp/wi1.boot: Likewise. * interp/wi2.boot: Likewise. * interp/word.boot: Likewise. --- src/interp/wi2.boot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/interp/wi2.boot') diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 5d35ac34..51d2fe33 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- Copyright (C) 2007-2011, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -832,8 +832,8 @@ smallIntegerStep(it,index,start,inc,optFinal,e) == null (start':= comp(start,$SmallInteger,e)) => nil null (inc':= comp(inc,$SmallInteger,start'.env)) => nil if optFinal is [final] and not (final':= comp(final,$SmallInteger,inc'.env)) then --- not (FIXP startNum and FIXP incNum) => return nil --- null FIXP startNum or abs startNum > 100 => return nil +-- not (integer? startNum and integer? incNum) => return nil +-- null integer? startNum or abs startNum > 100 => return nil -----> assume that optFinal is $SmallInteger T := comp(final,$EmptyMode,inc'.env) or return nil final' := T @@ -843,7 +843,7 @@ smallIntegerStep(it,index,start,inc,optFinal,e) == [.,.,e]:= compMakeDeclaration(index,indexmode, (final' => final'.env; inc'.env)) or return nil range := - FIXP startNum and FIXP incNum => + integer? startNum and integer? incNum => startNum > 0 and incNum > 0 => $PositiveInteger startNum < 0 and incNum < 0 => $NegativeInteger incNum > 0 => $NonNegativeInteger --startNum = 0 -- cgit v1.2.3