From 507f814d48d1eecfbc2749ff1e7b00fd26a66a41 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 17 Aug 2008 10:50:26 -0500
Subject: [PATCH] remove old accessors before major refactoring

---
 extra/taxes/tags.txt     |  2 +-
 extra/taxes/taxes.factor | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extra/taxes/tags.txt b/extra/taxes/tags.txt
index 8b13789179..2964ef21b1 100644
--- a/extra/taxes/tags.txt
+++ b/extra/taxes/tags.txt
@@ -1 +1 @@
-
+taxes
diff --git a/extra/taxes/taxes.factor b/extra/taxes/taxes.factor
index 5522dd9bcb..5e2a395c40 100644
--- a/extra/taxes/taxes.factor
+++ b/extra/taxes/taxes.factor
@@ -1,5 +1,7 @@
-USING: arrays assocs kernel math math.intervals namespaces
-sequences combinators.lib money math.order ;
+! Copyright (C) 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors arrays assocs kernel math math.intervals
+namespaces sequences combinators.lib money math.order ;
 IN: taxes
 
 : monthly ( x -- y ) 12 / ;
@@ -14,22 +16,21 @@ C: <w4> w4
 
 : allowance ( -- x ) 3500 ; inline
 
-: calculate-w4-allowances ( w4 -- x )
-    w4-allowances allowance * ;
+: calculate-w4-allowances ( w4 -- x ) allowances>> allowance * ;
 
 ! Withhold: FICA, Medicare, Federal (FICA is social security)
 : fica-tax-rate ( -- x ) DECIMAL: .062 ; inline
 
 ! Base rate -- income over this rate is not taxed
-TUPLE: fica-base-unknown ;
+ERROR: fica-base-unknown ;
 : fica-base-rate ( year -- x )
     H{
         { 2008 102000 }
         { 2007  97500 }
-    } at* [ T{ fica-base-unknown } throw ] unless ;
+    } at* [ fica-base-unknown ] unless ;
 
 : fica-tax ( salary w4 -- x )
-    w4-year fica-base-rate min fica-tax-rate * ;
+    year>> fica-base-rate min fica-tax-rate * ;
 
 ! Employer tax only, not withheld
 : futa-tax-rate ( -- x ) DECIMAL: .062 ; inline
@@ -64,8 +65,7 @@ TUPLE: tax-table single married ;
     0 -rot [ tax-bracket ] each drop ;
 
 : marriage-table ( w4 tax-table -- triples )
-    swap w4-married?
-    [ tax-table-married ] [ tax-table-single ] if ;
+    swap married?>> [ married>> ] [ single>> ] if ;
 
 : federal-tax ( salary w4 tax-table -- n )
     [ adjust-allowances ] 2keep marriage-table tax ;