From cca9402fe68d2af3031fb59aba0ff2d3b25d8f97 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 3 Jun 2016 19:11:05 -0700 Subject: [PATCH] factor: PRIMITIVE: -> PRIMITIVE: ; find . -type f -name '*.factor' -exec sed -i '' 's/\(PRIMITIVE:.* (.*)\)/\1 ;/g' {} + --- core/alien/accessors/accessors.factor | 52 +++---- core/alien/alien.factor | 10 +- core/alien/libraries/libraries.factor | 10 +- core/arrays/arrays.factor | 4 +- core/byte-arrays/byte-arrays.factor | 6 +- core/classes/tuple/tuple.factor | 4 +- core/compiler/units/units.factor | 2 +- core/generic/single/single.factor | 10 +- core/io/files/files.factor | 2 +- core/io/streams/c/c.factor | 18 +-- core/kernel/kernel.factor | 104 +++++++------- core/locals/backend/backend.factor | 8 +- core/math/math.factor | 128 +++++++++--------- core/math/parser/parser.factor | 2 +- core/memory/memory.factor | 12 +- core/quotations/quotations.factor | 8 +- core/slots/slots.factor | 4 +- core/strings/strings.factor | 8 +- core/syntax/syntax.factor | 2 +- core/system/system.factor | 4 +- core/words/words.factor | 6 +- ffi/forestdb/lib/lib-tests.factor | 2 +- language/io/files/unique/unique-tests.factor | 2 +- language/io/launcher/windows/test/env.factor | 2 +- language/io/servers/servers-tests.factor | 2 +- language/threads/threads.factor | 12 +- tools/tools/deploy/shaker/strip-call.factor | 2 +- tools/tools/dispatch/dispatch.factor | 4 +- tools/tools/memory/memory.factor | 12 +- tools/tools/profiler/sampling/sampling.factor | 4 +- 30 files changed, 223 insertions(+), 223 deletions(-) diff --git a/core/alien/accessors/accessors.factor b/core/alien/accessors/accessors.factor index 1aecf18d4a..cce4f4c781 100644 --- a/core/alien/accessors/accessors.factor +++ b/core/alien/accessors/accessors.factor @@ -2,29 +2,29 @@ ! See http://factorcode.org/license.txt for BSD license. in: alien.accessors -PRIMITIVE: alien-cell ( c-ptr n -- value ) -PRIMITIVE: alien-double ( c-ptr n -- value ) -PRIMITIVE: alien-float ( c-ptr n -- value ) -PRIMITIVE: alien-signed-1 ( c-ptr n -- value ) -PRIMITIVE: alien-signed-2 ( c-ptr n -- value ) -PRIMITIVE: alien-signed-4 ( c-ptr n -- value ) -PRIMITIVE: alien-signed-8 ( c-ptr n -- value ) -PRIMITIVE: alien-signed-cell ( c-ptr n -- value ) -PRIMITIVE: alien-unsigned-1 ( c-ptr n -- value ) -PRIMITIVE: alien-unsigned-2 ( c-ptr n -- value ) -PRIMITIVE: alien-unsigned-4 ( c-ptr n -- value ) -PRIMITIVE: alien-unsigned-8 ( c-ptr n -- value ) -PRIMITIVE: alien-unsigned-cell ( c-ptr n -- value ) -PRIMITIVE: set-alien-cell ( value c-ptr n -- ) -PRIMITIVE: set-alien-double ( value c-ptr n -- ) -PRIMITIVE: set-alien-float ( value c-ptr n -- ) -PRIMITIVE: set-alien-signed-1 ( value c-ptr n -- ) -PRIMITIVE: set-alien-signed-2 ( value c-ptr n -- ) -PRIMITIVE: set-alien-signed-4 ( value c-ptr n -- ) -PRIMITIVE: set-alien-signed-8 ( value c-ptr n -- ) -PRIMITIVE: set-alien-signed-cell ( value c-ptr n -- ) -PRIMITIVE: set-alien-unsigned-1 ( value c-ptr n -- ) -PRIMITIVE: set-alien-unsigned-2 ( value c-ptr n -- ) -PRIMITIVE: set-alien-unsigned-4 ( value c-ptr n -- ) -PRIMITIVE: set-alien-unsigned-8 ( value c-ptr n -- ) -PRIMITIVE: set-alien-unsigned-cell ( value c-ptr n -- ) +PRIMITIVE: alien-cell ( c-ptr n -- value ) ; +PRIMITIVE: alien-double ( c-ptr n -- value ) ; +PRIMITIVE: alien-float ( c-ptr n -- value ) ; +PRIMITIVE: alien-signed-1 ( c-ptr n -- value ) ; +PRIMITIVE: alien-signed-2 ( c-ptr n -- value ) ; +PRIMITIVE: alien-signed-4 ( c-ptr n -- value ) ; +PRIMITIVE: alien-signed-8 ( c-ptr n -- value ) ; +PRIMITIVE: alien-signed-cell ( c-ptr n -- value ) ; +PRIMITIVE: alien-unsigned-1 ( c-ptr n -- value ) ; +PRIMITIVE: alien-unsigned-2 ( c-ptr n -- value ) ; +PRIMITIVE: alien-unsigned-4 ( c-ptr n -- value ) ; +PRIMITIVE: alien-unsigned-8 ( c-ptr n -- value ) ; +PRIMITIVE: alien-unsigned-cell ( c-ptr n -- value ) ; +PRIMITIVE: set-alien-cell ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-double ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-float ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-signed-1 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-signed-2 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-signed-4 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-signed-8 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-signed-cell ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-unsigned-1 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-unsigned-2 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-unsigned-4 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-unsigned-8 ( value c-ptr n -- ) ; +PRIMITIVE: set-alien-unsigned-cell ( value c-ptr n -- ) ; diff --git a/core/alien/alien.factor b/core/alien/alien.factor index b4652eab0e..725307ffe6 100755 --- a/core/alien/alien.factor +++ b/core/alien/alien.factor @@ -8,13 +8,13 @@ in: alien BUILTIN: alien { underlying c-ptr read-only initial: f } expired ; BUILTIN: dll { path byte-array read-only initial: B{ } } ; -PRIMITIVE: ( word return-rewind -- alien ) -PRIMITIVE: ( displacement c-ptr -- alien ) -PRIMITIVE: alien-address ( c-ptr -- addr ) -PRIMITIVE: free-callback ( alien -- ) +PRIMITIVE: ( word return-rewind -- alien ) ; +PRIMITIVE: ( displacement c-ptr -- alien ) ; +PRIMITIVE: alien-address ( c-ptr -- addr ) ; +PRIMITIVE: free-callback ( alien -- ) ; PREDICATE: pinned-alien < alien underlying>> not ; diff --git a/core/alien/libraries/libraries.factor b/core/alien/libraries/libraries.factor index 42085e2e64..e531e153ac 100755 --- a/core/alien/libraries/libraries.factor +++ b/core/alien/libraries/libraries.factor @@ -5,11 +5,11 @@ io.backend kernel namespaces destructors sequences strings system io.pathnames fry combinators vocabs ; in: alien.libraries -PRIMITIVE: dll-valid? ( dll -- ? ) -PRIMITIVE: (dlopen) ( path -- dll ) -PRIMITIVE: (dlsym) ( name dll -- alien ) -PRIMITIVE: dlclose ( dll -- ) -PRIMITIVE: (dlsym-raw) ( name dll -- alien ) +PRIMITIVE: dll-valid? ( dll -- ? ) ; +PRIMITIVE: (dlopen) ( path -- dll ) ; +PRIMITIVE: (dlsym) ( name dll -- alien ) ; +PRIMITIVE: dlclose ( dll -- ) ; +PRIMITIVE: (dlsym-raw) ( name dll -- alien ) ; : dlopen ( path -- dll ) native-string>alien (dlopen) ; diff --git a/core/arrays/arrays.factor b/core/arrays/arrays.factor index 6071002ecd..b9f014bb36 100644 --- a/core/arrays/arrays.factor +++ b/core/arrays/arrays.factor @@ -5,8 +5,8 @@ in: arrays BUILTIN: array { length array-capacity read-only initial: 0 } ; -PRIMITIVE: ( n elt -- array ) -PRIMITIVE: resize-array ( n array -- new-array ) +PRIMITIVE: ( n elt -- array ) ; +PRIMITIVE: resize-array ( n array -- new-array ) ; M: array clone (clone) ; inline M: array length length>> ; inline diff --git a/core/byte-arrays/byte-arrays.factor b/core/byte-arrays/byte-arrays.factor index a574d3fa4e..1645e945c7 100644 --- a/core/byte-arrays/byte-arrays.factor +++ b/core/byte-arrays/byte-arrays.factor @@ -7,9 +7,9 @@ in: byte-arrays BUILTIN: byte-array { length array-capacity read-only initial: 0 } ; -PRIMITIVE: (byte-array) ( n -- byte-array ) -PRIMITIVE: ( n -- byte-array ) -PRIMITIVE: resize-byte-array ( n byte-array -- new-byte-array ) +PRIMITIVE: (byte-array) ( n -- byte-array ) ; +PRIMITIVE: ( n -- byte-array ) ; +PRIMITIVE: resize-byte-array ( n byte-array -- new-byte-array ) ; M: byte-array clone (clone) ; inline M: byte-array clone-like diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index a923fb7be1..9870d4cb09 100644 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -8,8 +8,8 @@ sequences sequences.private slots slots.private strings words ; in: classes.tuple ( layout -- tuple ) -PRIMITIVE: ( slots... layout -- tuple ) +PRIMITIVE: ( layout -- tuple ) ; +PRIMITIVE: ( slots... layout -- tuple ) ; PRIVATE> PREDICATE: tuple-class < class diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor index 6fb78bd588..dfffdf563b 100644 --- a/core/compiler/units/units.factor +++ b/core/compiler/units/units.factor @@ -6,7 +6,7 @@ hash-sets init kernel kernel.private math namespaces sequences sets source-files.errors vocabs words ; in: compiler.units -PRIMITIVE: modify-code-heap ( alist update-existing? reset-pics? -- ) +PRIMITIVE: modify-code-heap ( alist update-existing? reset-pics? -- ) ; symbol: old-definitions symbol: new-definitions diff --git a/core/generic/single/single.factor b/core/generic/single/single.factor index d276b8eccf..4324e44843 100644 --- a/core/generic/single/single.factor +++ b/core/generic/single/single.factor @@ -7,11 +7,11 @@ sequences words ; in: generic.single ERROR: no-method object generic ; diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 184fa4423e..53893229ce 100644 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -6,7 +6,7 @@ kernel kernel.private namespaces sequences splitting system ; in: io.files symbol: +retry+ ! just try the operation again without blocking diff --git a/core/io/streams/c/c.factor b/core/io/streams/c/c.factor index eba196b0c6..75b57f205d 100644 --- a/core/io/streams/c/c.factor +++ b/core/io/streams/c/c.factor @@ -5,15 +5,15 @@ destructors io io.backend io.encodings.utf8 io.files kernel kernel.private math sequences threads.private ; in: io.streams.c -PRIMITIVE: (fopen) ( path mode -- alien ) -PRIMITIVE: fclose ( alien -- ) -PRIMITIVE: fflush ( alien -- ) -PRIMITIVE: fgetc ( alien -- byte/f ) -PRIMITIVE: fputc ( byte alien -- ) -PRIMITIVE: fread-unsafe ( n buf alien -- count ) -PRIMITIVE: fseek ( alien offset whence -- ) -PRIMITIVE: ftell ( alien -- n ) -PRIMITIVE: fwrite ( data length alien -- ) +PRIMITIVE: (fopen) ( path mode -- alien ) ; +PRIMITIVE: fclose ( alien -- ) ; +PRIMITIVE: fflush ( alien -- ) ; +PRIMITIVE: fgetc ( alien -- byte/f ) ; +PRIMITIVE: fputc ( byte alien -- ) ; +PRIMITIVE: fread-unsafe ( n buf alien -- count ) ; +PRIMITIVE: fseek ( alien offset whence -- ) ; +PRIMITIVE: ftell ( alien -- n ) ; +PRIMITIVE: fwrite ( data length alien -- ) ; TUPLE: c-stream < disposable handle ; diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor index 2585f0815e..ea0bf59b32 100644 --- a/core/kernel/kernel.factor +++ b/core/kernel/kernel.factor @@ -7,58 +7,58 @@ BUILTIN: callstack ; BUILTIN: tuple ; BUILTIN: wrapper { wrapped read-only } ; -PRIMITIVE: -rot ( x y z -- z x y ) -PRIMITIVE: dup ( x -- x x ) -PRIMITIVE: dupd ( x y -- x x y ) -PRIMITIVE: drop ( x -- ) -PRIMITIVE: nip ( x y -- y ) -PRIMITIVE: over ( x y -- x y x ) -PRIMITIVE: pick ( x y z -- x y z x ) -PRIMITIVE: rot ( x y z -- y z x ) -PRIMITIVE: swap ( x y -- y x ) -PRIMITIVE: swapd ( x y z -- y x z ) -PRIMITIVE: 2drop ( x y -- ) -PRIMITIVE: 2dup ( x y -- x y x y ) -PRIMITIVE: 2nip ( x y z -- z ) -PRIMITIVE: 3drop ( x y z -- ) -PRIMITIVE: 3dup ( x y z -- x y z x y z ) -PRIMITIVE: 4drop ( w x y z -- ) -PRIMITIVE: 4dup ( w x y z -- w x y z w x y z ) +PRIMITIVE: -rot ( x y z -- z x y ) ; +PRIMITIVE: dup ( x -- x x ) ; +PRIMITIVE: dupd ( x y -- x x y ) ; +PRIMITIVE: drop ( x -- ) ; +PRIMITIVE: nip ( x y -- y ) ; +PRIMITIVE: over ( x y -- x y x ) ; +PRIMITIVE: pick ( x y z -- x y z x ) ; +PRIMITIVE: rot ( x y z -- y z x ) ; +PRIMITIVE: swap ( x y -- y x ) ; +PRIMITIVE: swapd ( x y z -- y x z ) ; +PRIMITIVE: 2drop ( x y -- ) ; +PRIMITIVE: 2dup ( x y -- x y x y ) ; +PRIMITIVE: 2nip ( x y z -- z ) ; +PRIMITIVE: 3drop ( x y z -- ) ; +PRIMITIVE: 3dup ( x y z -- x y z x y z ) ; +PRIMITIVE: 4drop ( w x y z -- ) ; +PRIMITIVE: 4dup ( w x y z -- w x y z w x y z ) ; -PRIMITIVE: (clone) ( obj -- newobj ) -PRIMITIVE: eq? ( obj1 obj2 -- ? ) -PRIMITIVE: ( obj -- wrapper ) -PRIMITIVE: die ( -- ) -PRIMITIVE: callstack>array ( callstack -- array ) +PRIMITIVE: (clone) ( obj -- newobj ) ; +PRIMITIVE: eq? ( obj1 obj2 -- ? ) ; +PRIMITIVE: ( obj -- wrapper ) ; +PRIMITIVE: die ( -- ) ; +PRIMITIVE: callstack>array ( callstack -- array ) ; DEFER: dip @@ -453,9 +453,9 @@ CONSTANT: ERROR-FP-TRAP 17 CONSTANT: ERROR-INTERRUPT 18 CONSTANT: ERROR-CALLBACK-SPACE-OVERFLOW 19 -PRIMITIVE: callstack-for ( context -- array ) -PRIMITIVE: retainstack-for ( context -- array ) -PRIMITIVE: datastack-for ( context -- array ) +PRIMITIVE: callstack-for ( context -- array ) ; +PRIMITIVE: retainstack-for ( context -- array ) ; +PRIMITIVE: datastack-for ( context -- array ) ; : context ( -- context ) CONTEXT-OBJ-CONTEXT context-object ; inline diff --git a/core/locals/backend/backend.factor b/core/locals/backend/backend.factor index a36893b1b7..ff5df063c9 100644 --- a/core/locals/backend/backend.factor +++ b/core/locals/backend/backend.factor @@ -3,10 +3,10 @@ USING: slots.private ; in: locals.backend -PRIMITIVE: drop-locals ( n -- ) -PRIMITIVE: get-local ( n -- obj ) -PRIMITIVE: load-local ( obj -- ) -PRIMITIVE: load-locals ( ... n -- ) +PRIMITIVE: drop-locals ( n -- ) ; +PRIMITIVE: get-local ( n -- obj ) ; +PRIMITIVE: load-local ( obj -- ) ; +PRIMITIVE: load-locals ( ... n -- ) ; : local-value ( box -- value ) 2 slot ; inline diff --git a/core/math/math.factor b/core/math/math.factor index 183b31f52b..a95cb7c518 100644 --- a/core/math/math.factor +++ b/core/math/math.factor @@ -7,72 +7,72 @@ BUILTIN: fixnum ; BUILTIN: bignum ; BUILTIN: float ; -PRIMITIVE: bits>double ( n -- x ) -PRIMITIVE: bits>float ( n -- x ) -PRIMITIVE: double>bits ( x -- n ) -PRIMITIVE: float>bits ( x -- n ) +PRIMITIVE: bits>double ( n -- x ) ; +PRIMITIVE: bits>float ( n -- x ) ; +PRIMITIVE: double>bits ( x -- n ) ; +PRIMITIVE: float>bits ( x -- n ) ; ( x y -- ? ) -PRIMITIVE: bignum>= ( x y -- ? ) -PRIMITIVE: bignum>fixnum ( x -- y ) -PRIMITIVE: bignum>fixnum-strict ( x -- y ) -PRIMITIVE: both-fixnums? ( x y -- ? ) -PRIMITIVE: fixnum* ( x y -- z ) -PRIMITIVE: fixnum*fast ( x y -- z ) -PRIMITIVE: fixnum+ ( x y -- z ) -PRIMITIVE: fixnum+fast ( x y -- z ) -PRIMITIVE: fixnum- ( x y -- z ) -PRIMITIVE: fixnum-bitand ( x y -- z ) -PRIMITIVE: fixnum-bitnot ( x -- y ) -PRIMITIVE: fixnum-bitor ( x y -- z ) -PRIMITIVE: fixnum-bitxor ( x y -- z ) -PRIMITIVE: fixnum-fast ( x y -- z ) -PRIMITIVE: fixnum-mod ( x y -- z ) -PRIMITIVE: fixnum-shift ( x y -- z ) -PRIMITIVE: fixnum-shift-fast ( x y -- z ) -PRIMITIVE: fixnum/i ( x y -- z ) -PRIMITIVE: fixnum/i-fast ( x y -- z ) -PRIMITIVE: fixnum/mod ( x y -- z w ) -PRIMITIVE: fixnum/mod-fast ( x y -- z w ) -PRIMITIVE: fixnum< ( x y -- ? ) -PRIMITIVE: fixnum<= ( x y -- z ) -PRIMITIVE: fixnum> ( x y -- ? ) -PRIMITIVE: fixnum>= ( x y -- ? ) -PRIMITIVE: fixnum>bignum ( x -- y ) -PRIMITIVE: fixnum>float ( x -- y ) -PRIMITIVE: float* ( x y -- z ) -PRIMITIVE: float+ ( x y -- z ) -PRIMITIVE: float- ( x y -- z ) -PRIMITIVE: float-u< ( x y -- ? ) -PRIMITIVE: float-u<= ( x y -- ? ) -PRIMITIVE: float-u> ( x y -- ? ) -PRIMITIVE: float-u>= ( x y -- ? ) -PRIMITIVE: float/f ( x y -- z ) -PRIMITIVE: float< ( x y -- ? ) -PRIMITIVE: float<= ( x y -- ? ) -PRIMITIVE: float= ( x y -- ? ) -PRIMITIVE: float> ( x y -- ? ) -PRIMITIVE: float>= ( x y -- ? ) -PRIMITIVE: float>bignum ( x -- y ) -PRIMITIVE: float>fixnum ( x -- y ) +PRIMITIVE: bignum* ( x y -- z ) ; +PRIMITIVE: bignum+ ( x y -- z ) ; +PRIMITIVE: bignum- ( x y -- z ) ; +PRIMITIVE: bignum-bit? ( x n -- ? ) ; +PRIMITIVE: bignum-bitand ( x y -- z ) ; +PRIMITIVE: bignum-bitnot ( x -- y ) ; +PRIMITIVE: bignum-bitor ( x y -- z ) ; +PRIMITIVE: bignum-bitxor ( x y -- z ) ; +PRIMITIVE: bignum-gcd ( x y -- z ) ; +PRIMITIVE: bignum-log2 ( x -- n ) ; +PRIMITIVE: bignum-mod ( x y -- z ) ; +PRIMITIVE: bignum-shift ( x y -- z ) ; +PRIMITIVE: bignum/i ( x y -- z ) ; +PRIMITIVE: bignum/mod ( x y -- z w ) ; +PRIMITIVE: bignum< ( x y -- ? ) ; +PRIMITIVE: bignum<= ( x y -- ? ) ; +PRIMITIVE: bignum= ( x y -- ? ) ; +PRIMITIVE: bignum> ( x y -- ? ) ; +PRIMITIVE: bignum>= ( x y -- ? ) ; +PRIMITIVE: bignum>fixnum ( x -- y ) ; +PRIMITIVE: bignum>fixnum-strict ( x -- y ) ; +PRIMITIVE: both-fixnums? ( x y -- ? ) ; +PRIMITIVE: fixnum* ( x y -- z ) ; +PRIMITIVE: fixnum*fast ( x y -- z ) ; +PRIMITIVE: fixnum+ ( x y -- z ) ; +PRIMITIVE: fixnum+fast ( x y -- z ) ; +PRIMITIVE: fixnum- ( x y -- z ) ; +PRIMITIVE: fixnum-bitand ( x y -- z ) ; +PRIMITIVE: fixnum-bitnot ( x -- y ) ; +PRIMITIVE: fixnum-bitor ( x y -- z ) ; +PRIMITIVE: fixnum-bitxor ( x y -- z ) ; +PRIMITIVE: fixnum-fast ( x y -- z ) ; +PRIMITIVE: fixnum-mod ( x y -- z ) ; +PRIMITIVE: fixnum-shift ( x y -- z ) ; +PRIMITIVE: fixnum-shift-fast ( x y -- z ) ; +PRIMITIVE: fixnum/i ( x y -- z ) ; +PRIMITIVE: fixnum/i-fast ( x y -- z ) ; +PRIMITIVE: fixnum/mod ( x y -- z w ) ; +PRIMITIVE: fixnum/mod-fast ( x y -- z w ) ; +PRIMITIVE: fixnum< ( x y -- ? ) ; +PRIMITIVE: fixnum<= ( x y -- z ) ; +PRIMITIVE: fixnum> ( x y -- ? ) ; +PRIMITIVE: fixnum>= ( x y -- ? ) ; +PRIMITIVE: fixnum>bignum ( x -- y ) ; +PRIMITIVE: fixnum>float ( x -- y ) ; +PRIMITIVE: float* ( x y -- z ) ; +PRIMITIVE: float+ ( x y -- z ) ; +PRIMITIVE: float- ( x y -- z ) ; +PRIMITIVE: float-u< ( x y -- ? ) ; +PRIMITIVE: float-u<= ( x y -- ? ) ; +PRIMITIVE: float-u> ( x y -- ? ) ; +PRIMITIVE: float-u>= ( x y -- ? ) ; +PRIMITIVE: float/f ( x y -- z ) ; +PRIMITIVE: float< ( x y -- ? ) ; +PRIMITIVE: float<= ( x y -- ? ) ; +PRIMITIVE: float= ( x y -- ? ) ; +PRIMITIVE: float> ( x y -- ? ) ; +PRIMITIVE: float>= ( x y -- ? ) ; +PRIMITIVE: float>bignum ( x -- y ) ; +PRIMITIVE: float>fixnum ( x -- y ) ; PRIVATE> GENERIC: >fixnum ( x -- n ) foldable diff --git a/core/math/parser/parser.factor b/core/math/parser/parser.factor index fd3c432a08..f37773bc13 100644 --- a/core/math/parser/parser.factor +++ b/core/math/parser/parser.factor @@ -6,7 +6,7 @@ strings strings.private ; in: math.parser : digit> ( ch -- n ) diff --git a/core/memory/memory.factor b/core/memory/memory.factor index edd1887580..e22d4a6722 100644 --- a/core/memory/memory.factor +++ b/core/memory/memory.factor @@ -3,14 +3,14 @@ USING: alien.strings io.backend kernel sequences system ; in: memory -PRIMITIVE: all-instances ( -- array ) -PRIMITIVE: compact-gc ( -- ) -PRIMITIVE: gc ( -- ) -PRIMITIVE: minor-gc ( -- ) -PRIMITIVE: size ( obj -- n ) +PRIMITIVE: all-instances ( -- array ) ; +PRIMITIVE: compact-gc ( -- ) ; +PRIMITIVE: gc ( -- ) ; +PRIMITIVE: minor-gc ( -- ) ; +PRIMITIVE: size ( obj -- n ) ; : instances ( quot -- seq ) diff --git a/core/quotations/quotations.factor b/core/quotations/quotations.factor index 21cf1f7200..d7b9f1d8d6 100644 --- a/core/quotations/quotations.factor +++ b/core/quotations/quotations.factor @@ -9,12 +9,12 @@ BUILTIN: quotation cached-effect cache-counter ; -PRIMITIVE: jit-compile ( quot -- ) -PRIMITIVE: quotation-code ( quot -- start end ) -PRIMITIVE: quotation-compiled? ( quot -- ? ) +PRIMITIVE: jit-compile ( quot -- ) ; +PRIMITIVE: quotation-code ( quot -- start end ) ; +PRIMITIVE: quotation-compiled? ( quot -- ? ) ; quotation ( array -- quot ) +PRIMITIVE: array>quotation ( array -- quot ) ; : uncurry ( curry -- obj quot ) { curry } declare dup 2 slot swap 3 slot ; inline diff --git a/core/slots/slots.factor b/core/slots/slots.factor index dbc0b9268e..51ebea78d2 100644 --- a/core/slots/slots.factor +++ b/core/slots/slots.factor @@ -8,8 +8,8 @@ slots.private strings words ; in: slots TUPLE: slot-spec name offset class initial read-only ; diff --git a/core/strings/strings.factor b/core/strings/strings.factor index 87b894c84a..4aa10d1d05 100644 --- a/core/strings/strings.factor +++ b/core/strings/strings.factor @@ -7,12 +7,12 @@ in: strings BUILTIN: string { length array-capacity read-only initial: 0 } aux ; -PRIMITIVE: ( n ch -- string ) -PRIMITIVE: resize-string ( n str -- newstr ) +PRIMITIVE: ( n ch -- string ) ; +PRIMITIVE: resize-string ( n str -- newstr ) ; > - scan-word scan-effect ensure-primitive + scan-word scan-effect ";" expect ensure-primitive ] define-core-syntax "CS{" [ diff --git a/core/system/system.factor b/core/system/system.factor index 8d6f380816..0f00988935 100644 --- a/core/system/system.factor +++ b/core/system/system.factor @@ -4,8 +4,8 @@ USING: assocs continuations init io kernel kernel.private make math math.parser namespaces sequences ; in: system -PRIMITIVE: (exit) ( n -- * ) -PRIMITIVE: nano-count ( -- ns ) +PRIMITIVE: (exit) ( n -- * ) ; +PRIMITIVE: nano-count ( -- ns ) ; SINGLETONS: x86.32 x86.64 arm ppc.32 ppc.64 ; diff --git a/core/words/words.factor b/core/words/words.factor index 02b557a298..94fb80dbb9 100644 --- a/core/words/words.factor +++ b/core/words/words.factor @@ -10,11 +10,11 @@ BUILTIN: word { def quotation initial: [ ] } props pic-def pic-tail-def { sub-primitive read-only } ; -PRIMITIVE: word-code ( word -- start end ) -PRIMITIVE: word-optimized? ( word -- ? ) +PRIMITIVE: word-code ( word -- start end ) ; +PRIMITIVE: word-optimized? ( word -- ? ) ; ! Need a dummy word here because BUILTIN: word is not a real word diff --git a/ffi/forestdb/lib/lib-tests.factor b/ffi/forestdb/lib/lib-tests.factor index 2aa9780523..46d13c96c0 100644 --- a/ffi/forestdb/lib/lib-tests.factor +++ b/ffi/forestdb/lib/lib-tests.factor @@ -383,4 +383,4 @@ IN: forestdb.lib ] with-fdb-byseq-each ] { } make ] with-forestdb-test-manual -] unit-test \ No newline at end of file +] unit-test diff --git a/language/io/files/unique/unique-tests.factor b/language/io/files/unique/unique-tests.factor index e12600c7a2..5674a2860e 100644 --- a/language/io/files/unique/unique-tests.factor +++ b/language/io/files/unique/unique-tests.factor @@ -54,4 +54,4 @@ IN: io.files.unique.tests [ file-name ] map first2 mismatch ] cleanup-unique-files ] with-temp-directory -] unit-test \ No newline at end of file +] unit-test diff --git a/language/io/launcher/windows/test/env.factor b/language/io/launcher/windows/test/env.factor index b97ecc0a84..eb9be32c0c 100644 --- a/language/io/launcher/windows/test/env.factor +++ b/language/io/launcher/windows/test/env.factor @@ -2,4 +2,4 @@ USE: system USE: prettyprint USE: prettyprint.config USE: environment -os-envs [ . ] without-limits \ No newline at end of file +os-envs [ . ] without-limits diff --git a/language/io/servers/servers-tests.factor b/language/io/servers/servers-tests.factor index bea66ad07a..4fbda0c7e8 100644 --- a/language/io/servers/servers-tests.factor +++ b/language/io/servers/servers-tests.factor @@ -69,4 +69,4 @@ TUPLE: my-threaded-server < threaded-server ; 2array >>secure start-server stop-server -] unit-test \ No newline at end of file +] unit-test diff --git a/language/threads/threads.factor b/language/threads/threads.factor index 586c2cf220..a3df0514fb 100644 --- a/language/threads/threads.factor +++ b/language/threads/threads.factor @@ -8,13 +8,13 @@ quotations sequences strings system ; IN: threads SYMBOL: last-dispatch-stats diff --git a/tools/tools/memory/memory.factor b/tools/tools/memory/memory.factor index d8e6921105..f5ed86715a 100644 --- a/tools/tools/memory/memory.factor +++ b/tools/tools/memory/memory.factor @@ -9,12 +9,12 @@ splitting strings system vm words hints hashtables ; IN: tools.memory SYMBOL: samples-per-second