english: move to basis. closes #1587.

diff --git a/basis/english/authors.txt b/basis/english/authors.txt
new file mode 100644 (file)
index 0000000..e091bb8
--- /dev/null
+++ b/basis/english/authors.txt
@@ -0,0 +1 @@
+John Benediktsson

diff --git a/basis/english/english-tests.factor b/basis/english/english-tests.factor
new file mode 100644 (file)
index 0000000..e65b247
--- /dev/null
+++ b/basis/english/english-tests.factor
@@ -0,0 +1,16 @@
+USE: tools.test
+IN: english
+
+{ "record" } [ "records" singularize ] unit-test
+{ "FOOT" } [ "FEET" singularize ] unit-test
+
+{ "friends" } [ "friend" pluralize ] unit-test
+{ "enemies" } [ "enemy" pluralize ] unit-test
+{ "Sheep" } [ "Sheep" pluralize ] unit-test
+
+{ "a10n" } [ "abbreviation" a10n ] unit-test
+{ "i18n" } [ "internationalization" a10n ] unit-test
+
+{ "3 babies" } [ 3 "baby" count-of-things ] unit-test
+{ "1 pipe" } [ 1 "pipe" count-of-things ] unit-test
+{ "0 pipes" } [ 0 "pipe" count-of-things ] unit-test

