Merge branch 'master' of git://factorcode.org/git/factor

diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index 133223b6e4787c0c37b0a8a2e2410a68b087dea6..483a5825a9e00e1674529d8be513ea3e18b5ec45 100644 (file)
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -12,7 +12,7 @@ SYMBOL: delimiter
 
 CHAR: , delimiter set-global
 
-: delimiter> delimiter get ; inline
+: delimiter> ( -- delimiter ) delimiter get ; inline
     
 DEFER: quoted-field ( -- endchar )
     

diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor
index fbebc7f0f6b0661bc35f649f51425c9c7dbf2442..f6ed13b3fa75cf561f855a22a2a712b7339fd78d 100644 (file)
--- a/basis/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -45,6 +45,7 @@ IN: help.lint
     {
         [ drop "declared-effect" word-prop not ]
         [ nip contains-funky-elements? ]
+        [ drop symbol? ]
         [ drop macro? ]
         [
             [ effect-values >array ]

diff --git a/extra/benchmark/mandel/colors/colors.factor b/extra/benchmark/mandel/colors/colors.factor
index 218f566eda96bd24a8db9ce94ac84d1614b67be0..edc848a0caabde94b9f3959382070980d670af05 100644 (file)
--- a/extra/benchmark/mandel/colors/colors.factor
+++ b/extra/benchmark/mandel/colors/colors.factor
@@ -2,7 +2,7 @@ USING: math math.order kernel arrays byte-arrays sequences
 colors.hsv benchmark.mandel.params accessors colors ;
 IN: benchmark.mandel.colors
 
-: scale 255 * >fixnum ; inline
+: scale ( x -- y ) 255 * >fixnum ; inline
 
 : scale-rgb ( rgba -- n )
     [ red>> scale ] [ green>> scale ] [ blue>> scale ] tri 3byte-array ;

diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor
index 92778194e3011c417cee13174fb27a1942149393..c1b656b6c8e486d07385e183dc08ccede6e985f7 100755 (executable)
--- a/extra/opengl/demo-support/demo-support.factor
+++ b/extra/opengl/demo-support/demo-support.factor
@@ -3,7 +3,7 @@ namespaces opengl opengl.gl sequences ui ui.gadgets ui.gestures
 ui.render accessors combinators ;
 IN: opengl.demo-support
 
-: FOV 2.0 sqrt 1+ ; inline
+: FOV ( -- x ) 2.0 sqrt 1+ ; inline
 : MOUSE-MOTION-SCALE 0.5 ; inline
 : KEY-ROTATE-STEP 10.0 ; inline
 

diff --git a/extra/project-euler/215/215.factor b/extra/project-euler/215/215.factor
index 82d6a31c6691c744a3ccaa83f6c844d5cd088f13..297fb69de377aa61b9c7b306cad24778802567a6 100644 (file)
--- a/extra/project-euler/215/215.factor
+++ b/extra/project-euler/215/215.factor
@@ -33,8 +33,8 @@ TUPLE: end { ways integer } ;
 
 C: <block> block
 C: <end> end
-: <failure> 0 <end> ; inline
-: <success> 1 <end> ; inline
+: <failure> ( -- end ) 0 <end> ; inline
+: <success> ( -- end ) 1 <end> ; inline
 
 : failure? ( t -- ? ) ways>> 0 = ; inline