diff --git a/basis/compiler/tree/cleanup/cleanup-tests.factor b/basis/compiler/tree/cleanup/cleanup-tests.factor index 4a2e8671fb..e451694f48 100755 --- a/basis/compiler/tree/cleanup/cleanup-tests.factor +++ b/basis/compiler/tree/cleanup/cleanup-tests.factor @@ -514,4 +514,9 @@ cell-bits 32 = [ [ t ] [ [ { fixnum fixnum } declare = ] \ both-fixnums? inlined? +] unit-test + +[ t ] [ + [ { integer integer } declare + drop ] + { + +-integer-integer } inlined? ] unit-test \ No newline at end of file diff --git a/basis/math/partial-dispatch/partial-dispatch.factor b/basis/math/partial-dispatch/partial-dispatch.factor index 6618578a99..08cd8fb470 100644 --- a/basis/math/partial-dispatch/partial-dispatch.factor +++ b/basis/math/partial-dispatch/partial-dispatch.factor @@ -84,7 +84,7 @@ M: word integer-op-input-classes : define-integer-op-word ( fix-word big-word triple -- ) [ - [ 2nip integer-op-word ] [ integer-op-quot ] 3bi + [ 2nip integer-op-word dup make-foldable ] [ integer-op-quot ] 3bi (( x y -- z )) define-declared ] [ 2nip diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor index df253184c3..7f27a13104 100644 --- a/basis/regexp/regexp.factor +++ b/basis/regexp/regexp.factor @@ -40,7 +40,7 @@ M: lookbehind question>quot ! Returns ( index string -- ? ) : match-index-from ( i string regexp -- index/f ) ! This word is unsafe. It assumes that i is a fixnum ! and that string is a string. - dup dfa>> execute( index string regexp -- i/f ) ; + dup dfa>> execute-unsafe( index string regexp -- i/f ) ; GENERIC: end/start ( string regexp -- end start ) M: regexp end/start drop length 0 ; @@ -78,7 +78,7 @@ TUPLE: match { i read-only } { j read-only } { seq read-only } ; : do-next-match ( i string regexp -- i start end string ) dup next-match>> - execute( i string regexp -- i start end string ) ; + execute-unsafe( i string regexp -- i start end string ) ; : next-slice ( i string regexp -- i/f slice/f ) do-next-match diff --git a/core/parser/parser.factor b/core/parser/parser.factor index ac1c2695f2..c68d453b15 100644 --- a/core/parser/parser.factor +++ b/core/parser/parser.factor @@ -176,6 +176,7 @@ SYMBOL: interactive-vocabs "memory" "namespaces" "prettyprint" + "see" "sequences" "slicing" "sorting"