From 700cee5afd5098be85d47741b0d6b4d65d4cd568 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 28 Sep 2012 19:31:14 -0700 Subject: [PATCH] core: >array, >byte-vector, >hashtable, >vector should be inline. --- 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 085a6a582b..9e7083326f 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 ; +: >array ( seq -- array ) { } clone-like ; inline : 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 e4bc48f691..0ae484c70a 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 ; + >byte-array dup length byte-vector boa ; inline M: byte-vector like drop dup byte-vector? [ diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor index ee1fcdefa7..9642935f57 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 ; + H{ } assoc-clone-like ; inline M: hashtable assoc-like drop dup hashtable? [ >hashtable ] unless ; inline diff --git a/core/vectors/vectors.factor b/core/vectors/vectors.factor index e9def85fbb..fbe5e92001 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 ; +: >vector ( seq -- vector ) V{ } clone-like ; inline M: vector like drop dup vector? [ diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim index ed0d7b5719..4c7074e977 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]\+\)\?\([eE]\([+-]\)\?[0-9]\+\)\?\)\?\)\?\>/ +syn match factorFloat /\<-\=[0-9]\([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