diff --git a/extra/benchmark/binary-trees/binary-trees.factor b/extra/benchmark/binary-trees/binary-trees.factor index 8e3918656a..21ff7fbbef 100644 --- a/extra/benchmark/binary-trees/binary-trees.factor +++ b/extra/benchmark/binary-trees/binary-trees.factor @@ -23,7 +23,7 @@ M: tree-node item-check M: f item-check drop 0 ; -: min-depth 4 ; inline +CONSTANT: min-depth 4 : stretch-tree ( max-depth -- ) 1 + 0 over bottom-up-tree item-check diff --git a/extra/benchmark/fasta/fasta.factor b/extra/benchmark/fasta/fasta.factor index 32d3534920..61d9e9fd43 100755 --- a/extra/benchmark/fasta/fasta.factor +++ b/extra/benchmark/fasta/fasta.factor @@ -4,11 +4,11 @@ sequences.private benchmark.reverse-complement hints io.encodings.ascii byte-arrays specialized-arrays.double ; IN: benchmark.fasta -: IM 139968 ; inline -: IA 3877 ; inline -: IC 29573 ; inline -: initial-seed 42 ; inline -: line-length 60 ; inline +CONSTANT: IM 139968 +CONSTANT: IA 3877 +CONSTANT: IC 29573 +CONSTANT: initial-seed 42 +CONSTANT: line-length 60 USE: math.private @@ -17,7 +17,7 @@ USE: math.private HINTS: random fixnum ; -: ALU "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA" ; inline +CONSTANT: ALU "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA" : IUB { diff --git a/extra/benchmark/mandel/colors/colors.factor b/extra/benchmark/mandel/colors/colors.factor index edc848a0ca..9e0f2472e2 100644 --- a/extra/benchmark/mandel/colors/colors.factor +++ b/extra/benchmark/mandel/colors/colors.factor @@ -7,8 +7,8 @@ IN: benchmark.mandel.colors : scale-rgb ( rgba -- n ) [ red>> scale ] [ green>> scale ] [ blue>> scale ] tri 3byte-array ; -: sat 0.85 ; inline -: val 0.85 ; inline +CONSTANT: sat 0.85 +CONSTANT: val 0.85 : ( nb-cols -- map ) dup [ diff --git a/extra/benchmark/mandel/params/params.factor b/extra/benchmark/mandel/params/params.factor index c40d3c1f2d..8a19180d73 100644 --- a/extra/benchmark/mandel/params/params.factor +++ b/extra/benchmark/mandel/params/params.factor @@ -1,8 +1,8 @@ IN: benchmark.mandel.params -: max-color 360 ; inline -: zoom-fact 0.8 ; inline -: width 640 ; inline -: height 480 ; inline -: max-iterations 40 ; inline -: center -0.65 ; inline +CONSTANT: max-color 360 +CONSTANT: zoom-fact 0.8 +CONSTANT: width 640 +CONSTANT: height 480 +CONSTANT: max-iterations 40 +CONSTANT: center -0.65 diff --git a/extra/benchmark/nbody/nbody.factor b/extra/benchmark/nbody/nbody.factor index 37c4fc43c5..f72ceb4629 100644 --- a/extra/benchmark/nbody/nbody.factor +++ b/extra/benchmark/nbody/nbody.factor @@ -6,7 +6,7 @@ sequences hints arrays ; IN: benchmark.nbody : solar-mass ( -- x ) 4 pi sq * ; inline -: days-per-year 365.24 ; inline +CONSTANT: days-per-year 365.24 TUPLE: body { location double-array } diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor index c16e47846e..8d07ae1c65 100755 --- a/extra/benchmark/raytracer/raytracer.factor +++ b/extra/benchmark/raytracer/raytracer.factor @@ -16,13 +16,13 @@ IN: benchmark.raytracer 0.5345224838248488 } ; inline -: oversampling 4 ; inline +CONSTANT: oversampling 4 -: levels 3 ; inline +CONSTANT: levels 3 -: size 200 ; inline +CONSTANT: size 200 -: delta 1.4901161193847656E-8 ; inline +CONSTANT: delta 1.4901161193847656E-8 TUPLE: ray { orig double-array read-only } { dir double-array read-only } ; @@ -88,7 +88,7 @@ TUPLE: group < sphere { objs array read-only } ; M: group intersect-scene ( hit ray group -- hit ) [ drop objs>> [ intersect-scene ] with each ] if-ray-sphere ; -: initial-hit T{ hit f double-array{ 0.0 0.0 0.0 } 1/0. } ; inline +CONSTANT: initial-hit T{ hit f double-array{ 0.0 0.0 0.0 } 1/0. } : initial-intersect ( ray scene -- hit ) [ initial-hit ] 2dip intersect-scene ; inline diff --git a/extra/crypto/aes/aes.factor b/extra/crypto/aes/aes.factor index cacfc5971a..0807420266 100644 --- a/extra/crypto/aes/aes.factor +++ b/extra/crypto/aes/aes.factor @@ -4,7 +4,7 @@ USING: arrays kernel math memoize sequences math.bitwise locals ; IN: crypto.aes -: AES_BLOCK_SIZE 16 ; inline +CONSTANT: AES_BLOCK_SIZE 16 : sbox ( -- array ) { diff --git a/extra/crypto/rsa/rsa.factor b/extra/crypto/rsa/rsa.factor index b1eb907547..373dd9637c 100644 --- a/extra/crypto/rsa/rsa.factor +++ b/extra/crypto/rsa/rsa.factor @@ -18,7 +18,7 @@ C: rsa BOOLEAN ( n -- TRUE/FALSE ) >boolean TRUE FALSE ? ; inline ERROR: duplicate-window window ; diff --git a/extra/curses/ffi/ffi.factor b/extra/curses/ffi/ffi.factor index 8d4a7ddb4b..b1c481a576 100644 --- a/extra/curses/ffi/ffi.factor +++ b/extra/curses/ffi/ffi.factor @@ -18,7 +18,7 @@ TYPEDEF: chtype attr_t TYPEDEF: short NCURSES_SIZE_T TYPEDEF: ushort wchar_t -: CCHARW_MAX 5 ; inline +CONSTANT: CCHARW_MAX 5 C-STRUCT: cchar_t { "attr_t" "attr" } diff --git a/extra/math/analysis/analysis.factor b/extra/math/analysis/analysis.factor index b5f6a547ba..9c773f748e 100755 --- a/extra/math/analysis/analysis.factor +++ b/extra/math/analysis/analysis.factor @@ -9,7 +9,7 @@ IN: math.analysis ! http://www.rskey.org/gamma.htm "Lanczos Approximation" ! n=6: error ~ 3 x 10^-11 -: gamma-g6 5.15 ; inline +CONSTANT: gamma-g6 5.15 : gamma-p6 { diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor index c8fe2b4882..9f05482b30 100755 --- a/extra/opengl/demo-support/demo-support.factor +++ b/extra/opengl/demo-support/demo-support.factor @@ -4,8 +4,8 @@ ui.render accessors combinators ; IN: opengl.demo-support : FOV ( -- x ) 2.0 sqrt 1+ ; inline -: MOUSE-MOTION-SCALE 0.5 ; inline -: KEY-ROTATE-STEP 10.0 ; inline +CONSTANT: MOUSE-MOTION-SCALE 0.5 +CONSTANT: KEY-ROTATE-STEP 10.0 SYMBOL: last-drag-loc diff --git a/extra/tetris/game/game.factor b/extra/tetris/game/game.factor index ef5ffcc344..00b5bb6c41 100644 --- a/extra/tetris/game/game.factor +++ b/extra/tetris/game/game.factor @@ -12,8 +12,8 @@ TUPLE: tetris { paused? initial: f } { running? initial: t } ; -: default-width 10 ; inline -: default-height 20 ; inline +CONSTANT: default-width 10 +CONSTANT: default-height 20 : ( width height -- tetris ) dupd swap