From 8f4d84373b332d8d6d2a6c741a3473675d892571 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sat, 17 Jan 2009 18:18:31 -0600
Subject: [PATCH] Clean up alien.destructors

---
 basis/alien/destructors/destructors.factor | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/basis/alien/destructors/destructors.factor b/basis/alien/destructors/destructors.factor
index cf72212968..8b3be72cea 100644
--- a/basis/alien/destructors/destructors.factor
+++ b/basis/alien/destructors/destructors.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: functors destructors accessors kernel lexer words ;
+USING: functors destructors accessors kernel parser words ;
 IN: alien.destructors
 
 FUNCTOR: define-destructor ( F -- )
 
-F IS ${F}
 F-destructor DEFINES ${F}-destructor
+<F-destructor> DEFINES <${F}-destructor>
 &F DEFINES &${F}
 |F DEFINES |${F}
 
@@ -14,14 +14,14 @@ WHERE
 
 TUPLE: F-destructor alien disposed ;
 
+: <F-destructor> ( alien -- destructor ) f F-destructor boa ; inline
+
 M: F-destructor dispose* alien>> F execute ;
 
-: &F ( alien -- alien )
-    dup f F-destructor boa &dispose drop ; inline
+: &F ( alien -- alien ) dup <F-destructor> execute &dispose drop ; inline
 
-: |F ( alien -- alien )
-    dup f F-destructor boa |dispose drop ; inline
+: |F ( alien -- alien ) dup <F-destructor> execute |dispose drop ; inline
 
 ;FUNCTOR
 
-: DESTRUCTOR: scan define-destructor ; parsing
\ No newline at end of file
+: DESTRUCTOR: scan-word define-destructor ; parsing
\ No newline at end of file