unicode.data, terrain.generation: remove abusive stack effect names.

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 49519ac3e13755649787db52397d497917c6be59..9536ebb9d2f5a5e814a2774d4f503ea4f10d841b 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -174,8 +174,8 @@ C: <code-point> code-point
     4 head [ multihex ] map first4
     <code-point> swap first ,, ;
 
-! Extra properties
-: parse-properties ( -- {{[a,b],prop}} )
+! Extra properties {{[a,b],prop}}
+: parse-properties ( -- assoc )
     "vocab:unicode/data/PropList.txt" data [
         [
             ".." split1 [ dup ] unless*

diff --git a/extra/terrain/generation/generation.factor b/extra/terrain/generation/generation.factor
index f25779df02181ccbb76759a534de7ad78a566e17..5c48577efe66c37a7b04b1c2b06f643cdb84985c 100644 (file)
--- a/extra/terrain/generation/generation.factor
+++ b/extra/terrain/generation/generation.factor
@@ -61,7 +61,7 @@ TYPED: terrain-segment ( terrain: terrain at: float-4 -- image )
 : 4max ( a b c d -- max )
     max max max ; inline
 
-: mipmap ( {{pixels}} quot: ( aa ab ba bb -- c ) -- pixels' )
+: mipmap ( pixels quot: ( aa ab ba bb -- c ) -- pixels' )
     [ [ 2 <groups> ] map 2 <groups> ] dip
     '[ first2 [ [ first2 ] bi@ @ ] 2map ] map ; inline