alien.data: rename some private words for readability

(local-allot) => local-allot
(cleanup-allot) => cleanup-allot

and a couple other private words

diff --git a/basis/alien/data/data.factor b/basis/alien/data/data.factor
index 37c86bc2485a630f1bfacf89fee79584a654c8ce..97d93017f71fbe32834e77865f77f7c12227d76e 100644 (file)
--- a/basis/alien/data/data.factor
+++ b/basis/alien/data/data.factor
@@ -122,19 +122,19 @@ ERROR: local-allocation-error ;
 
 <PRIVATE
 
-: (local-allot) ( size align -- alien ) local-allocation-error ;
+: local-allot ( size align -- alien ) local-allocation-error ;
 
-: (cleanup-allot) ( -- )
+: cleanup-allot ( -- )
     ! Inhibit TCO in order for the last word in the quotation
     ! to still be able to access scope-allocated data.
     ;
 
-MACRO: (simple-local-allot) ( c-type -- quot )
+MACRO: simple-local-allot-quot ( c-type -- quot )
     [ add-depends-on-c-type ]
-    [ dup '[ _ heap-size _ c-type-align (local-allot) ] ] bi ;
+    [ dup '[ _ heap-size _ c-type-align local-allot ] ] bi ;
 
-: [hairy-local-allot] ( c-type initial -- quot )
-    over '[ _ (simple-local-allot) _ over 0 _ set-alien-value ] ;
+: hairy-local-allot-quot ( c-type initial -- quot )
+    over '[ _ simple-local-allot-quot _ over 0 _ set-alien-value ] ;
 
 : hairy-local-allot? ( obj -- ? )
     {
@@ -143,14 +143,15 @@ MACRO: (simple-local-allot) ( c-type -- quot )
         [ second initial: eq? ]
     } 1&& ;
 
-MACRO: (hairy-local-allot) ( obj -- quot )
-    dup hairy-local-allot?
-    [ first3 nip [hairy-local-allot] ]
-    [ '[ _ (simple-local-allot) ] ]
-    if ;
+MACRO: hairy-local-allot ( obj -- quot )
+    dup hairy-local-allot? [
+        first3 nip hairy-local-allot-quot
+    ] [
+        '[ _ simple-local-allot-quot ]
+    ] if ;
 
-MACRO: (local-allots) ( c-types -- quot )
-    [ '[ _ (hairy-local-allot) ] ] map [ ] join ;
+MACRO: local-allots ( c-types -- quot )
+    [ '[ _ hairy-local-allot ] ] map [ ] join ;
 
 MACRO: box-values ( c-types -- quot )
     [ c-type-boxer-quot ] map '[ _ spread ] ;
@@ -163,12 +164,12 @@ MACRO: out-parameters ( c-types -- quot )
 PRIVATE>
 
 : with-scoped-allocation ( c-types quot -- )
-    [ [ (local-allots) ] [ box-values ] bi ] dip call
-    (cleanup-allot) ; inline
+    [ [ local-allots ] [ box-values ] bi ] dip call
+    cleanup-allot ; inline
 
 : with-out-parameters ( c-types quot -- values... )
-    [ drop (local-allots) ] [ swap out-parameters ] 2bi
-    (cleanup-allot) ; inline
+    [ drop local-allots ] [ swap out-parameters ] 2bi
+    cleanup-allot ; inline
 
 GENERIC: binary-zero? ( value -- ? )
 

diff --git a/basis/compiler/cfg/intrinsics/intrinsics.factor b/basis/compiler/cfg/intrinsics/intrinsics.factor
index 57a1c5ec539823996018d9d0934910ba3be9df02..99dacb6d3023935100a8795f0a1b68c0bccd14fc 100644 (file)
--- a/basis/compiler/cfg/intrinsics/intrinsics.factor
+++ b/basis/compiler/cfg/intrinsics/intrinsics.factor
@@ -63,8 +63,8 @@ ERROR: inline-intrinsics-not-supported word quot ;
     { byte-arrays:<byte-array> [ emit-<byte-array> ] }
     { byte-arrays:(byte-array) [ emit-(byte-array) ] }
     { kernel:<wrapper> [ emit-simple-allot ] }
-    { alien.data.private:(local-allot) [ emit-local-allot ] }
-    { alien.data.private:(cleanup-allot) [ emit-cleanup-allot ] }
+    { alien.data.private:local-allot [ emit-local-allot ] }
+    { alien.data.private:cleanup-allot [ emit-cleanup-allot ] }
     { alien:<displaced-alien> [ emit-<displaced-alien> ] }
     { alien.accessors:alien-unsigned-1 [ int-rep alien.c-types:uchar emit-load-memory ] }
     { alien.accessors:set-alien-unsigned-1 [ int-rep alien.c-types:uchar emit-store-memory ] }

diff --git a/basis/compiler/tree/propagation/known-words/known-words.factor b/basis/compiler/tree/propagation/known-words/known-words.factor
index dad34ccf3efbb44173eeee4761b9b86eff127d4e..c4d1021ee1f807d6ab669851164fcc56cff2f66d 100644 (file)
--- a/basis/compiler/tree/propagation/known-words/known-words.factor
+++ b/basis/compiler/tree/propagation/known-words/known-words.factor
@@ -386,7 +386,7 @@ generic-comparison-ops [
 \ fixnum-max { fixnum fixnum } "input-classes" set-word-prop
 \ fixnum-max [ interval-max ] [ fixnum-valued ] binary-op
 
-\ (local-allot) { alien } "default-output-classes" set-word-prop
+\ local-allot { alien } "default-output-classes" set-word-prop
 
 \ tag [
     drop fixnum 0 num-types get [a,b) <class/interval-info>