diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 1 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 1 | ||||
| -rw-r--r-- | src/interp/g-timer.boot | 4 | ||||
| -rw-r--r-- | src/interp/i-syscmd.boot | 2 | ||||
| -rw-r--r-- | src/interp/msgdb.boot | 4 |
6 files changed, 14 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a3c91b02..29b8c952 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2010-05-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/tokens.boot: args is now a selector. + * interp/g-timer.boot: Use integer? in lieu of INTP. + * interp/i-syscmd.boot: Likewise. + * interp/msgdb.boot: Likewise. + +2010-05-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/sys-utility.boot (eval): Define here. * interp/br-con.boot: Use it. * interp/br-op1.boot: Likewise. diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 43f54797..c3c5105b 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -251,6 +251,7 @@ (LIST '|setDef| 6) (LIST '|aGeneral| 4) (LIST '|aMode| 1) (LIST '|aModeSet| 3) (LIST '|aTree| 0) (LIST '|aValue| 2) + (LIST '|args| 'CDR) (LIST '|attributes| 'CADDR) (LIST '|cacheCount| 'CADDDDR) (LIST '|cacheName| 'CADR) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index 0c6e8818..6fe50a64 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -314,6 +314,7 @@ for i in [ _ ["aModeSet", 3] , _ ["aTree", 0] , _ ["aValue", 2] , _ + ["args", "CDR"] , _ ["attributes", "CADDR"] , _ ["cacheCount", "CADDDDR"] , _ ["cacheName", "CADR"] , _ diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot index 49f73575..91b48708 100644 --- a/src/interp/g-timer.boot +++ b/src/interp/g-timer.boot @@ -99,7 +99,7 @@ normalizeStatAndStringify t == t := roundStat t t = 0.0 => '"0" FORMAT(nil,'"~,2F",t) - INTP t => + integer? t => K := 1024 M := K*K t > 9*M => strconc(STRINGIMAGE QUOTIENT(t + 512*K,M), '"M") @@ -109,7 +109,7 @@ normalizeStatAndStringify t == significantStat t == RNUMP t => (t > 0.01) - INTP t => (t > 100) + integer? t => (t > 100) true roundStat t == diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index fbc8fde0..6f46b0c0 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -2168,7 +2168,7 @@ dewritify ob == type = 'BPI => oname := ob.2 f := - INTP oname => eval GENSYMMER oname + integer? oname => eval GENSYMMER oname SYMBOL_-FUNCTION oname not COMPILED_-FUNCTION_-P f => error '"A required BPI does not exist." diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index 361ba344..0e758b04 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -254,7 +254,7 @@ $msgdbNoBlanksBeforeGroup := ['" ", " ", '"%", "%",_ $msgdbListPrims == '(%m %s %ce %rj "%m" "%s" "%ce" "%rj") noBlankBeforeP word== - INTP word => false + integer? word => false member(word,$msgdbNoBlanksBeforeGroup) => true if CVECP word and SIZE word > 1 then word.0 = char '% and word.1 = char 'x => return true @@ -266,7 +266,7 @@ $msgdbNoBlanksAfterGroup == ['" ", " ",'"%" ,"%", :$msgdbPrims, "[", "(", '"[", '"(" ] noBlankAfterP word== - INTP word => false + integer? word => false member(word,$msgdbNoBlanksAfterGroup) => true if CVECP word and (s := SIZE word) > 1 then word.0 = char '% and word.1 = char 'x => return true |