units.imperial: How much is a liter? About eight gills.

diff --git a/extra/units/imperial/imperial-tests.factor b/extra/units/imperial/imperial-tests.factor
index 793fe5679d69be3417f21d7cf4e4d941552a78d1..1305d1e41937d16b9cea57f527a4143ae0726a11 100644 (file)
--- a/extra/units/imperial/imperial-tests.factor
+++ b/extra/units/imperial/imperial-tests.factor
@@ -19,3 +19,18 @@ IN: units.imperial.tests
 [ 768 ] [ 1 gallons [ teaspoons ] undo ] unit-test
 [ 1 ] [ 768 teaspoons [ gallons ] undo ] unit-test
 
+{ 1 } [ 6 feet [ fathoms ] undo ] unit-test
+{ 1 } [ 8 furlongs [ miles ] undo ] unit-test
+{ 1 } [ 100 links [ chains ] undo ] unit-test
+{ 1 } [ 40 poles [ furlongs ] undo ] unit-test
+{ 1 } [ 100 feet [ ramsdens-chains ] undo ] unit-test
+
+{ 1 } [ 15 fathoms [ shackles ] undo ] unit-test
+{ 1 } [ 30 yards [ shackles ] undo ] unit-test
+{ 1 } [ 608 feet [ cables ] undo ] unit-test
+
+{ 1 } [ 4 inches [ hands ] undo ] unit-test
+{ 1 } [ 3 inches [ palms ] undo ] unit-test
+{ 1 } [ 16 nails [ yards ] undo ] unit-test
+{ 1 } [ 8 fingers [ yards ] undo ] unit-test
+

diff --git a/extra/units/imperial/imperial.factor b/extra/units/imperial/imperial.factor
index a0c6350227306eb7e8743af1b095fa6594ada8a5..4b2e617a18f316a47f5f63856bcff051d76318e3 100644 (file)
--- a/extra/units/imperial/imperial.factor
+++ b/extra/units/imperial/imperial.factor
@@ -7,10 +7,38 @@ IN: units.imperial
 
 : yards ( n -- dimensioned ) 3 * feet ;
 
+: hands ( n -- dimensioned ) 4 * inches ;
+
+: palms ( n -- dimensioned ) 3 * inches ;
+
+: nails ( n -- dimensioned ) 1/16 * yards ;
+
+: fingers ( n -- dimensioned ) 1/8 * yards ;
+
 : miles ( n -- dimensioned ) 1760 * yards ;
 
+: furlongs ( n -- dimensioned ) 1/8 * miles ;
+
+: chains ( n -- dimensioned ) 1/10 * furlongs ;
+
+: links ( n -- dimensioned ) 1/100 * chains ;
+
+: rods ( n -- dimensioned ) 11/2 * yards ;
+
+ALIAS: poles rods
+
+ALIAS: perches rods
+
+: ramsdens-chains ( n -- dimensioned ) 100 * feet ;
+
 : nautical-miles ( n -- dimensioned ) 1852 * m ;
 
+: fathoms ( n -- dimensioned ) 6 * feet ;
+
+: shackles ( n -- dimensioned ) 15 * fathoms ;
+
+: cables ( n -- dimensioned ) 608 * feet ;
+
 : pounds ( n -- dimensioned ) 22/10 / kg ;
 
 : ounces ( n -- dimensioned ) 1/16 * pounds ;
@@ -23,11 +51,13 @@ IN: units.imperial
 
 : cups ( n -- dimensioned ) 1/2 * pints ;
 
-: fluid-ounces ( n -- dimensioned ) 1/16 * pints ;
+: us-fluid-ounces ( n -- dimensioned ) 1/16 * pints ;
+
+: teaspoons ( n -- dimensioned ) 1/6 * us-fluid-ounces ;
 
-: teaspoons ( n -- dimensioned ) 1/6 * fluid-ounces ;
+: tablespoons ( n -- dimensioned ) 1/2 * us-fluid-ounces ;
 
-: tablespoons ( n -- dimensioned ) 1/2 * fluid-ounces ;
+: us-gill ( n -- dimensioned ) 4 * us-fluid-ounces ;
 
 : knots ( n -- dimensioned ) 1852/3600 * m/s ;
 
@@ -53,8 +83,6 @@ IN: units.imperial
 
 : bushels ( n -- dimensioned ) 4 * pecks ;
 
-: rods ( n -- dimensioned ) 11/2 * yards ;
-