diff --git a/lib/resource/MkLexicon.hs b/lib/resource/MkLexicon.hs index 4c53f1290..e1f88e6f4 100644 --- a/lib/resource/MkLexicon.hs +++ b/lib/resource/MkLexicon.hs @@ -14,6 +14,13 @@ noComm s = case s of "" -> False _ -> True +-- remove tailing comments + +remTail s = case s of + '-':'-':_ -> [] + c:cs -> c : remTail cs + _ -> s + -- postfix with category postfix p s = takeWhile (not . isSpace) s ++ "_" ++ p @@ -70,3 +77,11 @@ mkIdent s = case words s of "SomewhereNP" -> "SomewhereAdv" "AgentPrep" -> "By8agentPrep" _ -> w + +-- massage French verbs 9/2/2005 + +freVerb s = case words s of + v:_ -> " " ++ v ++ " : " ++ cat v ++ " ;" + _ -> [] + where + cat v = dropWhile (not . isUpper) v diff --git a/lib/resource/english/ParadigmsEng.gf b/lib/resource/english/ParadigmsEng.gf index c34c17ce4..a70a6cce1 100644 --- a/lib/resource/english/ParadigmsEng.gf +++ b/lib/resource/english/ParadigmsEng.gf @@ -374,7 +374,10 @@ oper _ => crie + "ed" } ; crying = case y of { - "e" => cr + "ing" ; + "e" => case last cr of { + "e" => cry + "ing" ; + _ => cr + "ing" + } ; _ => cry + "ing" } in mkV cry cries cried cried crying ; @@ -383,7 +386,8 @@ oper let fitt = fit + last fit in mkV fit (fit + "s") (fitt + "ed") (fitt + "ed") (fitt + "ing") ; - irregV x y z = mkVerbIrreg x y z ** {s1 = [] ; lock_V = <>} ; + irregV x y z = let reg = (regV x).s in + mkV x (reg ! Indic Sg) y z (reg ! PresPart) ** {s1 = [] ; lock_V = <>} ; irregDuplV fit y z = let diff --git a/lib/resource/english/SyntaxEng.gf b/lib/resource/english/SyntaxEng.gf index b928fc582..5b4fbf2e8 100644 --- a/lib/resource/english/SyntaxEng.gf +++ b/lib/resource/english/SyntaxEng.gf @@ -450,8 +450,7 @@ oper isAux : Bool } ; --- This is just an infinitival (or present participle) phrase - +-- The following is just an infinitival (or present participle) phrase. param VIForm = VIInfinit | VIPresPart ; diff --git a/lib/resource/english/VerbsEng.gf b/lib/resource/english/VerbsEng.gf index abb26f914..bb953add0 100644 --- a/lib/resource/english/VerbsEng.gf +++ b/lib/resource/english/VerbsEng.gf @@ -1,179 +1,179 @@ -resource VerbsEng = open ResourceEng, MorphoEng in { - oper vIrreg : Str -> Str -> Str -> V = \x,y,z -> - mkVerbIrreg x y z ** {s1 = [] ; lock_V = <>} ; +--# -path=.:../../prelude:../abstract - oper awake_V : V = vIrreg "awake" "awoke" "awoken" ; - ---- be - oper bear_V : V = vIrreg "bear" "bore" "born" ; - oper beat_V : V = vIrreg "beat" "beat" "beat" ; - oper become_V : V = vIrreg "become" "became" "become" ; - oper begin_V : V = vIrreg "begin" "began" "begun" ; - oper bend_V : V = vIrreg "bend" "bent" "bent" ; - oper beset_V : V = vIrreg "beset" "beset" "beset" ; - oper bet_V : V = vIrreg "bet" "bet" "bet" ; - oper bid_V : V = vIrreg "bid" (variants {"bid" ; "bade"}) (variants {"bid" ; "bidden"}) ; - oper bind_V : V = vIrreg "bind" "bound" "bound" ; - oper bite_V : V = vIrreg "bite" "bit" "bitten" ; - oper bleed_V : V = vIrreg "bleed" "bled" "bled" ; - oper blow_V : V = vIrreg "blow" "blew" "blown" ; - oper break_V : V = vIrreg "break" "broke" "broken" ; - oper breed_V : V = vIrreg "breed" "bred" "bred" ; - oper bring_V : V = vIrreg "bring" "brought" "brought" ; - oper broadcast_V : V = vIrreg "broadcast" "broadcast" "broadcast" ; - oper build_V : V = vIrreg "build" "built" "built" ; - oper burn_V : V = vIrreg "burn" (variants {"burned" ; "burnt"}) (variants {"burned" ; "burnt"}) ; - oper burst_V : V = vIrreg "burst" "burst" "burst" ; - oper buy_V : V = vIrreg "buy" "bought" "bought" ; - oper cast_V : V = vIrreg "cast" "cast" "cast" ; - oper catch_V : V = vIrreg "catch" "caught" "caught" ; - oper choose_V : V = vIrreg "choose" "chose" "chosen" ; - oper cling_V : V = vIrreg "cling" "clung" "clung" ; - oper come_V : V = vIrreg "come" "came" "come" ; - oper cost_V : V = vIrreg "cost" "cost" "cost" ; - oper creep_V : V = vIrreg "creep" "crept" "crept" ; - oper cut_V : V = vIrreg "cut" "cut" "cut" ; - oper deal_V : V = vIrreg "deal" "dealt" "dealt" ; - oper dig_V : V = vIrreg "dig" "dug" "dug" ; - oper dive_V : V = vIrreg "dive" (variants {"dived" ; "dove"}) "dived" ; - oper do_V : V = vIrreg "do" "did" "done" ; - oper draw_V : V = vIrreg "draw" "drew" "drawn" ; - oper dream_V : V = vIrreg "dream" (variants {"dreamed" ; "dreamt"}) (variants {"dreamed" ; "dreamt"}) ; - oper drive_V : V = vIrreg "drive" "drove" "driven" ; - oper drink_V : V = vIrreg "drink" "drank" "drunk" ; - oper eat_V : V = vIrreg "eat" "ate" "eaten" ; - oper fall_V : V = vIrreg "fall" "fell" "fallen" ; - oper feed_V : V = vIrreg "feed" "fed" "fed" ; - oper feel_V : V = vIrreg "feel" "felt" "felt" ; - oper fight_V : V = vIrreg "fight" "fought" "fought" ; - oper find_V : V = vIrreg "find" "found" "found" ; - oper fit_V : V = vIrreg "fit" "fit" "fit" ; - oper flee_V : V = vIrreg "flee" "fled" "fled" ; - oper fling_V : V = vIrreg "fling" "flung" "flung" ; - oper fly_V : V = vIrreg "fly" "flew" "flown" ; - oper forbid_V : V = vIrreg "forbid" "forbade" "forbidden" ; - oper forget_V : V = vIrreg "forget" "forgot" "forgotten" ; - oper forgive_V : V = vIrreg "forgive" "forgave" "forgiven" ; - oper forsake_V : V = vIrreg "forsake" "forsook" "forsaken" ; - oper freeze_V : V = vIrreg "freeze" "froze" "frozen" ; - oper get_V : V = vIrreg "get" "got" "gotten" ; - oper give_V : V = vIrreg "give" "gave" "given" ; - oper go_V : V = vIrreg "go" "went" "gone" ; - oper grind_V : V = vIrreg "grind" "ground" "ground" ; - oper grow_V : V = vIrreg "grow" "grew" "grown" ; - oper hang_V : V = vIrreg "hang" "hung" "hung" ; - ---- have - oper hear_V : V = vIrreg "hear" "heard" "heard" ; - oper hide_V : V = vIrreg "hide" "hid" "hidden" ; - oper hit_V : V = vIrreg "hit" "hit" "hit" ; - oper hold_V : V = vIrreg "hold" "held" "held" ; - oper hurt_V : V = vIrreg "hurt" "hurt" "hurt" ; - oper keep_V : V = vIrreg "keep" "kept" "kept" ; - oper kneel_V : V = vIrreg "kneel" "knelt" "knelt" ; - oper knit_V : V = vIrreg "knit" "knit" "knit" ; - oper know_V : V = vIrreg "know" "knew" "know" ; - oper lay_V : V = vIrreg "lay" "laid" "laid" ; - oper lead_V : V = vIrreg "lead" "led" "led" ; - oper leap_V : V = vIrreg "leap" (variants {"leaped" ; "lept"}) (variants {"leaped" ; "lept"}) ; - oper learn_V : V = vIrreg "learn" (variants {"learned" ; "learnt"}) (variants {"learned" ; "learnt"}) ; - oper leave_V : V = vIrreg "leave" "left" "left" ; - oper lend_V : V = vIrreg "lend" "lent" "lent" ; - oper let_V : V = vIrreg "let" "let" "let" ; - oper lie_V : V = vIrreg "lie" "lay" "lain" ; - oper light_V : V = vIrreg "light" (variants {"lighted" ; "lit"}) "lighted" ; - oper lose_V : V = vIrreg "lose" "lost" "lost" ; - oper make_V : V = vIrreg "make" "made" "made" ; - oper mean_V : V = vIrreg "mean" "meant" "meant" ; - oper meet_V : V = vIrreg "meet" "met" "met" ; - oper misspell_V : V = vIrreg "misspell" (variants {"misspelled" ; "misspelt"}) (variants {"misspelled" ; "misspelt"}) ; - oper mistake_V : V = vIrreg "mistake" "mistook" "mistaken" ; - oper mow_V : V = vIrreg "mow" "mowed" (variants {"mowed" ; "mown"}) ; - oper overcome_V : V = vIrreg "overcome" "overcame" "overcome" ; - oper overdo_V : V = vIrreg "overdo" "overdid" "overdone" ; - oper overtake_V : V = vIrreg "overtake" "overtook" "overtaken" ; - oper overthrow_V : V = vIrreg "overthrow" "overthrew" "overthrown" ; - oper pay_V : V = vIrreg "pay" "paid" "paid" ; - oper plead_V : V = vIrreg "plead" "pled" "pled" ; - oper prove_V : V = vIrreg "prove" "proved" (variants {"proved" ; "proven"}) ; - oper put_V : V = vIrreg "put" "put" "put" ; - oper quit_V : V = vIrreg "quit" "quit" "quit" ; - oper read_V : V = vIrreg "read" "read" "read" ; - oper rid_V : V = vIrreg "rid" "rid" "rid" ; - oper ride_V : V = vIrreg "ride" "rode" "ridden" ; - oper ring_V : V = vIrreg "ring" "rang" "rung" ; - oper rise_V : V = vIrreg "rise" "rose" "risen" ; - oper run_V : V = vIrreg "run" "ran" "run" ; - oper saw_V : V = vIrreg "saw" "sawed" (variants {"sawed" ; "sawn"}) ; - oper say_V : V = vIrreg "say" "said" "said" ; - oper see_V : V = vIrreg "see" "saw" "seen" ; - oper seek_V : V = vIrreg "seek" "sought" "sought" ; - oper sell_V : V = vIrreg "sell" "sold" "sold" ; - oper send_V : V = vIrreg "send" "sent" "sent" ; - oper set_V : V = vIrreg "set" "set" "set" ; - oper sew_V : V = vIrreg "sew" "sewed" (variants {"sewed" ; "sewn"}) ; - oper shake_V : V = vIrreg "shake" "shook" "shaken" ; - oper shave_V : V = vIrreg "shave" "shaved" (variants {"shaved" ; "shaven"}) ; - oper shear_V : V = vIrreg "shear" "shore" "shorn" ; - oper shed_V : V = vIrreg "shed" "shed" "shed" ; - oper shine_V : V = vIrreg "shine" "shone" "shone" ; - oper shoe_V : V = vIrreg "shoe" "shoed" (variants {"shoed" ; "shod"}) ; - oper shoot_V : V = vIrreg "shoot" "shot" "shot" ; - oper show_V : V = vIrreg "show" "showed" (variants {"showed" ; "shown"}) ; - oper shrink_V : V = vIrreg "shrink" "shrank" "shrunk" ; - oper shut_V : V = vIrreg "shut" "shut" "shut" ; - oper sing_V : V = vIrreg "sing" "sang" "sung" ; - oper sink_V : V = vIrreg "sink" "sank" "sunk" ; - oper sit_V : V = vIrreg "sit" "sat" "sat" ; - oper sleep_V : V = vIrreg "sleep" "slept" "slept" ; - oper slay_V : V = vIrreg "slay" "slew" "slain" ; - oper slide_V : V = vIrreg "slide" "slid" "slid" ; - oper sling_V : V = vIrreg "sling" "slung" "slung" ; - oper slit_V : V = vIrreg "slit" "slit" "slit" ; - oper smite_V : V = vIrreg "smite" "smote" "smitten" ; - oper sow_V : V = vIrreg "sow" "sowed" (variants {"sowed" ; "sown"}) ; - oper speak_V : V = vIrreg "speak" "spoke" "spoken" ; - oper speed_V : V = vIrreg "speed" "sped" "sped" ; - oper spend_V : V = vIrreg "spend" "spent" "spent" ; - oper spill_V : V = vIrreg "spill" (variants {"spilled" ; "spilt"}) (variants {"spilled" ; "spilt"}) ; - oper spin_V : V = vIrreg "spin" "spun" "spun" ; - oper spit_V : V = vIrreg "spit" (variants {"spit" ; "spat"}) "spit" ; - oper split_V : V = vIrreg "split" "split" "split" ; - oper spread_V : V = vIrreg "spread" "spread" "spread" ; - oper spring_V : V = vIrreg "spring" (variants {"sprang" ; "sprung"}) "sprung" ; - oper stand_V : V = vIrreg "stand" "stood" "stood" ; - oper steal_V : V = vIrreg "steal" "stole" "stolen" ; - oper stick_V : V = vIrreg "stick" "stuck" "stuck" ; - oper sting_V : V = vIrreg "sting" "stung" "stung" ; - oper stink_V : V = vIrreg "stink" "stank" "stunk" ; - oper stride_V : V = vIrreg "stride" "strod" "stridden" ; - oper strike_V : V = vIrreg "strike" "struck" "struck" ; - oper string_V : V = vIrreg "string" "strung" "strung" ; - oper strive_V : V = vIrreg "strive" "strove" "striven" ; - oper swear_V : V = vIrreg "swear" "swore" "sworn" ; - oper sweep_V : V = vIrreg "sweep" "swept" "swept" ; - oper swell_V : V = vIrreg "swell" "swelled" (variants {"swelled" ; "swollen"}) ; - oper swim_V : V = vIrreg "swim" "swam" "swum" ; - oper swing_V : V = vIrreg "swing" "swung" "swung" ; - oper take_V : V = vIrreg "take" "took" "taken" ; - oper teach_V : V = vIrreg "teach" "taught" "taught" ; - oper tear_V : V = vIrreg "tear" "tore" "torn" ; - oper tell_V : V = vIrreg "tell" "told" "told" ; - oper think_V : V = vIrreg "think" "thought" "thought" ; - oper thrive_V : V = vIrreg "thrive" (variants {"thrived" ; "throve"}) "thrived" ; - oper throw_V : V = vIrreg "throw" "threw" "thrown" ; - oper thrust_V : V = vIrreg "thrust" "thrust" "thrust" ; - oper tread_V : V = vIrreg "tread" "trod" "trodden" ; - oper understand_V : V = vIrreg "understand" "understood" "understood" ; - oper uphold_V : V = vIrreg "uphold" "upheld" "upheld" ; - oper upset_V : V = vIrreg "upset" "upset" "upset" ; - oper wake_V : V = vIrreg "wake" "woke" "woken" ; - oper wear_V : V = vIrreg "wear" "wore" "worn" ; - oper weave_V : V = vIrreg "weave" (variants {"weaved" ; "wove"}) (variants {"weaved" ; "woven"}) ; - oper wed_V : V = vIrreg "wed" "wed" "wed" ; - oper weep_V : V = vIrreg "weep" "wept" "wept" ; - oper wind_V : V = vIrreg "wind" "wound" "wound" ; - oper win_V : V = vIrreg "win" "won" "won" ; - oper withhold_V : V = vIrreg "withhold" "withheld" "withheld" ; - oper withstand_V : V = vIrreg "withstand" "withstood" "withstood" ; - oper wring_V : V = vIrreg "wring" "wrung" "wrung" ; - oper write_V : V = vIrreg "write" "wrote" "written" ; +concrete VerbsEng of VerbsEngAbs = CategoriesEng ** open ParadigmsEng in { + + lin + awake_V = irregV "awake" "awoke" "awoken" ; + bear_V = irregV "bear" "bore" "born" ; + beat_V = irregV "beat" "beat" "beat" ; + become_V = irregV "become" "became" "become" ; + begin_V = irregV "begin" "began" "begun" ; + bend_V = irregV "bend" "bent" "bent" ; + beset_V = irregV "beset" "beset" "beset" ; + bet_V = irregDuplV "bet" "bet" "bet" ; + bid_V = irregDuplV "bid" (variants {"bid" ; "bade"}) (variants {"bid" ; "bidden"}) ; + bind_V = irregV "bind" "bound" "bound" ; + bite_V = irregV "bite" "bit" "bitten" ; + bleed_V = irregV "bleed" "bled" "bled" ; + blow_V = irregV "blow" "blew" "blown" ; + break_V = irregV "break" "broke" "broken" ; + breed_V = irregV "breed" "bred" "bred" ; + bring_V = irregV "bring" "brought" "brought" ; + broadcast_V = irregV "broadcast" "broadcast" "broadcast" ; + build_V = irregV "build" "built" "built" ; + burn_V = irregV "burn" (variants {"burned" ; "burnt"}) (variants {"burned" ; "burnt"}) ; + burst_V = irregV "burst" "burst" "burst" ; + buy_V = irregV "buy" "bought" "bought" ; + cast_V = irregV "cast" "cast" "cast" ; + catch_V = irregV "catch" "caught" "caught" ; + choose_V = irregV "choose" "chose" "chosen" ; + cling_V = irregV "cling" "clung" "clung" ; + come_V = irregV "come" "came" "come" ; + cost_V = irregV "cost" "cost" "cost" ; + creep_V = irregV "creep" "crept" "crept" ; + cut_V = irregDuplV "cut" "cut" "cut" ; + 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" ; + draw_V = irregV "draw" "drew" "drawn" ; + dream_V = irregV "dream" (variants {"dreamed" ; "dreamt"}) (variants {"dreamed" ; "dreamt"}) ; + drive_V = irregV "drive" "drove" "driven" ; + drink_V = irregV "drink" "drank" "drunk" ; + eat_V = irregV "eat" "ate" "eaten" ; + fall_V = irregV "fall" "fell" "fallen" ; + feed_V = irregV "feed" "fed" "fed" ; + feel_V = irregV "feel" "felt" "felt" ; + fight_V = irregV "fight" "fought" "fought" ; + find_V = irregV "find" "found" "found" ; + fit_V = irregDuplV "fit" "fit" "fit" ; + flee_V = irregV "flee" "fled" "fled" ; + fling_V = irregV "fling" "flung" "flung" ; + fly_V = irregV "fly" "flew" "flown" ; + forbid_V = irregDuplV "forbid" "forbade" "forbidden" ; + forget_V = irregDuplV "forget" "forgot" "forgotten" ; + forgive_V = irregV "forgive" "forgave" "forgiven" ; + forsake_V = irregV "forsake" "forsook" "forsaken" ; + freeze_V = irregV "freeze" "froze" "frozen" ; + get_V = irregDuplV "get" "got" "gotten" ; + give_V = irregV "give" "gave" "given" ; + go_V = irregV "go" "went" "gone" ; + 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" ; + hear_V = irregV "hear" "heard" "heard" ; + hide_V = irregV "hide" "hid" "hidden" ; + hit_V = irregDuplV "hit" "hit" "hit" ; + hold_V = irregV "hold" "held" "held" ; + hurt_V = irregV "hurt" "hurt" "hurt" ; + keep_V = irregV "keep" "kept" "kept" ; + kneel_V = irregV "kneel" "knelt" "knelt" ; + knit_V = irregDuplV "knit" "knit" "knit" ; + know_V = irregV "know" "knew" "know" ; + lay_V = irregV "lay" "laid" "laid" ; + lead_V = irregV "lead" "led" "led" ; + leap_V = irregV "leap" (variants {"leaped" ; "lept"}) (variants {"leaped" ; "lept"}) ; + learn_V = irregV "learn" (variants {"learned" ; "learnt"}) (variants {"learned" ; "learnt"}) ; + leave_V = irregV "leave" "left" "left" ; + lend_V = irregV "lend" "lent" "lent" ; + let_V = irregDuplV "let" "let" "let" ; + lie_V = irregV "lie" "lay" "lain" ; + light_V = irregV "light" (variants {"lighted" ; "lit"}) "lighted" ; + lose_V = irregV "lose" "lost" "lost" ; + make_V = irregV "make" "made" "made" ; + mean_V = irregV "mean" "meant" "meant" ; + meet_V = irregV "meet" "met" "met" ; + misspell_V = irregV "misspell" (variants {"misspelled" ; "misspelt"}) (variants {"misspelled" ; "misspelt"}) ; + 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" ; + overtake_V = irregV "overtake" "overtook" "overtaken" ; + overthrow_V = irregV "overthrow" "overthrew" "overthrown" ; + pay_V = irregV "pay" "paid" "paid" ; + plead_V = irregV "plead" "pled" "pled" ; + prove_V = irregV "prove" "proved" (variants {"proved" ; "proven"}) ; + put_V = irregDuplV "put" "put" "put" ; + quit_V = irregDuplV "quit" "quit" "quit" ; + read_V = irregV "read" "read" "read" ; + rid_V = irregDuplV "rid" "rid" "rid" ; + ride_V = irregV "ride" "rode" "ridden" ; + ring_V = irregV "ring" "rang" "rung" ; + rise_V = irregV "rise" "rose" "risen" ; + run_V = irregDuplV "run" "ran" "run" ; + saw_V = irregV "saw" "sawed" (variants {"sawed" ; "sawn"}) ; + say_V = irregV "say" "said" "said" ; + see_V = irregV "see" "saw" "seen" ; + seek_V = irregV "seek" "sought" "sought" ; + sell_V = irregV "sell" "sold" "sold" ; + send_V = irregV "send" "sent" "sent" ; + set_V = irregDuplV "set" "set" "set" ; + sew_V = irregV "sew" "sewed" (variants {"sewed" ; "sewn"}) ; + shake_V = irregV "shake" "shook" "shaken" ; + shave_V = irregV "shave" "shaved" (variants {"shaved" ; "shaven"}) ; + shear_V = irregV "shear" "shore" "shorn" ; + shed_V = irregDuplV "shed" "shed" "shed" ; + shine_V = irregV "shine" "shone" "shone" ; + shoe_V = irregV "shoe" "shoed" (variants {"shoed" ; "shod"}) ; + shoot_V = irregV "shoot" "shot" "shot" ; + show_V = irregV "show" "showed" (variants {"showed" ; "shown"}) ; + shrink_V = irregV "shrink" "shrank" "shrunk" ; + shut_V = irregDuplV "shut" "shut" "shut" ; + sing_V = irregV "sing" "sang" "sung" ; + sink_V = irregV "sink" "sank" "sunk" ; + sit_V = irregDuplV "sit" "sat" "sat" ; + sleep_V = irregV "sleep" "slept" "slept" ; + slay_V = irregV "slay" "slew" "slain" ; + slide_V = irregV "slide" "slid" "slid" ; + sling_V = irregV "sling" "slung" "slung" ; + slit_V = irregDuplV "slit" "slit" "slit" ; + smite_V = irregV "smite" "smote" "smitten" ; + sow_V = irregV "sow" "sowed" (variants {"sowed" ; "sown"}) ; + speak_V = irregV "speak" "spoke" "spoken" ; + speed_V = irregV "speed" "sped" "sped" ; + spend_V = irregV "spend" "spent" "spent" ; + spill_V = irregV "spill" (variants {"spilled" ; "spilt"}) (variants {"spilled" ; "spilt"}) ; + spin_V = irregDuplV "spin" "spun" "spun" ; + spit_V = irregDuplV "spit" (variants {"spit" ; "spat"}) "spit" ; + split_V = irregDuplV "split" "split" "split" ; + spread_V = irregV "spread" "spread" "spread" ; + spring_V = irregV "spring" (variants {"sprang" ; "sprung"}) "sprung" ; + stand_V = irregV "stand" "stood" "stood" ; + steal_V = irregV "steal" "stole" "stolen" ; + stick_V = irregV "stick" "stuck" "stuck" ; + sting_V = irregV "sting" "stung" "stung" ; + stink_V = irregV "stink" "stank" "stunk" ; + stride_V = irregV "stride" "strod" "stridden" ; + strike_V = irregV "strike" "struck" "struck" ; + string_V = irregV "string" "strung" "strung" ; + strive_V = irregV "strive" "strove" "striven" ; + swear_V = irregV "swear" "swore" "sworn" ; + sweep_V = irregV "sweep" "swept" "swept" ; + swell_V = irregV "swell" "swelled" (variants {"swelled" ; "swollen"}) ; + swim_V = irregDuplV "swim" "swam" "swum" ; + swing_V = irregV "swing" "swung" "swung" ; + take_V = irregV "take" "took" "taken" ; + teach_V = irregV "teach" "taught" "taught" ; + tear_V = irregV "tear" "tore" "torn" ; + tell_V = irregV "tell" "told" "told" ; + think_V = irregV "think" "thought" "thought" ; + thrive_V = irregV "thrive" (variants {"thrived" ; "throve"}) "thrived" ; + throw_V = irregV "throw" "threw" "thrown" ; + thrust_V = irregV "thrust" "thrust" "thrust" ; + tread_V = irregV "tread" "trod" "trodden" ; + understand_V = irregV "understand" "understood" "understood" ; + uphold_V = irregV "uphold" "upheld" "upheld" ; + upset_V = irregDuplV "upset" "upset" "upset" ; + wake_V = irregV "wake" "woke" "woken" ; + wear_V = irregV "wear" "wore" "worn" ; + weave_V = irregV "weave" (variants {"weaved" ; "wove"}) (variants {"weaved" ; "woven"}) ; + wed_V = irregDuplV "wed" "wed" "wed" ; + weep_V = irregV "weep" "wept" "wept" ; + wind_V = irregV "wind" "wound" "wound" ; + win_V = irregDuplV "win" "won" "won" ; + withhold_V = irregV "withhold" "withheld" "withheld" ; + withstand_V = irregV "withstand" "withstood" "withstood" ; + wring_V = irregV "wring" "wrung" "wrung" ; + write_V = irregV "write" "wrote" "written" ; } diff --git a/lib/resource/french/TestVerbsFre.gf b/lib/resource/french/TestVerbsFre.gf new file mode 100644 index 000000000..dc7962aa1 --- /dev/null +++ b/lib/resource/french/TestVerbsFre.gf @@ -0,0 +1,9 @@ +--# -path=.:../romance:../oldabstract:../abstract:../../prelude + +concrete TestVerbsFre of TestVerbsFreAbs = + TestResourceFre, VerbsFre ** open TypesFre in { + + lin UseVN ve = verbPres ve.s ve.aux ; + lin UseVN2 ve = verbPres ve.s ve.aux ** {s2 = [] ; c = ve.c} ; + +} diff --git a/lib/resource/french/TestVerbsFreAbs.gf b/lib/resource/french/TestVerbsFreAbs.gf new file mode 100644 index 000000000..de219d8fb --- /dev/null +++ b/lib/resource/french/TestVerbsFreAbs.gf @@ -0,0 +1,4 @@ +abstract TestVerbsFreAbs = TestResource, VerbsFreAbs ** { + fun UseVN : VN -> V ; + fun UseVN2 : VN2 -> V2 ; +} diff --git a/lib/resource/french/VerbsFre.gf b/lib/resource/french/VerbsFre.gf new file mode 100644 index 000000000..17b58694b --- /dev/null +++ b/lib/resource/french/VerbsFre.gf @@ -0,0 +1,396 @@ +--# -path=.:../romance:../abstract:../../prelude + +-- Irregular verbs from Nancy, based on a list from Sylvain Pogodalla, 25/11/2004 +-- Translated to GF by Aarne Ranta +-- added extracted subcat information 29/11 + +concrete VerbsFre of VerbsFreAbs = --- CategoriesFre ** + open TypesFre, MorphoFre, ConjugNancy in { + +lincat VN = {s : VForm => Str ; aux : VAux} ; +lincat VN2 = {s : VForm => Str ; aux : VAux ; c : Case} ; + +-- all verbs in classes with "er" and "finir" are omitted + +lin + abattreVN2 = v_nancy55 "abattre" ** {aux = AHabere ; c = Acc} ; + absoudreVN2 = v_nancy72 "absoudre" ** {aux = AHabere ; c = Acc} ; + abstenirVN = v_nancy23 "abstenir" ** {aux = AHabere ; c = Acc} ; + abstraireVN2 = v_nancy61 "abstraire" ** {aux = AHabere ; c = Acc} ; + accourirVN = v_nancy33 "accourir" ** {aux = AHabere} ; + accroîtreVN2 = v_nancy73 "accroître" ** {aux = AHabere ; c = Acc} ; + accueillirVN2 = v_nancy28 "accueillir" ** {aux = AHabere ; c = Acc} ; + acquérirVN2 = v_nancy24 "acquérir" ** {aux = AHabere ; c = Acc} ; + adjoindreVN2 = v_nancy58 "adjoindre" ** {aux = AHabere ; c = Acc} ; + admettreVN2 = v_nancy56 "admettre" ** {aux = AHabere ; c = Acc} ; + advenirVN = v_nancy23 "advenir" ** {aux = AEsse} ; + allerVN = v_nancy22 "aller" ** {aux = AEsse} ; + apercevoirVN2 = v_nancy38 "apercevoir" ** {aux = AHabere ; c = Gen} ; + apparaîtreVN = v_nancy64 "apparaître" ** {aux = AHabere} ; + appartenirVN2 = v_nancy23 "appartenir" ** {aux = AHabere ; c = Dat} ; + appendreVN2 = v_nancy53 "appendre" ** {aux = AHabere ; c = Acc} ; + apprendreVN2 = v_nancy54 "apprendre" ** {aux = AHabere ; c = Acc} ; + assaillirVN2 = v_nancy29 "assaillir" ** {aux = AHabere ; c = Acc} ; + asseoirVN2 = v_nancy49 "asseoir" ** {aux = AHabere ; c = Acc} ; + astreindreVN2 = v_nancy57 "astreindre" ** {aux = AHabere ; c = Acc} ; + atteindreVN2 = v_nancy57 "atteindre" ** {aux = AHabere ; c = Acc} ; + attendreVN2 = v_nancy53 "attendre" ** {aux = AHabere ; c = Dat} ; + avoirVN2 = v_nancy1 "avoir" ** {aux = AHabere ; c = Acc} ; + battreVN2 = v_nancy55 "battre" ** {aux = AHabere ; c = Acc} ; + boireVN2 = v_nancy69 "boire" ** {aux = AHabere ; c = Acc} ; + bouillirVN2 = v_nancy31 "bouillir" ** {aux = AHabere ; c = Acc} ; + braireVN = v_nancy61 "braire" ** {aux = AHabere} ; + ceindreVN2 = v_nancy57 "ceindre" ** {aux = AHabere ; c = Acc} ; + choirVN = v_nancy52 "choir" ** {aux = AEsse} ; + circonscrireVN2 = v_nancy80 "circonscrire" ** {aux = AHabere ; c = Acc} ; + circonvenirVN2 = v_nancy23 "circonvenir" ** {aux = AHabere ; c = Acc} ; + cloreVN2 = v_nancy70 "clore" ** {aux = AHabere ; c = Acc} ; + combattreVN2 = v_nancy55 "combattre" ** {aux = AHabere ; c = Acc} ; + commettreVN2 = v_nancy56 "commettre" ** {aux = AHabere ; c = Acc} ; + comparaîtreVN2 = v_nancy64 "comparaître" ** {aux = AHabere ; c = Acc} ; + complaireVN2 = v_nancy63 "complaire" ** {aux = AHabere ; c = Dat} ; + comprendreVN2 = v_nancy54 "comprendre" ** {aux = AHabere ; c = Acc} ; + compromettreVN2 = v_nancy56 "compromettre" ** {aux = AHabere ; c = Acc} ; + concevoirVN2 = v_nancy38 "concevoir" ** {aux = AHabere ; c = Acc} ; + conclureVN2 = v_nancy71 "conclure" ** {aux = AHabere ; c = Acc} ; + concourirVN2 = v_nancy33 "concourir" ** {aux = AHabere ; c = Acc} ; + condescendreVN2 = v_nancy53 "condescendre" ** {aux = AHabere ; c = Dat} ; + conduireVN2 = v_nancy82 "conduire" ** {aux = AHabere ; c = Acc} ; + confireVN2 = v_nancy81 "confire" ** {aux = AHabere ; c = Acc} ; + confondreVN2 = v_nancy53 "confondre" ** {aux = AHabere ; c = Acc} ; + conjoindreVN2 = v_nancy58 "conjoindre" ** {aux = AHabere ; c = Acc} ; + connaîtreVN2 = v_nancy64 "connaître" ** {aux = AHabere ; c = Acc} ; + conquérirVN2 = v_nancy24 "conquérir" ** {aux = AHabere ; c = Acc} ; + consentirVN2 = v_nancy25 "consentir" ** {aux = AHabere ; c = Dat} ; + construireVN2 = v_nancy82 "construire" ** {aux = AHabere ; c = Acc} ; + contenirVN2 = v_nancy23 "contenir" ** {aux = AHabere ; c = Acc} ; + contraindreVN2 = v_nancy59 "contraindre" ** {aux = AHabere ; c = Acc} ; + contrebattreVN2 = v_nancy55 "contrebattre" ** {aux = AHabere ; c = Acc} ; + contredireVN2 = v_nancy78 "contredire" ** {aux = AHabere ; c = Acc} ; + contrefaireVN2 = v_nancy62 "contrefaire" ** {aux = AHabere ; c = Acc} ; + contrevenirVN2 = v_nancy23 "contrevenir" ** {aux = AHabere ; c = Dat} ; + convaincreVN2 = v_nancy60 "convaincre" ** {aux = AHabere ; c = Gen} ; + convenirVN2 = v_nancy23 "convenir" ** {aux = AHabere ; c = Gen} ; + correspondreVN2 = v_nancy53 "correspondre" ** {aux = AHabere ; c = Dat} ; + corrompreVN2 = v_nancy53 "corrompre" ** {aux = AHabere ; c = Acc} ; + coudreVN2 = v_nancy73 "coudre" ** {aux = AHabere ; c = Acc} ; + courirVN2 = v_nancy33 "courir" ** {aux = AHabere ; c = Acc} ; + couvrirVN2 = v_nancy27 "couvrir" ** {aux = AHabere ; c = Acc} ; + craindreVN2 = v_nancy59 "craindre" ** {aux = AHabere ; c = Acc} ; + croireVN2 = v_nancy68 "croire" ** {aux = AHabere ; c = Dat} ; + croîtreVN = v_nancy67 "croître" ** {aux = AEsse} ; + cueillirVN2 = v_nancy28 "cueillir" ** {aux = AHabere ; c = Acc} ; + cuireVN2 = v_nancy82 "cuire" ** {aux = AHabere ; c = Acc} ; + débattreVN2 = v_nancy55 "débattre" ** {aux = AHabere ; c = Acc} ; + débouillirVN2 = v_nancy31 "débouillir" ** {aux = AHabere ; c = Acc} ; + décevoirVN2 = v_nancy38 "décevoir" ** {aux = AHabere ; c = Acc} ; + déchoirVN2 = v_nancy52 "déchoir" ** {aux = AHabere ; c = Acc} ; + décloreVN2 = v_nancy70 "déclore" ** {aux = AHabere ; c = Acc} ; + décommettreVN2 = v_nancy56 "décommettre" ** {aux = AHabere ; c = Acc} ; + déconfireVN2 = v_nancy81 "déconfire" ** {aux = AHabere ; c = Acc} ; + découdreVN2 = v_nancy73 "découdre" ** {aux = AHabere ; c = Acc} ; + découvrirVN2 = v_nancy27 "découvrir" ** {aux = AHabere ; c = Acc} ; + décrireVN2 = v_nancy80 "décrire" ** {aux = AHabere ; c = Acc} ; + décroîtreVN2 = v_nancy67 "décroître" ** {aux = AHabere ; c = Acc} ; + décuireVN2 = v_nancy82 "décuire" ** {aux = AHabere ; c = Acc} ; + déduireVN2 = v_nancy82 "déduire" ** {aux = AHabere ; c = Acc} ; + défaillirVN = v_nancy30 "défaillir" ** {aux = AHabere} ; + défaireVN2 = v_nancy62 "défaire" ** {aux = AHabere ; c = Acc} ; + défendreVN2 = v_nancy53 "défendre" ** {aux = AHabere ; c = Acc} ; + démentirVN2 = v_nancy25 "démentir" ** {aux = AHabere ; c = Acc} ; + démettreVN2 = v_nancy56 "démettre" ** {aux = AHabere ; c = Acc} ; + démordreVN = v_nancy53 "démordre" ** {aux = AHabere} ; + départirVN2 = v_nancy25 "départir" ** {aux = AHabere ; c = Gen} ; + dépeindreVN2 = v_nancy57 "dépeindre" ** {aux = AHabere ; c = Acc} ; + dépendreVN2 = v_nancy53 "dépendre" ** {aux = AHabere ; c = Gen} ; + déplaireVN = v_nancy63 "déplaire" ** {aux = AHabere} ; + dépourvoirVN2 = v_nancy40 "dépourvoir" ** {aux = AHabere ; c = Acc} ; + déprendreVN2 = v_nancy54 "déprendre" ** {aux = AHabere ; c = Gen} ; + désapprendreVN2 = v_nancy54 "désapprendre" ** {aux = AHabere ; c = Acc} ; + descendreVN2 = v_nancy53 "descendre" ** {aux = AHabere ; c = Acc} ; + desservirVN2 = v_nancy35 "desservir" ** {aux = AHabere ; c = Acc} ; + déteindreVN2 = v_nancy57 "déteindre" ** {aux = AHabere ; c = Acc} ; + détendreVN2 = v_nancy53 "détendre" ** {aux = AHabere ; c = Acc} ; + détenirVN2 = v_nancy23 "détenir" ** {aux = AHabere ; c = Acc} ; + détordreVN2 = v_nancy53 "détordre" ** {aux = AHabere ; c = Acc} ; + détruireVN2 = v_nancy82 "détruire" ** {aux = AHabere ; c = Acc} ; + devenirVN = v_nancy23 "devenir" ** {aux = AEsse} ; + dévêtirVN2 = v_nancy26 "dévêtir" ** {aux = AHabere ; c = Acc} ; + devoirVN2 = v_nancy42 "devoir" ** {aux = AHabere ; c = Acc} ; + direVN2 = v_nancy78 "dire" ** {aux = AHabere ; c = Acc} ; + disconvenirVN2 = v_nancy23 "disconvenir" ** {aux = AHabere ; c = Gen} ; + discourirVN2 = v_nancy33 "discourir" ** {aux = AHabere ; c = Gen} ; + disjoindreVN2 = v_nancy58 "disjoindre" ** {aux = AHabere ; c = Acc} ; + disparaîtreVN2 = v_nancy64 "disparaître" ** {aux = AHabere ; c = Acc} ; + dissoudreVN2 = v_nancy72 "dissoudre" ** {aux = AHabere ; c = Acc} ; + distendreVN2 = v_nancy53 "distendre" ** {aux = AHabere ; c = Acc} ; + distordreVN2 = v_nancy53 "distordre" ** {aux = AHabere ; c = Acc} ; + distraireVN2 = v_nancy61 "distraire" ** {aux = AHabere ; c = Acc} ; + dormirVN2 = v_nancy32 "dormir" ** {aux = AHabere ; c = Acc} ; + ébattreVN = v_nancy55 "ébattre" ** {aux = AHabere ; c = Acc} ; + échoirVN2 = v_nancy52 "échoir" ** {aux = AEsse ; c = Dat} ; + écloreVN2 = v_nancy70 "éclore" ** {aux = AHabere ; c = Acc} ; + éconduireVN2 = v_nancy82 "éconduire" ** {aux = AHabere ; c = Acc} ; + écrireVN2 = v_nancy80 "écrire" ** {aux = AHabere ; c = Acc} ; + élireVN2 = v_nancy77 "élire" ** {aux = AHabere ; c = Acc} ; + embatreVN2 = v_nancy55 "embatre" ** {aux = AHabere ; c = Acc} ; + embattreVN2 = v_nancy55 "embattre" ** {aux = AHabere ; c = Acc} ; + emboireVN = v_nancy69 "emboire" ** {aux = AHabere ; c = Acc} ; + émettreVN2 = v_nancy56 "émettre" ** {aux = AHabere ; c = Acc} ; + émoudreVN2 = v_nancy74 "émoudre" ** {aux = AHabere ; c = Acc} ; + émouvoirVN2 = v_nancy44 "émouvoir" ** {aux = AHabere ; c = Acc} ; + empreindreVN2 = v_nancy57 "empreindre" ** {aux = AHabere ; c = Gen} ; + enceindreVN2 = v_nancy57 "enceindre" ** {aux = AHabere ; c = Acc} ; + encloreVN2 = v_nancy70 "enclore" ** {aux = AHabere ; c = Acc} ; + encourirVN2 = v_nancy33 "encourir" ** {aux = AHabere ; c = Acc} ; + endormirVN2 = v_nancy32 "endormir" ** {aux = AHabere ; c = Acc} ; + enduireVN2 = v_nancy82 "enduire" ** {aux = AHabere ; c = Acc} ; + enfreindreVN2 = v_nancy57 "enfreindre" ** {aux = AHabere ; c = Acc} ; + enfuirVN = v_nancy36 "enfuir" ** {aux = AHabere ; c = Acc} ; + enjoindreVN2 = v_nancy58 "enjoindre" ** {aux = AHabere ; c = Acc} ; + enquérirVN = v_nancy24 "enquérir" ** {aux = AHabere ; c = Acc} ; + entendreVN2 = v_nancy53 "entendre" ** {aux = AHabere ; c = Acc} ; + entr'apercevoirVN = v_nancy38 "entr'apercevoir" ** {aux = AHabere ; c = Acc} ; + entrebattreVN = v_nancy55 "entrebattre" ** {aux = AHabere ; c = Acc} ; + entre_détruireVN = v_nancy82 "entre-détruire" ** {aux = AHabere ; c = Acc} ; + entre_haïrVN = v_nancy20 "entre-haïr" ** {aux = AHabere ; c = Acc} ; + entremettreVN = v_nancy56 "entremettre" ** {aux = AHabere ; c = Acc} ; + entre_nuireVN = v_nancy82 "entre-nuire" ** {aux = AHabere} ; + entreprendreVN2 = v_nancy54 "entreprendre" ** {aux = AHabere ; c = Acc} ; + entretenirVN2 = v_nancy23 "entretenir" ** {aux = AHabere ; c = Acc} ; + entrevoirVN2 = v_nancy39 "entrevoir" ** {aux = AHabere ; c = Acc} ; + entrouvrirVN2 = v_nancy27 "entrouvrir" ** {aux = AHabere ; c = Acc} ; + envoyerVN2 = v_nancy18 "envoyer" ** {aux = AHabere ; c = Acc} ; + épandreVN2 = v_nancy53 "épandre" ** {aux = AHabere ; c = Acc} ; + éperdreVN = v_nancy53 "éperdre" ** {aux = AHabere ; c = Acc} ; + éprendreVN = v_nancy54 "éprendre" ** {aux = AHabere ; c = Acc} ; + équivaloirVN2 = v_nancy47 "équivaloir" ** {aux = AHabere ; c = Dat} ; + éteindreVN2 = v_nancy57 "éteindre" ** {aux = AHabere ; c = Acc} ; + étendreVN2 = v_nancy53 "étendre" ** {aux = AHabere ; c = Acc} ; + étreindreVN2 = v_nancy57 "étreindre" ** {aux = AHabere ; c = Acc} ; + êtreVN = v_nancy2 "être" ** {aux = AHabere} ; + exclureVN2 = v_nancy71 "exclure" ** {aux = AHabere ; c = Acc} ; + extraireVN2 = v_nancy61 "extraire" ** {aux = AHabere ; c = Acc} ; + faillirVN2 = v_nancy30 "faillir" ** {aux = AHabere ; c = Dat} ; + faireVN2 = v_nancy62 "faire" ** {aux = AHabere ; c = Acc} ; + falloirVN = v_nancy46 "falloir" ** {aux = AHabere} ; + feindreVN2 = v_nancy57 "feindre" ** {aux = AHabere ; c = Acc} ; + fendreVN2 = v_nancy53 "fendre" ** {aux = AHabere ; c = Acc} ; + fondreVN2 = v_nancy53 "fondre" ** {aux = AHabere ; c = Acc} ; + forfaireVN2 = v_nancy62 "forfaire" ** {aux = AHabere ; c = Dat} ; + foutreVN2 = v_nancy53 "foutre" ** {aux = AHabere ; c = Gen} ; + frireVN2 = v_nancy81 "frire" ** {aux = AHabere ; c = Acc} ; + fuirVN2 = v_nancy36 "fuir" ** {aux = AHabere ; c = Acc} ; + geindreVN2 = v_nancy57 "geindre" ** {aux = AHabere ; c = Acc} ; + gésirVN2 = mkNV (conj3gésir "gésir") ** {aux = AHabere ; c = Acc} ; + haïrVN2 = v_nancy20 "haïr" ** {aux = AHabere ; c = Acc} ; + inclureVN2 = v_nancy71 "inclure" ** {aux = AHabere ; c = Acc} ; + induireVN2 = v_nancy82 "induire" ** {aux = AHabere ; c = Acc} ; + inscrireVN2 = v_nancy80 "inscrire" ** {aux = AHabere ; c = Acc} ; + instruireVN2 = v_nancy82 "instruire" ** {aux = AHabere ; c = Acc} ; + interdireVN2 = v_nancy78 "interdire" ** {aux = AHabere ; c = Acc} ; + interrompreVN2 = v_nancy53 "interrompre" ** {aux = AHabere ; c = Acc} ; + intervenirVN = v_nancy23 "intervenir" ** {aux = AEsse} ; + introduireVN2 = v_nancy82 "introduire" ** {aux = AHabere ; c = Acc} ; + joindreVN2 = v_nancy58 "joindre" ** {aux = AHabere ; c = Acc} ; + lireVN2 = v_nancy77 "lire" ** {aux = AHabere ; c = Acc} ; + luireVN = v_nancy82 "luire" ** {aux = AHabere} ; + mainmettreVN2 = v_nancy56 "mainmettre" ** {aux = AHabere ; c = Acc} ; + maintenirVN2 = v_nancy23 "maintenir" ** {aux = AHabere ; c = Acc} ; + méconnaîtreVN2 = v_nancy64 "méconnaître" ** {aux = AHabere ; c = Acc} ; + mécroireVN2 = v_nancy68 "mécroire" ** {aux = AHabere ; c = Acc} ; + médireVN2 = v_nancy78 "médire" ** {aux = AHabere ; c = Gen} ; + mentirVN2 = v_nancy25 "mentir" ** {aux = AEsse ; c = Dat} ; + méprendreVN2 = v_nancy54 "méprendre" ** {aux = AHabere ; c = Dat} ; + messeoirVN2 = v_nancy50 "messeoir" ** {aux = AHabere ; c = Acc} ; + mettreVN2 = v_nancy56 "mettre" ** {aux = AHabere ; c = Acc} ; + mévendreVN2 = v_nancy53 "mévendre" ** {aux = AHabere ; c = Acc} ; + mordreVN2 = v_nancy53 "mordre" ** {aux = AHabere ; c = Acc} ; + morfondreVN = v_nancy53 "morfondre" ** {aux = AHabere ; c = Acc} ; + moudreVN2 = v_nancy74 "moudre" ** {aux = AHabere ; c = Acc} ; + mourirVN = v_nancy34 "mourir" ** {aux = AEsse} ; + mouvoirVN2 = v_nancy44 "mouvoir" ** {aux = AHabere ; c = Gen} ; + naîtreVN = v_nancy65 "naître" ** {aux = AEsse} ; + nuireVN2 = v_nancy82 "nuire" ** {aux = AHabere ; c = Dat} ; + obtenirVN2 = v_nancy23 "obtenir" ** {aux = AHabere ; c = Acc} ; + obvenirVN = v_nancy23 "obvenir" ** {aux = AEsse} ; + occlureVN2 = v_nancy71 "occlure" ** {aux = AHabere ; c = Acc} ; + offrirVN2 = v_nancy27 "offrir" ** {aux = AHabere ; c = Acc} ; + oindreVN2 = v_nancy58 "oindre" ** {aux = AHabere ; c = Acc} ; + omettreVN2 = v_nancy56 "omettre" ** {aux = AHabere ; c = Acc} ; + ouïrVN2 = v_nancy37 "ouïr" ** {aux = AHabere ; c = Acc} ; + ouvrirVN2 = v_nancy27 "ouvrir" ** {aux = AHabere ; c = Acc} ; + paîtreVN2 = v_nancy66 "paître" ** {aux = AHabere ; c = Acc} ; + paîtreVN = v_nancy66 "paître" ** {aux = AHabere ; c = Acc} ; + paraîtreVN = v_nancy64 "paraître" ** {aux = AHabere} ; + parcourirVN2 = v_nancy33 "parcourir" ** {aux = AHabere ; c = Acc} ; + parfondreVN2 = v_nancy53 "parfondre" ** {aux = AHabere ; c = Acc} ; + partirVN = v_nancy25 "partir" ** {aux = AEsse} ; + parvenirVN = v_nancy23 "parvenir" ** {aux = AEsse} ; + peindreVN2 = v_nancy57 "peindre" ** {aux = AHabere ; c = Acc} ; + pendreVN2 = v_nancy53 "pendre" ** {aux = AHabere ; c = Acc} ; + percevoirVN2 = v_nancy38 "percevoir" ** {aux = AHabere ; c = Acc} ; + perdreVN2 = v_nancy53 "perdre" ** {aux = AHabere ; c = Acc} ; + permettreVN2 = v_nancy56 "permettre" ** {aux = AHabere ; c = Acc} ; + plaindreVN2 = v_nancy59 "plaindre" ** {aux = AHabere ; c = Acc} ; + plaireVN2 = v_nancy63 "plaire" ** {aux = AHabere ; c = Dat} ; + pleuvoirVN = v_nancy45 "pleuvoir" ** {aux = AHabere} ; + poindreVN2 = v_nancy58 "poindre" ** {aux = AHabere ; c = Acc} ; + pondreVN2 = v_nancy53 "pondre" ** {aux = AHabere ; c = Acc} ; + pourfendreVN2 = v_nancy53 "pourfendre" ** {aux = AHabere ; c = Acc} ; + poursuivreVN2 = v_nancy75 "poursuivre" ** {aux = AHabere ; c = Acc} ; + pourvoirVN2 = v_nancy40 "pourvoir" ** {aux = AHabere ; c = Dat} ; + pouvoirVN = v_nancy43 "pouvoir" ** {aux = AHabere} ; + prédireVN2 = v_nancy78 "prédire" ** {aux = AHabere ; c = Acc} ; + prendreVN2 = v_nancy54 "prendre" ** {aux = AHabere ; c = Acc} ; + prescrireVN2 = v_nancy80 "prescrire" ** {aux = AHabere ; c = Acc} ; + pressentirVN2 = v_nancy25 "pressentir" ** {aux = AHabere ; c = Acc} ; + prétendreVN2 = v_nancy53 "prétendre" ** {aux = AHabere ; c = Dat} ; + prévaloirVN2 = v_nancy47 "prévaloir" ** {aux = AHabere ; c = Gen} ; + prévenirVN2 = v_nancy23 "prévenir" ** {aux = AHabere ; c = Acc} ; + prévoirVN2 = v_nancy39 "prévoir" ** {aux = AHabere ; c = Acc} ; + produireVN2 = v_nancy82 "produire" ** {aux = AHabere ; c = Acc} ; + promettreVN2 = v_nancy56 "promettre" ** {aux = AHabere ; c = Acc} ; + promouvoirVN2 = v_nancy44 "promouvoir" ** {aux = AHabere ; c = Acc} ; + proscrireVN2 = v_nancy80 "proscrire" ** {aux = AHabere ; c = Acc} ; + provenirVN = v_nancy23 "provenir" ** {aux = AEsse} ; + rabattreVN2 = v_nancy55 "rabattre" ** {aux = AHabere ; c = Acc} ; + raireVN2 = v_nancy61 "raire" ** {aux = AHabere ; c = Acc} ; + rapprendreVN2 = v_nancy54 "rapprendre" ** {aux = AHabere ; c = Acc} ; + rasseoirVN2 = v_nancy49 "rasseoir" ** {aux = AHabere ; c = Acc} ; + réadmettreVN2 = v_nancy56 "réadmettre" ** {aux = AHabere ; c = Acc} ; + réapparaîtreVN = v_nancy64 "réapparaître" ** {aux = AHabere} ; + réapprendreVN2 = v_nancy54 "réapprendre" ** {aux = AHabere ; c = Acc} ; + rebattreVN2 = v_nancy55 "rebattre" ** {aux = AHabere ; c = Acc} ; + recevoirVN2 = v_nancy38 "recevoir" ** {aux = AHabere ; c = Acc} ; + recomparaîtreVN2 = v_nancy64 "recomparaître" ** {aux = AHabere ; c = Acc} ; + reconduireVN2 = v_nancy82 "reconduire" ** {aux = AHabere ; c = Acc} ; + reconnaîtreVN2 = v_nancy64 "reconnaître" ** {aux = AHabere ; c = Acc} ; + reconquérirVN2 = v_nancy24 "reconquérir" ** {aux = AHabere ; c = Acc} ; + reconstruireVN2 = v_nancy82 "reconstruire" ** {aux = AHabere ; c = Acc} ; + recoudreVN2 = v_nancy73 "recoudre" ** {aux = AHabere ; c = Acc} ; + recourirVN2 = v_nancy33 "recourir" ** {aux = AHabere ; c = Dat} ; + recouvrirVN2 = v_nancy27 "recouvrir" ** {aux = AHabere ; c = Acc} ; + récrireVN2 = v_nancy80 "récrire" ** {aux = AHabere ; c = Acc} ; + recroîtreVN2 = v_nancy67 "recroître" ** {aux = AHabere ; c = Acc} ; + recueillirVN2 = v_nancy28 "recueillir" ** {aux = AHabere ; c = Acc} ; + recuireVN2 = v_nancy82 "recuire" ** {aux = AHabere ; c = Acc} ; + redécouvrirVN2 = v_nancy27 "redécouvrir" ** {aux = AHabere ; c = Acc} ; + redéfaireVN2 = v_nancy62 "redéfaire" ** {aux = AHabere ; c = Acc} ; + redescendreVN2 = v_nancy53 "redescendre" ** {aux = AHabere ; c = Acc} ; + redevenirVN = v_nancy23 "redevenir" ** {aux = AEsse} ; + redevoirVN2 = v_nancy42 "redevoir" ** {aux = AHabere ; c = Acc} ; + redireVN2 = v_nancy78 "redire" ** {aux = AHabere ; c = Acc} ; + réduireVN2 = v_nancy82 "réduire" ** {aux = AHabere ; c = Dat} ; + réécrireVN2 = v_nancy80 "réécrire" ** {aux = AHabere ; c = Acc} ; + réélireVN2 = v_nancy77 "réélire" ** {aux = AHabere ; c = Acc} ; + réentendreVN2 = v_nancy53 "réentendre" ** {aux = AHabere ; c = Acc} ; + refaireVN2 = v_nancy62 "refaire" ** {aux = AHabere ; c = Acc} ; + refendreVN2 = v_nancy53 "refendre" ** {aux = AHabere ; c = Acc} ; + refondreVN2 = v_nancy53 "refondre" ** {aux = AHabere ; c = Acc} ; + réinscrireVN2 = v_nancy80 "réinscrire" ** {aux = AHabere ; c = Acc} ; + réintroduireVN2 = v_nancy82 "réintroduire" ** {aux = AHabere ; c = Acc} ; + rejoindreVN2 = v_nancy58 "rejoindre" ** {aux = AHabere ; c = Acc} ; + relireVN2 = v_nancy77 "relire" ** {aux = AHabere ; c = Acc} ; + reluireVN2 = v_nancy82 "reluire" ** {aux = AHabere ; c = Acc} ; + remettreVN2 = v_nancy56 "remettre" ** {aux = AHabere ; c = Acc} ; + remordreVN2 = v_nancy53 "remordre" ** {aux = AHabere ; c = Acc} ; + remoudreVN2 = v_nancy74 "remoudre" ** {aux = AHabere ; c = Acc} ; + renaîtreVN2 = v_nancy65 "renaître" ** {aux = AHabere ; c = Acc} ; + rendormirVN2 = v_nancy32 "rendormir" ** {aux = AHabere ; c = Acc} ; + rendreVN2 = v_nancy53 "rendre" ** {aux = AHabere ; c = Acc} ; + rentraireVN2 = v_nancy61 "rentraire" ** {aux = AHabere ; c = Acc} ; + rentrouvrirVN2 = v_nancy27 "rentrouvrir" ** {aux = AHabere ; c = Acc} ; + renvoyerVN2 = v_nancy18 "renvoyer" ** {aux = AHabere ; c = Acc} ; + repaîtreVN2 = v_nancy66 "repaître" ** {aux = AHabere ; c = Acc} ; + répandreVN2 = v_nancy53 "répandre" ** {aux = AHabere ; c = Acc} ; + reparaîtreVN = v_nancy64 "reparaître" ** {aux = AEsse} ; + repartirVN = v_nancy25 "repartir" ** {aux = AEsse} ; + repeindreVN2 = v_nancy57 "repeindre" ** {aux = AHabere ; c = Acc} ; + rependreVN2 = v_nancy53 "rependre" ** {aux = AHabere ; c = Acc} ; + repentirVN = v_nancy25 "repentir" ** {aux = AHabere ; c = Acc} ; + reperdreVN2 = v_nancy53 "reperdre" ** {aux = AHabere ; c = Acc} ; + repleuvoirVN = v_nancy45 "repleuvoir" ** {aux = AHabere} ; + répondreVN2 = v_nancy53 "répondre" ** {aux = AHabere ; c = Acc} ; + reprendreVN2 = v_nancy54 "reprendre" ** {aux = AHabere ; c = Acc} ; + reproduireVN2 = v_nancy82 "reproduire" ** {aux = AHabere ; c = Acc} ; + requérirVN2 = v_nancy24 "requérir" ** {aux = AHabere ; c = Acc} ; + résoudreVN2 = mkNV (conj3résoudre "résoudre") ** {aux = AHabere ; c = Acc} ; + ressentirVN2 = v_nancy25 "ressentir" ** {aux = AHabere ; c = Gen} ; + resservirVN2 = v_nancy35 "resservir" ** {aux = AHabere ; c = Acc} ; + ressortirVN = v_nancy25 "ressortir" ** {aux = AEsse} ; + ressouvenirVN = v_nancy23 "ressouvenir" ** {aux = AHabere ; c = Acc} ; + restreindreVN2 = v_nancy57 "restreindre" ** {aux = AHabere ; c = Acc} ; + reteindreVN2 = v_nancy57 "reteindre" ** {aux = AHabere ; c = Acc} ; + retendreVN2 = v_nancy53 "retendre" ** {aux = AHabere ; c = Acc} ; + retenirVN2 = v_nancy23 "retenir" ** {aux = AHabere ; c = Acc} ; + retondreVN2 = v_nancy53 "retondre" ** {aux = AHabere ; c = Acc} ; + retordreVN2 = v_nancy53 "retordre" ** {aux = AHabere ; c = Acc} ; + retraduireVN2 = v_nancy82 "retraduire" ** {aux = AHabere ; c = Acc} ; + retraireVN2 = v_nancy61 "retraire" ** {aux = AHabere ; c = Acc} ; + retranscrireVN2 = v_nancy80 "retranscrire" ** {aux = AHabere ; c = Acc} ; + retransmettreVN2 = v_nancy56 "retransmettre" ** {aux = AHabere ; c = Acc} ; + rétreindreVN2 = v_nancy57 "rétreindre" ** {aux = AHabere ; c = Acc} ; + revaloirVN2 = v_nancy47 "revaloir" ** {aux = AHabere ; c = Acc} ; + revendreVN2 = v_nancy53 "revendre" ** {aux = AHabere ; c = Acc} ; + revenirVN = v_nancy23 "revenir" ** {aux = AEsse} ; + revêtirVN2 = v_nancy26 "revêtir" ** {aux = AHabere ; c = Acc} ; + revivreVN2 = v_nancy76 "revivre" ** {aux = AHabere ; c = Acc} ; + revoirVN2 = v_nancy39 "revoir" ** {aux = AHabere ; c = Acc} ; + revouloirVN2 = v_nancy48 "revouloir" ** {aux = AHabere ; c = Acc} ; + rireVN2 = v_nancy79 "rire" ** {aux = AHabere ; c = Gen} ; + rompreVN2 = v_nancy53 "rompre" ** {aux = AHabere ; c = Acc} ; + rouvrirVN2 = v_nancy27 "rouvrir" ** {aux = AHabere ; c = Acc} ; + saillirVN2 = v_nancy29 "saillir" ** {aux = AHabere ; c = Acc} ; + satisfaireVN2 = v_nancy62 "satisfaire" ** {aux = AHabere ; c = Dat} ; + savoirVN2 = v_nancy41 "savoir" ** {aux = AHabere ; c = Acc} ; + secourirVN2 = v_nancy33 "secourir" ** {aux = AHabere ; c = Acc} ; + séduireVN2 = v_nancy82 "séduire" ** {aux = AHabere ; c = Acc} ; + sentirVN2 = v_nancy25 "sentir" ** {aux = AHabere ; c = Acc} ; + seoirVN = v_nancy50 "seoir" ** {aux = AHabere} ; + servirVN2 = v_nancy35 "servir" ** {aux = AHabere ; c = Acc} ; + sortirVN = v_nancy25 "sortir" ** {aux = AHabere} ; + soubattreVN2 = v_nancy55 "soubattre" ** {aux = AHabere ; c = Acc} ; + souffrirVN2 = v_nancy27 "souffrir" ** {aux = AHabere ; c = Acc} ; + soumettreVN2 = v_nancy56 "soumettre" ** {aux = AHabere ; c = Dat} ; + sourireVN2 = v_nancy79 "sourire" ** {aux = AHabere ; c = Dat} ; + souscrireVN2 = v_nancy80 "souscrire" ** {aux = AHabere ; c = Dat} ; + sous_entendreVN2 = v_nancy53 "sous-entendre" ** {aux = AHabere ; c = Acc} ; + sous_tendreVN2 = v_nancy53 "sous-tendre" ** {aux = AHabere ; c = Acc} ; + soustraireVN2 = v_nancy61 "soustraire" ** {aux = AHabere ; c = Acc} ; + soutenirVN2 = v_nancy23 "soutenir" ** {aux = AHabere ; c = Acc} ; + souvenirVN = v_nancy23 "souvenir" ** {aux = AHabere ; c = Acc} ; + subvenirVN2 = v_nancy23 "subvenir" ** {aux = AEsse ; c = Dat} ; + suffireVN2 = v_nancy81 "suffire" ** {aux = AHabere ; c = Dat} ; + suivreVN2 = v_nancy75 "suivre" ** {aux = AHabere ; c = Acc} ; + surfaireVN2 = v_nancy62 "surfaire" ** {aux = AHabere ; c = Acc} ; + surprendreVN2 = v_nancy54 "surprendre" ** {aux = AHabere ; c = Acc} ; + surproduireVN2 = v_nancy82 "surproduire" ** {aux = AHabere ; c = Acc} ; + surseoirVN2 = v_nancy51 "surseoir" ** {aux = AHabere ; c = Dat} ; + surtondreVN2 = v_nancy53 "surtondre" ** {aux = AHabere ; c = Acc} ; + survenirVN = v_nancy23 "survenir" ** {aux = AEsse} ; + survivreVN2 = v_nancy76 "survivre" ** {aux = AHabere ; c = Dat} ; + suspendreVN2 = v_nancy53 "suspendre" ** {aux = AHabere ; c = Acc} ; + taireVN2 = v_nancy63 "taire" ** {aux = AHabere ; c = Acc} ; + teindreVN2 = v_nancy57 "teindre" ** {aux = AHabere ; c = Acc} ; + tendreVN2 = v_nancy53 "tendre" ** {aux = AHabere ; c = Dat} ; + tenirVN2 = v_nancy23 "tenir" ** {aux = AHabere ; c = Dat} ; + tondreVN2 = v_nancy53 "tondre" ** {aux = AHabere ; c = Acc} ; + tordreVN2 = v_nancy53 "tordre" ** {aux = AHabere ; c = Acc} ; + traduireVN2 = v_nancy82 "traduire" ** {aux = AHabere ; c = Acc} ; + traireVN2 = v_nancy61 "traire" ** {aux = AHabere ; c = Acc} ; + transcrireVN2 = v_nancy80 "transcrire" ** {aux = AHabere ; c = Acc} ; + transmettreVN2 = v_nancy56 "transmettre" ** {aux = AHabere ; c = Acc} ; + transparaîtreVN = v_nancy64 "transparaître" ** {aux = AHabere} ; + tréfondreVN2 = v_nancy53 "tréfondre" ** {aux = AHabere ; c = Acc} ; + tressaillirVN = v_nancy29 "tressaillir" ** {aux = AHabere} ; + vaincreVN2 = v_nancy60 "vaincre" ** {aux = AHabere ; c = Acc} ; + valoirVN2 = v_nancy47 "valoir" ** {aux = AHabere ; c = Acc} ; + vendreVN2 = v_nancy53 "vendre" ** {aux = AHabere ; c = Acc} ; + venirVN = v_nancy23 "venir" ** {aux = AEsse} ; + vêtirVN2 = v_nancy26 "vêtir" ** {aux = AHabere ; c = Acc} ; + vivreVN2 = v_nancy76 "vivre" ** {aux = AHabere ; c = Acc} ; + voirVN2 = v_nancy39 "voir" ** {aux = AHabere ; c = Acc} ; + vouloirVN2 = v_nancy48 "vouloir" ** {aux = AHabere ; c = Gen} ; + +} diff --git a/lib/resource/french/VerbsFreAbs.gf b/lib/resource/french/VerbsFreAbs.gf new file mode 100644 index 000000000..94439cba7 --- /dev/null +++ b/lib/resource/french/VerbsFreAbs.gf @@ -0,0 +1,395 @@ +--# -path=.:../romance:../abstract:../../prelude + +-- Irregular verbs from Nancy, based on a list from Sylvain Pogodalla, 25/11/2004 +-- Translated to GF by Aarne Ranta +-- added extracted subcat information 29/11 + +abstract VerbsFreAbs = { + +cat + VN ; + VN2 ; + +-- all verbs in classes with "er" and "ir" like "finir" are omitted + +fun + abattreVN2 : VN2 ; + absoudreVN2 : VN2 ; + abstenirVN : VN ; + abstraireVN2 : VN2 ; + accourirVN : VN ; + accroîtreVN2 : VN2 ; + accueillirVN2 : VN2 ; + acquérirVN2 : VN2 ; + adjoindreVN2 : VN2 ; + admettreVN2 : VN2 ; + advenirVN : VN ; + allerVN : VN ; + apercevoirVN2 : VN2 ; + apparaîtreVN : VN ; + appartenirVN2 : VN2 ; + appendreVN2 : VN2 ; + apprendreVN2 : VN2 ; + assaillirVN2 : VN2 ; + asseoirVN2 : VN2 ; + astreindreVN2 : VN2 ; + atteindreVN2 : VN2 ; + attendreVN2 : VN2 ; + avoirVN2 : VN2 ; + battreVN2 : VN2 ; + boireVN2 : VN2 ; + bouillirVN2 : VN2 ; + braireVN : VN ; + ceindreVN2 : VN2 ; + choirVN : VN ; + circonscrireVN2 : VN2 ; + circonvenirVN2 : VN2 ; + cloreVN2 : VN2 ; + combattreVN2 : VN2 ; + commettreVN2 : VN2 ; + comparaîtreVN2 : VN2 ; + complaireVN2 : VN2 ; + comprendreVN2 : VN2 ; + compromettreVN2 : VN2 ; + concevoirVN2 : VN2 ; + conclureVN2 : VN2 ; + concourirVN2 : VN2 ; + condescendreVN2 : VN2 ; + conduireVN2 : VN2 ; + confireVN2 : VN2 ; + confondreVN2 : VN2 ; + conjoindreVN2 : VN2 ; + connaîtreVN2 : VN2 ; + conquérirVN2 : VN2 ; + consentirVN2 : VN2 ; + construireVN2 : VN2 ; + contenirVN2 : VN2 ; + contraindreVN2 : VN2 ; + contrebattreVN2 : VN2 ; + contredireVN2 : VN2 ; + contrefaireVN2 : VN2 ; + contrevenirVN2 : VN2 ; + convaincreVN2 : VN2 ; + convenirVN2 : VN2 ; + correspondreVN2 : VN2 ; + corrompreVN2 : VN2 ; + coudreVN2 : VN2 ; + courirVN2 : VN2 ; + couvrirVN2 : VN2 ; + craindreVN2 : VN2 ; + croireVN2 : VN2 ; + croîtreVN : VN ; + cueillirVN2 : VN2 ; + cuireVN2 : VN2 ; + débattreVN2 : VN2 ; + débouillirVN2 : VN2 ; + décevoirVN2 : VN2 ; + déchoirVN2 : VN2 ; + décloreVN2 : VN2 ; + décommettreVN2 : VN2 ; + déconfireVN2 : VN2 ; + découdreVN2 : VN2 ; + découvrirVN2 : VN2 ; + décrireVN2 : VN2 ; + décroîtreVN2 : VN2 ; + décuireVN2 : VN2 ; + déduireVN2 : VN2 ; + défaillirVN : VN ; + défaireVN2 : VN2 ; + défendreVN2 : VN2 ; + démentirVN2 : VN2 ; + démettreVN2 : VN2 ; + démordreVN : VN ; + départirVN2 : VN2 ; + dépeindreVN2 : VN2 ; + dépendreVN2 : VN2 ; + déplaireVN : VN ; + dépourvoirVN2 : VN2 ; + déprendreVN2 : VN2 ; + désapprendreVN2 : VN2 ; + descendreVN2 : VN2 ; + desservirVN2 : VN2 ; + déteindreVN2 : VN2 ; + détendreVN2 : VN2 ; + détenirVN2 : VN2 ; + détordreVN2 : VN2 ; + détruireVN2 : VN2 ; + devenirVN : VN ; + dévêtirVN2 : VN2 ; + devoirVN2 : VN2 ; + direVN2 : VN2 ; + disconvenirVN2 : VN2 ; + discourirVN2 : VN2 ; + disjoindreVN2 : VN2 ; + disparaîtreVN2 : VN2 ; + dissoudreVN2 : VN2 ; + distendreVN2 : VN2 ; + distordreVN2 : VN2 ; + distraireVN2 : VN2 ; + dormirVN2 : VN2 ; + ébattreVN : VN ; + échoirVN2 : VN2 ; + écloreVN2 : VN2 ; + éconduireVN2 : VN2 ; + écrireVN2 : VN2 ; + élireVN2 : VN2 ; + embatreVN2 : VN2 ; + embattreVN2 : VN2 ; + emboireVN : VN ; + émettreVN2 : VN2 ; + émoudreVN2 : VN2 ; + émouvoirVN2 : VN2 ; + empreindreVN2 : VN2 ; + enceindreVN2 : VN2 ; + encloreVN2 : VN2 ; + encourirVN2 : VN2 ; + endormirVN2 : VN2 ; + enduireVN2 : VN2 ; + enfreindreVN2 : VN2 ; + enfuirVN : VN ; + enjoindreVN2 : VN2 ; + enquérirVN : VN ; + entendreVN2 : VN2 ; + entr'apercevoirVN : VN ; + entrebattreVN : VN ; + entre_détruireVN : VN ; + entre_haïrVN : VN ; + entremettreVN : VN ; + entre_nuireVN : VN ; + entreprendreVN2 : VN2 ; + entretenirVN2 : VN2 ; + entrevoirVN2 : VN2 ; + entrouvrirVN2 : VN2 ; + envoyerVN2 : VN2 ; + épandreVN2 : VN2 ; + éperdreVN : VN ; + éprendreVN : VN ; + équivaloirVN2 : VN2 ; + éteindreVN2 : VN2 ; + étendreVN2 : VN2 ; + étreindreVN2 : VN2 ; + êtreVN : VN ; + exclureVN2 : VN2 ; + extraireVN2 : VN2 ; + faillirVN2 : VN2 ; + faireVN2 : VN2 ; + falloirVN : VN ; + feindreVN2 : VN2 ; + fendreVN2 : VN2 ; + fondreVN2 : VN2 ; + forfaireVN2 : VN2 ; + foutreVN2 : VN2 ; + frireVN2 : VN2 ; + fuirVN2 : VN2 ; + geindreVN2 : VN2 ; + gésirVN2 : VN2 ; + haïrVN2 : VN2 ; + inclureVN2 : VN2 ; + induireVN2 : VN2 ; + inscrireVN2 : VN2 ; + instruireVN2 : VN2 ; + interdireVN2 : VN2 ; + interrompreVN2 : VN2 ; + intervenirVN : VN ; + introduireVN2 : VN2 ; + joindreVN2 : VN2 ; + lireVN2 : VN2 ; + luireVN : VN ; + mainmettreVN2 : VN2 ; + maintenirVN2 : VN2 ; + méconnaîtreVN2 : VN2 ; + mécroireVN2 : VN2 ; + médireVN2 : VN2 ; + mentirVN2 : VN2 ; + méprendreVN2 : VN2 ; + messeoirVN2 : VN2 ; + mettreVN2 : VN2 ; + mévendreVN2 : VN2 ; + mordreVN2 : VN2 ; + morfondreVN : VN ; + moudreVN2 : VN2 ; + mourirVN : VN ; + mouvoirVN2 : VN2 ; + naîtreVN : VN ; + nuireVN2 : VN2 ; + obtenirVN2 : VN2 ; + obvenirVN : VN ; + occlureVN2 : VN2 ; + offrirVN2 : VN2 ; + oindreVN2 : VN2 ; + omettreVN2 : VN2 ; + ouïrVN2 : VN2 ; + ouvrirVN2 : VN2 ; + paîtreVN2 : VN2 ; + paîtreVN : VN ; + paraîtreVN : VN ; + parcourirVN2 : VN2 ; + parfondreVN2 : VN2 ; + partirVN : VN ; + parvenirVN : VN ; + peindreVN2 : VN2 ; + pendreVN2 : VN2 ; + percevoirVN2 : VN2 ; + perdreVN2 : VN2 ; + permettreVN2 : VN2 ; + plaindreVN2 : VN2 ; + plaireVN2 : VN2 ; + pleuvoirVN : VN ; + poindreVN2 : VN2 ; + pondreVN2 : VN2 ; + pourfendreVN2 : VN2 ; + poursuivreVN2 : VN2 ; + pourvoirVN2 : VN2 ; + pouvoirVN : VN ; + prédireVN2 : VN2 ; + prendreVN2 : VN2 ; + prescrireVN2 : VN2 ; + pressentirVN2 : VN2 ; + prétendreVN2 : VN2 ; + prévaloirVN2 : VN2 ; + prévenirVN2 : VN2 ; + prévoirVN2 : VN2 ; + produireVN2 : VN2 ; + promettreVN2 : VN2 ; + promouvoirVN2 : VN2 ; + proscrireVN2 : VN2 ; + provenirVN : VN ; + rabattreVN2 : VN2 ; + raireVN2 : VN2 ; + rapprendreVN2 : VN2 ; + rasseoirVN2 : VN2 ; + réadmettreVN2 : VN2 ; + réapparaîtreVN : VN ; + réapprendreVN2 : VN2 ; + rebattreVN2 : VN2 ; + recevoirVN2 : VN2 ; + recomparaîtreVN2 : VN2 ; + reconduireVN2 : VN2 ; + reconnaîtreVN2 : VN2 ; + reconquérirVN2 : VN2 ; + reconstruireVN2 : VN2 ; + recoudreVN2 : VN2 ; + recourirVN2 : VN2 ; + recouvrirVN2 : VN2 ; + récrireVN2 : VN2 ; + recroîtreVN2 : VN2 ; + recueillirVN2 : VN2 ; + recuireVN2 : VN2 ; + redécouvrirVN2 : VN2 ; + redéfaireVN2 : VN2 ; + redescendreVN2 : VN2 ; + redevenirVN : VN ; + redevoirVN2 : VN2 ; + redireVN2 : VN2 ; + réduireVN2 : VN2 ; + réécrireVN2 : VN2 ; + réélireVN2 : VN2 ; + réentendreVN2 : VN2 ; + refaireVN2 : VN2 ; + refendreVN2 : VN2 ; + refondreVN2 : VN2 ; + réinscrireVN2 : VN2 ; + réintroduireVN2 : VN2 ; + rejoindreVN2 : VN2 ; + relireVN2 : VN2 ; + reluireVN2 : VN2 ; + remettreVN2 : VN2 ; + remordreVN2 : VN2 ; + remoudreVN2 : VN2 ; + renaîtreVN2 : VN2 ; + rendormirVN2 : VN2 ; + rendreVN2 : VN2 ; + rentraireVN2 : VN2 ; + rentrouvrirVN2 : VN2 ; + renvoyerVN2 : VN2 ; + repaîtreVN2 : VN2 ; + répandreVN2 : VN2 ; + reparaîtreVN : VN ; + repartirVN : VN ; + repeindreVN2 : VN2 ; + rependreVN2 : VN2 ; + repentirVN : VN ; + reperdreVN2 : VN2 ; + repleuvoirVN : VN ; + répondreVN2 : VN2 ; + reprendreVN2 : VN2 ; + reproduireVN2 : VN2 ; + requérirVN2 : VN2 ; + résoudreVN2 : VN2 ; + ressentirVN2 : VN2 ; + resservirVN2 : VN2 ; + ressortirVN : VN ; + ressouvenirVN : VN ; + restreindreVN2 : VN2 ; + reteindreVN2 : VN2 ; + retendreVN2 : VN2 ; + retenirVN2 : VN2 ; + retondreVN2 : VN2 ; + retordreVN2 : VN2 ; + retraduireVN2 : VN2 ; + retraireVN2 : VN2 ; + retranscrireVN2 : VN2 ; + retransmettreVN2 : VN2 ; + rétreindreVN2 : VN2 ; + revaloirVN2 : VN2 ; + revendreVN2 : VN2 ; + revenirVN : VN ; + revêtirVN2 : VN2 ; + revivreVN2 : VN2 ; + revoirVN2 : VN2 ; + revouloirVN2 : VN2 ; + rireVN2 : VN2 ; + rompreVN2 : VN2 ; + rouvrirVN2 : VN2 ; + saillirVN2 : VN2 ; + satisfaireVN2 : VN2 ; + savoirVN2 : VN2 ; + secourirVN2 : VN2 ; + séduireVN2 : VN2 ; + sentirVN2 : VN2 ; + seoirVN : VN ; + servirVN2 : VN2 ; + sortirVN : VN ; + soubattreVN2 : VN2 ; + souffrirVN2 : VN2 ; + soumettreVN2 : VN2 ; + sourireVN2 : VN2 ; + souscrireVN2 : VN2 ; + sous_entendreVN2 : VN2 ; + sous_tendreVN2 : VN2 ; + soustraireVN2 : VN2 ; + soutenirVN2 : VN2 ; + souvenirVN : VN ; + subvenirVN2 : VN2 ; + suffireVN2 : VN2 ; + suivreVN2 : VN2 ; + surfaireVN2 : VN2 ; + surprendreVN2 : VN2 ; + surproduireVN2 : VN2 ; + surseoirVN2 : VN2 ; + surtondreVN2 : VN2 ; + survenirVN : VN ; + survivreVN2 : VN2 ; + suspendreVN2 : VN2 ; + taireVN2 : VN2 ; + teindreVN2 : VN2 ; + tendreVN2 : VN2 ; + tenirVN2 : VN2 ; + tondreVN2 : VN2 ; + tordreVN2 : VN2 ; + traduireVN2 : VN2 ; + traireVN2 : VN2 ; + transcrireVN2 : VN2 ; + transmettreVN2 : VN2 ; + transparaîtreVN : VN ; + tréfondreVN2 : VN2 ; + tressaillirVN : VN ; + vaincreVN2 : VN2 ; + valoirVN2 : VN2 ; + vendreVN2 : VN2 ; + venirVN : VN ; + vêtirVN2 : VN2 ; + vivreVN2 : VN2 ; + voirVN2 : VN2 ; + vouloirVN2 : VN2 ; +} diff --git a/lib/resource/scandinavian/ClauseScand.gf b/lib/resource/scandinavian/ClauseScand.gf index 8966fe6ae..6000c418f 100644 --- a/lib/resource/scandinavian/ClauseScand.gf +++ b/lib/resource/scandinavian/ClauseScand.gf @@ -3,6 +3,8 @@ incomplete concrete ClauseScand of Clause = CategoriesScand ** open Prelude, SyntaxScand in { + flags optimize=all ; + lin SPredV np v = predVerbGroupClause np (predVerb v) ; SPredPassV np v = predVerbGroupClause np (passVerb v) ; diff --git a/lib/resource/scandinavian/RulesScand.gf b/lib/resource/scandinavian/RulesScand.gf index c1e4467b5..5ec458826 100644 --- a/lib/resource/scandinavian/RulesScand.gf +++ b/lib/resource/scandinavian/RulesScand.gf @@ -3,6 +3,8 @@ incomplete concrete RulesScand of Rules = CategoriesScand ** open Prelude, SyntaxScand in { +flags optimize=all ; + lin UseN = noun2CommNounPhrase ; UsePN = nameNounPhrase ; diff --git a/lib/resource/scandinavian/SyntaxScand.gf b/lib/resource/scandinavian/SyntaxScand.gf index 608b1d717..4ba7428b9 100644 --- a/lib/resource/scandinavian/SyntaxScand.gf +++ b/lib/resource/scandinavian/SyntaxScand.gf @@ -9,6 +9,8 @@ interface SyntaxScand = TypesScand ** open Prelude, (CO = Coordination) in { +flags optimize=share ; + --2 Common Nouns -- --3 Simple common nouns diff --git a/src/GF/Compile/Extend.hs b/src/GF/Compile/Extend.hs index 3f2570570..7f01db3a6 100644 --- a/src/GF/Compile/Extend.hs +++ b/src/GF/Compile/Extend.hs @@ -107,8 +107,8 @@ extendAnyInfo isc n o i j = testErr (b1 == b2) "inconsistent indirection status" ---- commented out as work-around for a spurious problem in ---- TestResourceFre; should look at building of completion. 17/11/2004 ----- testErr (m1 == m2) $ ----- "different sources of indirection: " +++ show m1 +++ show m2 + testErr (m1 == m2) $ + "different sources of indirection: " +++ show m1 +++ show m2 return i _ -> Bad $ "cannot unify information in" ++++ show i ++++ "and" ++++ show j