From fa02a747e022014cb8706fc7a77dd99928ab7f3b Mon Sep 17 00:00:00 2001 From: bringert Date: Fri, 11 May 2007 13:36:16 +0000 Subject: [PATCH] Use non-overloaded versions of mkV and mkV2 in IrregEng and LexiconEng. --- lib/resource-1.0/english/IrregEng.gf | 8 ++++---- lib/resource-1.0/english/LexiconEng.gf | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/resource-1.0/english/IrregEng.gf b/lib/resource-1.0/english/IrregEng.gf index bea851f70..2b90da1c4 100644 --- a/lib/resource-1.0/english/IrregEng.gf +++ b/lib/resource-1.0/english/IrregEng.gf @@ -37,7 +37,7 @@ flags optimize=values ; deal_V = irregV "deal" "dealt" "dealt" ; dig_V = irregDuplV "dig" "dug" "dug" ; dive_V = irregV "dive" (variants {"dived" ; "dove"}) "dived" ; - do_V = mkV "do" "does" "did" "done" "doing" ; + do_V = mk5V "do" "does" "did" "done" "doing" ; draw_V = irregV "draw" "drew" "drawn" ; dream_V = irregV "dream" (variants {"dreamed" ; "dreamt"}) (variants {"dreamed" ; "dreamt"}) ; drive_V = irregV "drive" "drove" "driven" ; @@ -59,11 +59,11 @@ flags optimize=values ; freeze_V = irregV "freeze" "froze" "frozen" ; get_V = irregDuplV "get" "got" "gotten" ; give_V = irregV "give" "gave" "given" ; - go_V = mkV "go" "goes" "went" "gone" "going" ; + go_V = mk5V "go" "goes" "went" "gone" "going" ; grind_V = irregV "grind" "ground" "ground" ; grow_V = irregV "grow" "grew" "grown" ; hang_V = irregV "hang" "hung" "hung" ; - have_V = mkV "have" "has" "had" "had" "having" ; + have_V = mk5V "have" "has" "had" "had" "having" ; hear_V = irregV "hear" "heard" "heard" ; hide_V = irregV "hide" "hid" "hidden" ; hit_V = irregDuplV "hit" "hit" "hit" ; @@ -90,7 +90,7 @@ flags optimize=values ; mistake_V = irregV "mistake" "mistook" "mistaken" ; mow_V = irregV "mow" "mowed" (variants {"mowed" ; "mown"}) ; overcome_V = irregV "overcome" "overcame" "overcome" ; - overdo_V = mkV "overdo" "overdoes" "overdid" "overdone" "overdoing" ; + overdo_V = mk5V "overdo" "overdoes" "overdid" "overdone" "overdoing" ; overtake_V = irregV "overtake" "overtook" "overtaken" ; overthrow_V = irregV "overthrow" "overthrew" "overthrown" ; pay_V = irregV "pay" "paid" "paid" ; diff --git a/lib/resource-1.0/english/LexiconEng.gf b/lib/resource-1.0/english/LexiconEng.gf index fb094f22a..b5c97aecb 100644 --- a/lib/resource-1.0/english/LexiconEng.gf +++ b/lib/resource-1.0/english/LexiconEng.gf @@ -85,12 +85,12 @@ lin glove_N = regN "glove" ; gold_N = regN "gold" ; good_A = mkADeg "good" "well" "better" "best" ; - go_V = mkV "go" "goes" "went" "gone" "going" ; + go_V = mk5V "go" "goes" "went" "gone" "going" ; green_A = regADeg "green" ; harbour_N = regN "harbour" ; hate_V2 = dirV2 (regV "hate") ; hat_N = regN "hat" ; - have_V2 = dirV2 (mkV "have" "has" "had" "had" "having") ; + have_V2 = dirV2 (mk5V "have" "has" "had" "had" "having") ; hear_V2 = dirV2 (irregV "hear" "heard" "heard") ; hill_N = regN "hill" ; hope_VS = mkVS (regV "hope") ; @@ -108,7 +108,7 @@ lin leather_N = regN "leather" ; leave_V2 = dirV2 (irregV "leave" "left" "left") ; like_V2 = dirV2 (regV "like") ; - listen_V2 = mkV2 (regV "listen") toP ; + listen_V2 = prepV2 (regV "listen") toP ; live_V = (regV "live") ; long_A = regADeg "long" ; lose_V2 = dirV2 (irregV "lose" "lost" "lost") ; @@ -196,7 +196,7 @@ lin understand_V2 = dirV2 (irregV "understand" "understood" "understood") ; university_N = regN "university" ; village_N = regN "village" ; - wait_V2 = mkV2 (regV "wait") forP ; + wait_V2 = prepV2 (regV "wait") forP ; walk_V = (regV "walk") ; warm_A = regADeg "warm" ; war_N = regN "war" ; @@ -213,13 +213,13 @@ lin yellow_A = regADeg "yellow" ; young_A = regADeg "young" ; - do_V2 = dirV2 (mkV "do" "does" "did" "done" "doing") ; + do_V2 = dirV2 (mk5V "do" "does" "did" "done" "doing") ; now_Adv = mkAdv "now" ; already_Adv = mkAdv "already" ; song_N = regN "song" ; add_V3 = dirV3 (regV "add") toP ; number_N = regN "number" ; - put_V2 = mkV2 (irregDuplV "put" "put" "put") noPrep ; + put_V2 = prepV2 (irregDuplV "put" "put" "put") noPrep ; stop_V = regDuplV "stop" ; jump_V = regV "jump" ;