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

This reverts commit cd6026e70efef3416d08160cd7cbaa5f67d8e0c7.

diff --git a/core/arrays/arrays.factor b/core/arrays/arrays.factor
index 9e7083326f8b6d4710bb4cd9540a37e2d53a25d3..085a6a582be3e48a0cdf8d0b4faa6b10e219b3af 100644 (file)
--- a/core/arrays/arrays.factor
+++ b/core/arrays/arrays.factor
@@ -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

diff --git a/core/byte-vectors/byte-vectors.factor b/core/byte-vectors/byte-vectors.factor
index 0ae484c70acc9751da6b24104acc7c5c7d0a07b1..e4bc48f69132bf7c938f6d066c2fdc6d7b012e75 100644 (file)
--- 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\r
 \r
 : >byte-vector ( seq -- byte-vector )\r
-    >byte-array dup length byte-vector boa ; inline\r
+    >byte-array dup length byte-vector boa ;\r
 \r
 M: byte-vector like\r
     drop dup byte-vector? [\r

diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index 9642935f576a3e39263ad17e2d704a1fcde55e2c..ee1fcdefa77445e6a58899891ca3908d82943329 100644 (file)
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -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

diff --git a/core/vectors/vectors.factor b/core/vectors/vectors.factor
index fbe5e92001cd3c73307103b4824615c7bc65be07..e9def85fbb5b068f3147732dddab4a399d452ca1 100644 (file)
--- a/core/vectors/vectors.factor
+++ b/core/vectors/vectors.factor
@@ -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? [

diff --git a/misc/vim/syntax/factor.vim b/misc/vim/syntax/factor.vim
index 4c7074e97713575bee338f40fed5321b5a85ddfc..ed0d7b57194d27315d2f184c7057fddf75242906 100644 (file)
--- 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=/\<C{\>/ end=/\<}\>/ contains=@factorReal