steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "core: >array, >byte-vector, >hashtable, >vector should be inline." 

This reverts commit cd6026e70e.
db4
John Benediktsson 2012-10-05 08:30:41 -07:00
parent 040b94f5ce
commit 28f36a25b0
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/arrays/arrays.factor
View File

@ -14,7 +14,7 @@ M: f new-sequence drop [ f ] [ 0 <array> ] if-zero ; inline
INSTANCE: array sequence
: >array ( seq -- array ) { } clone-like ; inline
: >array ( seq -- array ) { } clone-like ;
: 1array ( x -- array ) 1 swap <array> ; inline
: 2array ( x y -- array ) { } 2sequence ; inline
: 3array ( x y z -- array ) { } 3sequence ; inline

2
core/byte-vectors/byte-vectors.factor
View File

@ -12,7 +12,7 @@ TUPLE: byte-vector
(byte-array) 0 byte-vector boa ; inline
: >byte-vector ( seq -- byte-vector )
>byte-array dup length byte-vector boa ; inline
>byte-array dup length byte-vector boa ;
M: byte-vector like
drop dup byte-vector? [

2
core/hashtables/hashtables.factor
View File

@ -166,7 +166,7 @@ M: assoc new-assoc drop <hashtable> ; inline
M: f new-assoc drop <hashtable> ; inline
: >hashtable ( assoc -- hashtable )
H{ } assoc-clone-like ; inline
H{ } assoc-clone-like ;
M: hashtable assoc-like
drop dup hashtable? [ >hashtable ] unless ; inline

2
core/vectors/vectors.factor
View File

@ -10,7 +10,7 @@ TUPLE: vector
: <vector> ( n -- vector ) 0 <array> 0 vector boa ; inline
: >vector ( seq -- vector ) V{ } clone-like ; inline
: >vector ( seq -- vector ) V{ } clone-like ;
M: vector like
drop dup vector? [

2
misc/vim/syntax/factor.vim
View File

@ -70,7 +70,7 @@ syn cluster factorReal contains=factorInt,factorFloat,factorPosRatio,fa
syn cluster factorNumber contains=@factorReal,factorComplex
syn cluster factorNumErr contains=factorBinErr,factorHexErr,factorOctErr
syn match factorInt /\<-\=[0-9]\([0-9,]*[0-9]\)\?\([eE]\([+-]\)\?[0-9]\+\)\?\>/
syn match factorFloat /\<-\=[0-9]\([0-9,]*[0-9]\)\?\(\.\(\([0-9,]*[0-9]\+\)\?\([eE]\([+-]\)\?[0-9]\+\)\?\)\?\)\?\>/
syn match factorFloat /\<-\=\([0-9,]*[0-9]\)\?\(\.\(\([0-9,]*[0-9]\+\)\?\([eE]\([+-]\)\?[0-9]\+\)\?\)\?\)\?\>/
syn match factorPosRatio /\<+\=[0-9]\([0-9,]*[0-9]\)\?\(+[0-9]\([0-9,]*[0-9]\+\)\?\)\?\/-\=[0-9]\([0-9,]*[0-9]\+\)\?\.\?\>/
syn match factorNegRatio /\<\-[0-9]\([0-9,]*[0-9]\)\?\(\-[0-9]\([0-9,]*[0-9]\+\)\?\)\?\/-\=[0-9]\([0-9,]*[0-9]\+\)\?\.\?\>/
syn region factorComplex start=/\<C{\>/ end=/\<}\>/ contains=@factorReal