Remove lots of dead code from MorphoEng.

2 files changed, 5 insertions, 134 deletions

diff --git a/next-lib/src/english/MorphoEng.gf b/next-lib/src/english/MorphoEng.gf
index e02c38b83..8ea3c27a1 100644
--- a/next-lib/src/english/MorphoEng.gf
+++ b/next-lib/src/english/MorphoEng.gf
@@ -12,40 +12,10 @@ resource MorphoEng = ResEng ** open Prelude, (Predef=Predef) in {
 
   flags optimize=all ;
 
---2 Phonology
---
--- To regulate the use of endings for both nouns, adjectives, and verbs:
-
-oper
-  y2ie : Str -> Str -> Str = \fly,s -> 
-    let y = last (init fly) in
-    case y of {
-      "a" => fly + s ;
-      "e" => fly + s ;
-      "o" => fly + s ;
-      "u" => fly + s ;
-    _   => init fly + "ie" + s
-    } ;
-
-
---2 Nouns
---
--- For conciseness and abstraction, we define a worst-case macro for
--- noun inflection. It is used for defining special case that
--- only need one string as argument.
-
-oper
-  CommonNoun : Type = {s : Number => Case => Str} ;
-
---3 Proper names
---
--- Regular proper names are inflected with "'s" in the genitive.
-
-  nameReg : Str -> Gender -> {s : Case => Str} = \john,g -> 
-    {s = table {Gen => john + "'s" ; _ => john} ; g = g} ;
-
 --2 Determiners
 
+  oper 
+
   mkDeterminer : Number -> Str -> {s : Str ; sp : Case => Str; n : Number} = \n,s ->
     {s = s; 
      sp = regGenitiveS s ;
@@ -80,105 +50,5 @@ oper
      sp = regGenitiveS mine
    } ;
 
---2 Adjectives
---
--- To form the adjectival and the adverbial forms, two strings are needed
--- in the worst case. (First without degrees.)
-
-  Adjective = {s : AForm => Str} ;
-
--- However, most adjectives can be inflected using the final character.
--- N.B. this is not correct for "shy", but $mkAdjective$ has to be used.
-
-  regAdjective : Str -> Adjective = \free -> 
-    let 
-      e   = last free ;
-      fre = init free ;
-      freely = case e of {
-        "y" => fre + "ily" ;
-        _   => free + "ly"
-        } ;
-      fre = case e of {
-        "e" => fre ;
-        "y" => fre + "i" ;
-        _   => free
-        }
-    in 
-    mkAdjective free (fre + "er") (fre + "est") freely ; 
-
--- Many adjectives are 'inflected' by adding a comparison word.
-
-  adjDegrLong : Str -> Adjective = \ridiculous ->
-    mkAdjective 
-      ridiculous 
-      ("more" ++ ridiculous) 
-      ("most" ++ ridiculous) 
-      ((regAdjective ridiculous).s ! AAdv) ;
-
-
---3 Verbs
---
--- The worst case needs five forms. (The verb "be" is treated separately.)
-
-  mkVerb4 : (_,_,_,_: Str) -> Verb = \go,goes,went,gone -> 
-    let going = case last go of {
-      "e" => init go + "ing" ;
-      _ => go + "ing"
-      }
-    in
-    mkVerb go goes went gone going ;
-
--- This is what we use to derive the irregular forms in almost all cases
-
-  mkVerbIrreg : (_,_,_ : Str) -> Verb = \bite,bit,bitten -> 
-    let bites = case last bite of {
-      "y" => y2ie bite "s" ;
-      "s" => init bite + "es" ;
-      _   => bite + "s"
-      } 
-    in mkVerb4 bite bites bit bitten ;
-
--- This is used to derive regular forms.
-
-  mkVerbReg : Str -> Verb = \soak -> 
-    let 
-      soaks = case last soak of {
-        "y" => y2ie soak "s" ;
-        "s" => init soak + "es" ;
-        _   => soak + "s"
-        } ;
-      soaked = case last soak of {
-        "e" => init soak + "s" ;
-        _   => soak + "ed"
-        }
-    in 
-    mkVerb4 soak soaks soaked soaked ;
-
-  verbGen : Str -> Verb = \kill -> case last kill of {
-    "y" => verbP3y (init kill) ;
-    "e" => verbP3e (init kill) ;
-    "s" => verbP3s (init kill) ;
-    _   => regVerbP3 kill
-    } ;
-
--- These are just auxiliary to $verbGen$.
-
-  regVerbP3 : Str -> Verb = \walk -> 
-    mkVerbIrreg walk (walk + "ed") (walk + "ed") ;
-  verbP3s   : Str -> Verb = \kiss -> 
-    mkVerb4 kiss (kiss + "es") (kiss + "ed") (kiss + "ed") ;
-  verbP3e   : Str -> Verb = \love -> 
-    mkVerb4 love (love + "s") (love + "d") (love + "d") ;
-  verbP3y   : Str -> Verb = \cr -> 
-    mkVerb4 (cr + "y") (cr + "ies") (cr + "ied") (cr + "ied") ;
-
---- The particle always appears right after the verb.
-
-  verbPart : Verb -> Str -> Verb = \v,p ->
-    {s = \\f => v.s ! f ++ p ; isRefl = v.isRefl} ;
-
-  verbNoPart : Verb -> Verb = \v -> verbPart v [] ;
-
-
 } ;
 
diff --git a/next-lib/src/english/ParadigmsEng.gf b/next-lib/src/english/ParadigmsEng.gf
index e2deffe80..27f05892d 100644
--- a/next-lib/src/english/ParadigmsEng.gf
+++ b/next-lib/src/english/ParadigmsEng.gf
@@ -359,7 +359,8 @@ oper
   cnN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p.s ; c3 = q.s} ;
 
   regPN n = regGenPN n human ;
-  regGenPN n g = nameReg n g ** {g = g ; lock_PN = <>} ;
+  regGenPN n g = {s = table {Gen => n + "'s" ; _ => n} ; 
+		  g = g ; lock_PN = <>} ;
   nounPN n = {s = n.s ! singular ; g = n.g ; lock_PN = <>} ;
 
   mk2A a b = mkAdjective a a a b ** {lock_A = <>} ;
@@ -450,7 +451,7 @@ oper
     in
     mk5V fit (fit + "s") y z fitting ;
 
-  partV v p = verbPart v p ** {lock_V = <>} ;
+  partV v p = {s = \\f => v.s ! f ++ p ; isRefl = v.isRefl ; lock_V = <>} ;
   reflV v = {s = v.s ; part = v.part ; lock_V = v.lock_V ; isRefl = True} ;
 
   prepV2 v p = v ** {s = v.s ; s1 = v.s1 ; c2 = p.s ; lock_V2 = <>} ;