Merge branch 'master' of git://factorcode.org/git/factor
Conflicts: basis/regexp/regexp.factordb4
commit
c193f1b68a
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -176,6 +176,7 @@ SYMBOL: interactive-vocabs
|
|||
"memory"
|
||||
"namespaces"
|
||||
"prettyprint"
|
||||
"see"
|
||||
"sequences"
|
||||
"slicing"
|
||||
"sorting"
|
||||
|
|
Loading…
Reference in New Issue