From 28f36a25b029578c06410b12cc9a5226c871834b Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 5 Oct 2012 08:30:41 -0700 Subject: [PATCH] Revert "core: >array, >byte-vector, >hashtable, >vector should be inline." This reverts commit cd6026e70efef3416d08160cd7cbaa5f67d8e0c7. --- core/arrays/arrays.factor | 2 +- core/byte-vectors/byte-vectors.factor | 2 +- core/hashtables/hashtables.factor | 2 +- core/vectors/vectors.factor | 2 +- misc/vim/syntax/factor.vim | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/arrays/arrays.factor b/core/arrays/arrays.factor index 9e7083326f..085a6a582b 100644 --- a/core/arrays/arrays.factor +++ b/core/arrays/arrays.factor @@ -14,7 +14,7 @@ M: f new-sequence drop [ f ] [ 0 ] if-zero ; inline INSTANCE: array sequence -: >array ( seq -- array ) { } clone-like ; inline +: >array ( seq -- array ) { } clone-like ; : 1array ( x -- array ) 1 swap ; inline : 2array ( x y -- array ) { } 2sequence ; inline : 3array ( x y z -- array ) { } 3sequence ; inline diff --git a/core/byte-vectors/byte-vectors.factor b/core/byte-vectors/byte-vectors.factor index 0ae484c70a..e4bc48f691 100644 --- a/core/byte-vectors/byte-vectors.factor +++ b/core/byte-vectors/byte-vectors.factor @@ -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? [ diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor index 9642935f57..ee1fcdefa7 100644 --- a/core/hashtables/hashtables.factor +++ b/core/hashtables/hashtables.factor @@ -166,7 +166,7 @@ M: assoc new-assoc drop ; inline M: f new-assoc drop ; inline : >hashtable ( assoc -- hashtable ) - H{ } assoc-clone-like ; inline + H{ } assoc-clone-like ; M: hashtable assoc-like drop dup hashtable? [ >hashtable ] unless ; inline diff --git a/core/vectors/vectors.factor b/core/vectors/vectors.factor index fbe5e92001..e9def85fbb 100644 --- a/core/vectors/vectors.factor +++ b/core/vectors/vectors.factor @@ -10,7 +10,7 @@ TUPLE: vector : ( n -- vector ) 0 0 vector boa ; inline -: >vector ( seq -- vector ) V{ } clone-like ; inline +: >vector ( seq -- vector ) V{ } clone-like ; M: vector like drop dup vector? [ diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index 4c7074e977..ed0d7b5719 100644 --- a/misc/vim/syntax/factor.vim +++ b/misc/vim/syntax/factor.vim @@ -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=/\/ end=/\<}\>/ contains=@factorReal -- 2.34.1