diff --git a/basis/english/english.factor b/basis/english/english.factor
new file mode 100644 (file)
index 0000000..a8abe56
--- /dev/null
+++ b/basis/english/english.factor
@@ -0,0 +1,151 @@
+! Copyright (C) 2015 John Benediktsson
+! See http://factorcode.org/license.txt for BSD license
+USING: assocs assocs.extras combinators formatting kernel literals
+locals math math.parser sequences splitting unicode.case ;
+
+IN: english
+
+<PRIVATE
+
+<<
+! Irregular pluralizations
+CONSTANT: singular-to-plural H{
+
+    ! us -> i
+    { "alumnus" "alumni" }
+    { "cactus" "cacti" }
+    { "focus" "foci" }
+    { "fungus" "fungi" }
+    { "nucleus" "nuclei" }
+    { "radius" "radii" }
+    { "stimulus" "stimuli" }
+
+    ! is -> es
+    { "analysis" "analyses" }
+    { "axis" "axes" }
+    { "basis" "bases" }
+    { "crisis" "crises" }
+    { "diagnosis" "diagnoses" }
+    { "ellipsis" "ellipses" }
+    { "hypothesis" "hypotheses" }
+    { "oasis" "oases" }
+    { "paralysis" "paralyses" }
+    { "parenthesis" "parentheses" }
+    { "synopsis" "synopses" }
+    { "synthesis" "syntheses" }
+    { "thesis" "theses" }
+
+    ! ix -> ices
+    { "appendix" "appendices" }
+    { "index" "indices" }
+    { "matrix" "matrices" }
+
+    ! eau -> eaux
+    { "beau" "beaux" }
+    { "bureau" "bureaus" }
+    { "tableau" "tableaux" }
+
+    ! ? -> en
+    { "child" "children" }
+    { "man" "men" }
+    { "ox" "oxen" }
+    { "woman" "women" }
+
+    ! ? -> a
+    { "bacterium" "bacteria" }
+    { "corpus" "corpora" }
+    { "criterion" "criteria" }
+    { "curriculum" "curricula" }
+    { "datum" "data" }
+    { "genus" "genera" }
+    { "medium" "media" }
+    { "memorandum" "memoranda" }
+    { "phenomenon" "phenomena" }
+    { "stratum" "strata" }
+
+    ! no change
+    { "bison" "bison" }
+    { "deer" "deer" }
+    { "fish" "fish" }
+    { "means" "means" }
+    { "moose" "moose" }
+    { "offspring" "offspring" }
+    { "series" "series" }
+    { "sheep" "sheep" }
+    { "species" "species" }
+    { "swine" "swine" }
+
+    ! oo -> ee
+    { "foot" "feet" }
+    { "goose" "geese" }
+    { "tooth" "teeth" }
+
+    ! a -> ae
+    { "antenna" "antennae" }
+    { "formula" "formulae" }
+    { "nebula" "nebulae" }
+    { "vertebra" "vertebrae" }
+    { "vita" "vitae" }
+
+    ! ouse -> ice
+    { "louse" "lice" }
+    { "mouse" "mice" }
+}
+>>
+
+CONSTANT: plural-to-singular $[ singular-to-plural assoc-invert ]
+
+:: match-case ( master disciple -- master' )
+    {
+        { [ master >lower master = ] [ disciple >lower ] }
+        { [ master >upper master = ] [ disciple >upper ] }
+        { [ master >title master = ] [ disciple >title ] }
+        [ disciple ]
+    } cond ;
+
+PRIVATE>
+
+: singularize ( word -- singular )
+    dup >lower {
+        { [ dup empty? ] [ ] }
+        { [ dup singular-to-plural key? ] [ ] }
+        { [ plural-to-singular ?at ] [ ] }
+        { [ dup "s" tail? not ] [ ] }
+        {
+            [
+                dup "ies" ?tail [
+                    last "aeiou" member? not
+                ] [ drop f ] if
+            ] [ 3 head* "y" append ]
+        }
+        { [ dup "es" tail? ] [ 2 head* ] }
+        [ but-last ]
+    } cond match-case ;
+
+: pluralize ( word -- plural )
+    dup >lower {
+        { [ dup empty? ] [ ] }
+        { [ dup plural-to-singular key? ] [ ] }
+        { [ singular-to-plural ?at ] [ ] }
+        {
+            [
+                dup "y" ?tail [
+                    last "aeiou" member? not
+                ] [ drop f ] if
+            ] [ but-last "ies" append ]
+        }
+        {
+            [ dup { "s" "ch" "sh" } [ tail? ] with any? ]
+            [ dup "es" tail? [ "es" append ] unless ]
+        }
+        [ "s" append ]
+    } cond match-case ;
+
+: count-of-things ( count word -- str )
+    over 1 = [ pluralize ] unless "%d %s" sprintf ;
+
+: a10n ( str -- str' )
+    dup length 3 > [
+        [ 1 head ] [ length 2 - number>string ] [ 1 tail* ] tri
+        3append
+    ] when ;

diff --git a/basis/english/summary.txt b/basis/english/summary.txt
new file mode 100644 (file)
index 0000000..078a45a
--- /dev/null
+++ b/basis/english/summary.txt
@@ -0,0 +1 @@
+English language

diff --git a/extra/english/authors.txt b/extra/english/authors.txt
deleted file mode 100644 (file)
index e091bb8..0000000
--- a/extra/english/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-John Benediktsson

diff --git a/extra/english/english-tests.factor b/extra/english/english-tests.factor
deleted file mode 100644 (file)
index e65b247..0000000
--- a/extra/english/english-tests.factor
+++ /dev/null
@@ -1,16 +0,0 @@
-USE: tools.test
-IN: english
-
-{ "record" } [ "records" singularize ] unit-test
-{ "FOOT" } [ "FEET" singularize ] unit-test
-
-{ "friends" } [ "friend" pluralize ] unit-test
-{ "enemies" } [ "enemy" pluralize ] unit-test
-{ "Sheep" } [ "Sheep" pluralize ] unit-test
-
-{ "a10n" } [ "abbreviation" a10n ] unit-test
-{ "i18n" } [ "internationalization" a10n ] unit-test
-
-{ "3 babies" } [ 3 "baby" count-of-things ] unit-test
-{ "1 pipe" } [ 1 "pipe" count-of-things ] unit-test
-{ "0 pipes" } [ 0 "pipe" count-of-things ] unit-test

diff --git a/extra/english/english.factor b/extra/english/english.factor
deleted file mode 100644 (file)
index a8abe56..0000000
--- a/extra/english/english.factor
+++ /dev/null
@@ -1,151 +0,0 @@
-! Copyright (C) 2015 John Benediktsson
-! See http://factorcode.org/license.txt for BSD license
-USING: assocs assocs.extras combinators formatting kernel literals
-locals math math.parser sequences splitting unicode.case ;
-
-IN: english
-
-<PRIVATE
-
-<<
-! Irregular pluralizations
-CONSTANT: singular-to-plural H{
-
-    ! us -> i
-    { "alumnus" "alumni" }
-    { "cactus" "cacti" }
-    { "focus" "foci" }
-    { "fungus" "fungi" }
-    { "nucleus" "nuclei" }
-    { "radius" "radii" }
-    { "stimulus" "stimuli" }
-
-    ! is -> es
-    { "analysis" "analyses" }
-    { "axis" "axes" }
-    { "basis" "bases" }
-    { "crisis" "crises" }
-    { "diagnosis" "diagnoses" }
-    { "ellipsis" "ellipses" }
-    { "hypothesis" "hypotheses" }
-    { "oasis" "oases" }
-    { "paralysis" "paralyses" }
-    { "parenthesis" "parentheses" }
-    { "synopsis" "synopses" }
-    { "synthesis" "syntheses" }
-    { "thesis" "theses" }
-
-    ! ix -> ices
-    { "appendix" "appendices" }
-    { "index" "indices" }
-    { "matrix" "matrices" }
-
-    ! eau -> eaux
-    { "beau" "beaux" }
-    { "bureau" "bureaus" }
-    { "tableau" "tableaux" }
-
-    ! ? -> en
-    { "child" "children" }
-    { "man" "men" }
-    { "ox" "oxen" }
-    { "woman" "women" }
-
-    ! ? -> a
-    { "bacterium" "bacteria" }
-    { "corpus" "corpora" }
-    { "criterion" "criteria" }
-    { "curriculum" "curricula" }
-    { "datum" "data" }
-    { "genus" "genera" }
-    { "medium" "media" }
-    { "memorandum" "memoranda" }
-    { "phenomenon" "phenomena" }
-    { "stratum" "strata" }
-
-    ! no change
-    { "bison" "bison" }
-    { "deer" "deer" }
-    { "fish" "fish" }
-    { "means" "means" }
-    { "moose" "moose" }
-    { "offspring" "offspring" }
-    { "series" "series" }
-    { "sheep" "sheep" }
-    { "species" "species" }
-    { "swine" "swine" }
-
-    ! oo -> ee
-    { "foot" "feet" }
-    { "goose" "geese" }
-    { "tooth" "teeth" }
-
-    ! a -> ae
-    { "antenna" "antennae" }
-    { "formula" "formulae" }
-    { "nebula" "nebulae" }
-    { "vertebra" "vertebrae" }
-    { "vita" "vitae" }
-
-    ! ouse -> ice
-    { "louse" "lice" }
-    { "mouse" "mice" }
-}
->>
-
-CONSTANT: plural-to-singular $[ singular-to-plural assoc-invert ]
-
-:: match-case ( master disciple -- master' )
-    {
-        { [ master >lower master = ] [ disciple >lower ] }
-        { [ master >upper master = ] [ disciple >upper ] }
-        { [ master >title master = ] [ disciple >title ] }
-        [ disciple ]
-    } cond ;
-
-PRIVATE>
-
-: singularize ( word -- singular )
-    dup >lower {
-        { [ dup empty? ] [ ] }
-        { [ dup singular-to-plural key? ] [ ] }
-        { [ plural-to-singular ?at ] [ ] }
-        { [ dup "s" tail? not ] [ ] }
-        {
-            [
-                dup "ies" ?tail [
-                    last "aeiou" member? not
-                ] [ drop f ] if
-            ] [ 3 head* "y" append ]
-        }
-        { [ dup "es" tail? ] [ 2 head* ] }
-        [ but-last ]
-    } cond match-case ;
-
-: pluralize ( word -- plural )
-    dup >lower {
-        { [ dup empty? ] [ ] }
-        { [ dup plural-to-singular key? ] [ ] }
-        { [ singular-to-plural ?at ] [ ] }
-        {
-            [
-                dup "y" ?tail [
-                    last "aeiou" member? not
-                ] [ drop f ] if
-            ] [ but-last "ies" append ]
-        }
-        {
-            [ dup { "s" "ch" "sh" } [ tail? ] with any? ]
-            [ dup "es" tail? [ "es" append ] unless ]
-        }
-        [ "s" append ]
-    } cond match-case ;
-
-: count-of-things ( count word -- str )
-    over 1 = [ pluralize ] unless "%d %s" sprintf ;
-
-: a10n ( str -- str' )
-    dup length 3 > [
-        [ 1 head ] [ length 2 - number>string ] [ 1 tail* ] tri
-        3append
-    ] when ;

diff --git a/extra/english/summary.txt b/extra/english/summary.txt
deleted file mode 100644 (file)
index 078a45a..0000000
--- a/extra/english/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-English language