From 0796338380256583a4f3fc82921278bd5f04dd12 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 4 Feb 2005 19:17:57 +0000 Subject: [PATCH] resources and new instantiation syntax --- lib/resource/abstract/Basic.gf | 19 +- lib/resource/abstract/Clause.gf | 5 + lib/resource/abstract/Rules.gf | 3 +- lib/resource/danish/MorphoDan.gf | 10 +- lib/resource/danish/RulesDan.gf | 2 +- lib/resource/danish/SyntaxDan.gf | 16 - lib/resource/danish/TestResourceDan.gf | 2 +- lib/resource/danish/TypesDan.gf | 10 - lib/resource/english/BasicEng.gf | 24 +- lib/resource/english/ClauseEng.gf | 9 +- lib/resource/english/RulesEng.gf | 4 +- lib/resource/english/SyntaxEng.gf | 80 +- lib/resource/french/RulesFre.gf | 2 +- lib/resource/french/TestResourceFre.gf | 2 +- lib/resource/italian/RulesIta.gf | 2 +- lib/resource/italian/TestResourceIta.gf | 2 +- lib/resource/norwegian/MorphoNor.gf | 10 +- lib/resource/norwegian/SyntaxNor.gf | 15 - lib/resource/norwegian/TypesNor.gf | 9 - lib/resource/scandinavian/CategoriesScand.gf | 3 +- lib/resource/scandinavian/ClauseScand.gf | 5 + lib/resource/scandinavian/RulesScand.gf | 4 +- lib/resource/scandinavian/SyntaxScand.gf | 119 ++- lib/resource/scandinavian/TypesScand.gf | 13 +- lib/resource/spanish/RulesSpa.gf | 2 +- lib/resource/spanish/TestResourceSpa.gf | 2 +- lib/resource/swedish/BasicSwe.gf | 222 +++++ lib/resource/swedish/ClauseSwe.gf | 3 +- lib/resource/swedish/MorphoSwe.gf | 594 ++++++------ lib/resource/swedish/NewParadigmsSwe.gf | 348 +++++++ lib/resource/swedish/RulesSwe.gf | 2 +- lib/resource/swedish/SyntaxSwe.gf | 25 +- lib/resource/swedish/TestResourceSwe.gf | 8 +- lib/resource/swedish/TypesSwe.gf | 10 - src/GF/Compile/Compile.hs | 26 +- src/GF/Compile/Extend.hs | 25 +- src/GF/Compile/Rebuild.hs | 8 +- src/GF/Data/Operations.hs | 11 +- src/GF/Infra/Modules.hs | 2 +- src/GF/Infra/ReadFiles.hs | 12 +- src/GF/Source/AbsGF.hs | 5 +- src/GF/Source/GF.cf | 7 +- src/GF/Source/GrammarToSource.hs | 4 +- src/GF/Source/LexGF.hs | 22 +- src/GF/Source/LexGF.x | 22 +- src/GF/Source/ParGF.hs | 947 ++++++++++--------- src/GF/Source/PrintGF.hs | 5 +- src/GF/Source/SourceToGrammar.hs | 23 +- 48 files changed, 1699 insertions(+), 1006 deletions(-) create mode 100644 lib/resource/swedish/BasicSwe.gf create mode 100644 lib/resource/swedish/NewParadigmsSwe.gf diff --git a/lib/resource/abstract/Basic.gf b/lib/resource/abstract/Basic.gf index 3490ee97e..a2c3ed3db 100644 --- a/lib/resource/abstract/Basic.gf +++ b/lib/resource/abstract/Basic.gf @@ -26,7 +26,7 @@ abstract Basic = Categories ** { bread_N : N ; break_V2 : V2 ; broad_ADeg : ADeg ; - brother_N : N ; + brother_N2 : N2 ; brown_ADeg : ADeg ; butter_N : N ; buy_V2 : V2 ; @@ -61,7 +61,7 @@ abstract Basic = Categories ** { eat_V2 : V2 ; enemy_N : N ; factory_N : N ; - father_N : N ; + father_N2 : N2 ; fear_VS : VS ; find_V2 : V2 ; fish_N : N ; @@ -110,7 +110,7 @@ abstract Basic = Categories ** { meat_N : N ; milk_N : N ; moon_N : N ; - mother_N : N ; + mother_N2 : N2 ; mountain_N : N ; music_N : N ; narrow_ADeg : ADeg ; @@ -181,7 +181,7 @@ abstract Basic = Categories ** { train_N : N ; travel_V : V ; tree_N : N ; - trousers_N : N ; +---- trousers_N : N ; ugly_ADeg : ADeg ; understand_V2 : V2 ; university_N : N ; @@ -202,4 +202,15 @@ abstract Basic = Categories ** { write_V2 : V2 ; yellow_ADeg : ADeg ; young_ADeg : ADeg ; + + do_V2 : V2 ; + now_Adv : Adv ; + already_Adv : Adv ; + song_N : N ; + add_V3 : V3 ; + number_N : N ; + put_V2 : V2 ; + stop_V : V ; + jump_V : V ; + } diff --git a/lib/resource/abstract/Clause.gf b/lib/resource/abstract/Clause.gf index 3645a8889..f8909b81d 100644 --- a/lib/resource/abstract/Clause.gf +++ b/lib/resource/abstract/Clause.gf @@ -56,6 +56,11 @@ fun QPredObjA2V : IP -> A2V -> NP ->VPI ->QCl ; -- "who is easy for us to convince" + IPredV : Ant -> V -> VPI ; -- "walk" + IPredV2 : Ant -> V2 -> NP -> VPI ; -- "see Mary" + IPredAP : Ant -> AP -> VPI ; -- "be old" + + {- -- These rules *use* verb phrases. diff --git a/lib/resource/abstract/Rules.gf b/lib/resource/abstract/Rules.gf index 6f1a0f49f..db06af88b 100644 --- a/lib/resource/abstract/Rules.gf +++ b/lib/resource/abstract/Rules.gf @@ -136,6 +136,8 @@ fun IntSlash : IP -> Slash -> QCl ; -- "whom does John see" QuestAdv : IAdv -> Cl -> QCl ; -- "why do you walk" + PosImpVP, NegImpVP : VPI -> Imp ; -- "(don't) be a man" + ----rename these ?? IndicPhrase : S -> Phr ; -- "I walk." QuestPhrase : QS -> Phr ; -- "Do I walk?" @@ -213,7 +215,6 @@ fun --- The type signatures of these ones should be changed from VP to VPI. ProgVG : VP -> VP ; -- he is eating - PosImperVP, NegImperVP : VP -> Imp ; -- "(don't) be a man" OneVP : VP -> Cl ; -- "one walks" } ; diff --git a/lib/resource/danish/MorphoDan.gf b/lib/resource/danish/MorphoDan.gf index f7509e068..bc6c8884b 100644 --- a/lib/resource/danish/MorphoDan.gf +++ b/lib/resource/danish/MorphoDan.gf @@ -72,12 +72,12 @@ oper mkVerb : (_,_,_,_,_,_ : Str) -> Verbum = \spise,spiser,spises,spiste,spist,spis -> {s = table { VI (Inf v) => mkVoice v spise ; - VF (Pres m Act) => spiser ; - VF (Pres m Pass) => spises ; - VF (Pret m v) => mkVoice v spiste ; + VF (Pres Act) => spiser ; + VF (Pres Pass) => spises ; + VF (Pret v) => mkVoice v spiste ; VI (Supin v) => mkVoice v spist ; - VI (PtPret c) => mkCase spist ! c ; - VF Imper => spis + VI (PtPret _ c) => mkCase spist ! c ; ---- GenNum + VF (Imper v) => mkVoice v spis } } ; diff --git a/lib/resource/danish/RulesDan.gf b/lib/resource/danish/RulesDan.gf index fbde9d760..7fffac93f 100644 --- a/lib/resource/danish/RulesDan.gf +++ b/lib/resource/danish/RulesDan.gf @@ -1,4 +1,4 @@ --# -path=.:../scandinavian:../abstract:../../prelude -concrete RulesDan of Rules = +concrete RulesDan of Rules = CategoriesDan ** RulesScand with (SyntaxScand=SyntaxDan) ; diff --git a/lib/resource/danish/SyntaxDan.gf b/lib/resource/danish/SyntaxDan.gf index dfd0abd10..07c7f58b6 100644 --- a/lib/resource/danish/SyntaxDan.gf +++ b/lib/resource/danish/SyntaxDan.gf @@ -14,7 +14,6 @@ instance SyntaxDan of SyntaxScand = TypesDan ** npMan : NounPhrase = nameNounPhrase (mkProperName "man" NUtr) ; npDet : NounPhrase = nameNounPhrase (mkProperName "det" NNeutr) ; - mkAdjForm : Species -> Number -> NounGender -> AdjFormPos = \b,n,g -> case of { => Strong (ASg (genNoun g)) ; @@ -22,17 +21,6 @@ instance SyntaxDan of SyntaxScand = TypesDan ** => Weak } ; - deponentVerb : Verb -> Verb = \finna -> { - s = table { - VF (Pres m _) => finna.s ! VF (Pres m Pass) ; - VF (Pret m _) => finna.s ! VF (Pret m Pass) ; - VI (Inf _) => finna.s ! VI (Inf Pass) ; - VI (Supin _) => finna.s ! VI (Supin Pass) ; - v => finna.s ! v --- Imper ! - } ; - s1 = finna.s1 - } ; - verbFinnas : Verb = deponentVerb (mkVerb "finde" "finder" "findes" "fandt" "fundet" "find" ** {s1 = []}) ; verbVara = mkVerb "være" "er" nonExist "var" "været" "vær" ** {s1 = []} ; @@ -112,10 +100,6 @@ instance SyntaxDan of SyntaxScand = TypesDan ** mkDeterminerSgGender3 : Str -> Str -> Str -> SpeciesP -> Determiner = \en,_,ett -> mkDeterminerSgGender (table {Utr => en ; Neutr => ett}) ; - adjPastPart : Verb -> Adjective = \verb -> { - s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret c) ---- af - } ; - reflPron : Number -> Person -> Str = \n,p -> case of { => "mig" ; => "dig" ; diff --git a/lib/resource/danish/TestResourceDan.gf b/lib/resource/danish/TestResourceDan.gf index 9478b7228..83432c57c 100644 --- a/lib/resource/danish/TestResourceDan.gf +++ b/lib/resource/danish/TestResourceDan.gf @@ -1,6 +1,6 @@ --# -path=.:../scandinavian:../abstract:../../prelude -concrete TestResourceDan of TestResource = RulesDan, StructuralDan ** +concrete TestResourceDan of TestResource = RulesDan, ClauseDan, StructuralDan ** open Prelude, MorphoDan, SyntaxDan in { flags startcat=Phr ; lexer=text ; unlexer=text ; diff --git a/lib/resource/danish/TypesDan.gf b/lib/resource/danish/TypesDan.gf index afc10cf34..7271f6da0 100644 --- a/lib/resource/danish/TypesDan.gf +++ b/lib/resource/danish/TypesDan.gf @@ -23,14 +23,4 @@ oper param AdjFormPos = Strong GenNum | Weak ; - VFin = - Pres Mode Voice - | Pret Mode Voice - | Imper ; --- no passive - - VInf = - Inf Voice - | Supin Voice - | PtPret Case ; ---- number and gender - } diff --git a/lib/resource/english/BasicEng.gf b/lib/resource/english/BasicEng.gf index ced06178d..f55081b18 100644 --- a/lib/resource/english/BasicEng.gf +++ b/lib/resource/english/BasicEng.gf @@ -31,7 +31,7 @@ lin bread_N = regN "bread" ; break_V2 = dirV2 (irregV "break" "broke" "broken") ; broad_ADeg = regADeg "broad" ; - brother_N = regN "brother" ; + brother_N2 = regN2 "brother" ; brown_ADeg = regADeg "brown" ; butter_N = regN "butter" ; buy_V2 = dirV2 (irregV "buy" "bought" "bought") ; @@ -66,7 +66,7 @@ lin eat_V2 = dirV2 (irregV "eat" "ate" "eaten") ; enemy_N = regN "enemy" ; factory_N = regN "factory" ; - father_N = regN "father" ; + father_N2 = regN2 "father" ; fear_VS = mkVS (regV "fear") ; find_V2 = dirV2 (irregV "find" "found" "found") ; fish_N = mk2N "fish" "fish" ; @@ -80,7 +80,7 @@ lin girl_N = regN "girl" ; glove_N = regN "glove" ; gold_N = regN "gold" ; - good_ADeg = regADeg "good" ; + good_ADeg = mkADeg "good" "better" "best" "well" ; go_V = (mkV "go" "goes" "went" "gone" "going") ; green_ADeg = regADeg "green" ; harbour_N = regN "harbour" ; @@ -93,7 +93,7 @@ lin horse_N = regN "horse" ; hot_ADeg = regADeg "hot" ; house_N = regN "house" ; - important_ADeg = regADeg "important" ; + important_ADeg = compoundADeg (regA "important") ; industry_N = regN "industry" ; iron_N = regN "iron" ; king_N = regN "king" ; @@ -115,7 +115,7 @@ lin meat_N = regN "meat" ; milk_N = regN "milk" ; moon_N = regN "moon" ; - mother_N = regN "mother" ; + mother_N2 = regN2 "mother" ; mountain_N = regN "mountain" ; music_N = regN "music" ; narrow_ADeg = regADeg "narrow" ; @@ -186,12 +186,12 @@ lin train_N = regN "train" ; travel_V = (regDuplV "travel") ; tree_N = regN "tree" ; - trousers_N = regN "trousers" ; + ---- trousers_N = regN "trousers" ; ugly_ADeg = regADeg "ugly" ; understand_V2 = dirV2 (irregV "understand" "understood" "understood") ; university_N = regN "university" ; village_N = regN "village" ; - wait_V2 = dirV2 (regV "wait") ; + wait_V2 = mkV2 (regV "wait") "for" ; walk_V = (regV "walk") ; warm_ADeg = regADeg "warm" ; war_N = regN "war" ; @@ -207,4 +207,14 @@ lin write_V2 = dirV2 (irregV "write" "wrote" "written") ; yellow_ADeg = regADeg "yellow" ; young_ADeg = regADeg "young" ; + + do_V2 = dirV2 (mkV "do" "does" "did" "done" "doing") ; + now_Adv = mkAdv "now" ; + already_Adv = mkAdv "already" ; + song_N = regN "song" ; + add_V3 = dirV3 (regV "add") "to" ; + number_N = regN "number" ; + put_V2 = mkV2 (irregDuplV "put" "put" "put") [] ; + stop_V = regV "stop" ; + jump_V = regV "jump" ; } ; diff --git a/lib/resource/english/ClauseEng.gf b/lib/resource/english/ClauseEng.gf index 139cb06bf..d15bcc729 100644 --- a/lib/resource/english/ClauseEng.gf +++ b/lib/resource/english/ClauseEng.gf @@ -20,7 +20,8 @@ concrete ClauseEng of Clause = CategoriesEng ** SPredV2S np v x y = predVerbGroupClause np (complDitransSentVerb v x y) ; SPredV2Q np v x y = predVerbGroupClause np (complDitransQuestVerb v x y) ; - SPredAP np v = predVerbGroupClause np (predAdjective v) ; + SPredAP np v = predBeGroup np (\\_ => v.s ! AAdj) ; +-- SPredAP np v = predVerbGroupClause np (predAdjective v) ; SPredSuperl np a = predVerbGroupClause np (predAdjective (superlAdjPhrase a)) ; SPredCN np v = predVerbGroupClause np (predCommNoun v) ; SPredNP np v = predVerbGroupClause np (predNounPhrase v) ; @@ -28,7 +29,6 @@ concrete ClauseEng of Clause = CategoriesEng ** SPredAV np v x = predVerbGroupClause np (complVerbAdj v x) ; SPredObjA2V np v x y = predVerbGroupClause np (complVerbAdj2 True v x y) ; - QPredV np v = intVerbPhrase np (predVerb v) ; QPredPassV np v = intVerbPhrase np (passVerb v) ; QPredV2 np v x = intVerbPhrase np (complTransVerb v x) ; @@ -53,6 +53,11 @@ concrete ClauseEng of Clause = CategoriesEng ** QPredAV np v x = intVerbPhrase np (complVerbAdj v x) ; QPredObjA2V np v x y = intVerbPhrase np (complVerbAdj2 True v x y) ; + IPredV a v = predVerbGroupI True a (predVerb v) ; + IPredV2 a v x = predVerbGroupI True a (complTransVerb v x) ; +---- SPredAP np v = predBeGroup np (\\_ => v.s ! AAdj) ; + IPredAP a v = predVerbGroupI True a (predAdjective v) ; + {- -- Use VPs diff --git a/lib/resource/english/RulesEng.gf b/lib/resource/english/RulesEng.gf index 237f44829..9ae7595f1 100644 --- a/lib/resource/english/RulesEng.gf +++ b/lib/resource/english/RulesEng.gf @@ -142,8 +142,8 @@ lin IntSlash = intSlash ; QuestAdv = questAdverbial ; - PosImperVP = imperVerbPhrase True ; - NegImperVP = imperVerbPhrase False ; + PosImpVP = imperVerbPhrase True ; + NegImpVP = imperVerbPhrase False ; IndicPhrase = indicUtt ; QuestPhrase = interrogUtt ; diff --git a/lib/resource/english/SyntaxEng.gf b/lib/resource/english/SyntaxEng.gf index d88b36e68..f2bf4aed1 100644 --- a/lib/resource/english/SyntaxEng.gf +++ b/lib/resource/english/SyntaxEng.gf @@ -393,6 +393,22 @@ oper } in negAux b has ; + auxBe : Bool -> Tense -> Agr -> Str = \b,t,a -> + let is = + case t of { + Present => case a of { + ASgP3 _ => "is" ; + ASgP1 => "am" ; + _ => "are" + } ; + Past => case a of { + ASgP3 _ => "was" ; + _ => "were" + } ; + _ => "be" --- never used + } + in negAux b is ; ---- amn't + auxTense : Bool -> Tense -> Agr -> Str = \b,t,a -> case t of { Present => negAux b (case a of { @@ -451,6 +467,13 @@ oper s1 = if_then_Str b [] "not" } ; + predVerbGroupI : Bool -> {s : Str ; a : Anteriority} -> VerbGroup -> VerbPhrase = + \b,ant,vg -> + let vp = predVerbGroup b ant.a vg in + {s = \\a => ant.s ++ vp.s ! a ; + s1 = vp.s1 + } ; + -- A simple verb can be made into a verb phrase with an empty complement. -- There are two versions, depending on if we want to negate the verb. -- N.B. negation is *not* a function applicable to a verb phrase, since @@ -476,11 +499,58 @@ oper predAdverb : PrepPhrase -> VerbGroup = \elsewhere -> beGroup (\\_ => elsewhere.s) ; +{- --- compiles to 25k lines gfr 3/2/2005 predAdjSent : Adjective -> Sentence -> Clause = \bra,hansover -> predVerbGroupClause (pronNounPhrase pronIt) (beGroup ( \\n => bra.s ! AAdj ++ "that" ++ hansover.s)) ; +-} + + predAdjSent : Adjective -> Sentence -> Clause = \bra,hansover -> + predBeGroup (pronNounPhrase pronIt) (\\n => bra.s ! AAdj ++ "that" ++ hansover.s) ; + + predBeGroup : NounPhrase -> (Agr => Str) -> Clause = \itt,goo -> + let + it = itt.s ! NomP ; + good = goo ! itt.a ; + begood : Tense -> Str = \t -> case t of { + Present => good ; + Past => good ; + _ => "be" ++ good + } ; + beengood : Tense -> Str = \t -> case t of { + Future => "have" ++ "been" ++ good ; + Conditional => "have" ++ "been" ++ good ; + _ => "been" ++ good + } ; + has : Bool -> Tense -> Str = \b,t -> case t of { + Future => if_then_Str b "will" "won't" ; + Conditional => negAux b "would" ; + _ => auxHave b t itt.a + } ; + is : Bool -> Tense -> Str = \b,t -> case t of { + Future => if_then_Str b "will" "won't" ; + Conditional => negAux b "would" ; + _ => auxBe b t itt.a + } + in + {s = \\o,b,sf => + case sf of { + VFinite t Simul => case o of { + Dir => it ++ is b t ++ begood t ; + Inv => is b t ++ it ++ begood t + } ; + VFinite t Anter => case o of { + Dir => it ++ has b t ++ beengood t ; + Inv => has b t ++ it ++ beengood t + } ; + VInfinit Simul => it ++ begood Future ; + VInfinit Anter => it ++ beengood Future ; + VPresPart => it ++ "being" ++ good + } + } ; + predAdjSent2 : AdjCompl -> NounPhrase -> Adjective = \bra,han -> {s = \\af => bra.s ! af ++ bra.s2 ++ han.s ! AccP} ; @@ -652,6 +722,7 @@ oper param Order = Dir | Inv ; + ---- compiles to 4k lines gfr. also relSlash, relVerbPhrase are bad oper predVerbGroupClause : NounPhrase -> VerbGroup -> Clause = \yo,dosleep -> { @@ -1050,10 +1121,13 @@ oper Imperative = SS1 Number ; - imperVerbPhrase : Bool -> VerbGroup -> Imperative = \b,walk -> + imperVerbPhrase : Bool -> VerbPhrase -> Imperative = \b,walk -> {s = \\n => - let a = toAgr n P2 human in - walk.s ! b ! VInfinit Simul ! a ++ walk.s2 ! b ! VInfinit Simul ! a + let + a = toAgr n P2 human ; + dont = if_then_Str b [] "don't" + in + dont ++ walk.s ! a } ; imperUtterance : Number -> Imperative -> Utterance = \n,I -> diff --git a/lib/resource/french/RulesFre.gf b/lib/resource/french/RulesFre.gf index 4062e6c2e..b0f983bd4 100644 --- a/lib/resource/french/RulesFre.gf +++ b/lib/resource/french/RulesFre.gf @@ -1,4 +1,4 @@ --# -path=.:../romance:../abstract:../../prelude -concrete RulesFre of Rules = +concrete RulesFre of Rules = CategoriesFre ** RulesRomance with (SyntaxRomance=SyntaxFre) ; diff --git a/lib/resource/french/TestResourceFre.gf b/lib/resource/french/TestResourceFre.gf index a91310c4a..caa75d88a 100644 --- a/lib/resource/french/TestResourceFre.gf +++ b/lib/resource/french/TestResourceFre.gf @@ -1,4 +1,4 @@ ---# -path=.:../romance:../abstract:../../prelude +--# -path=.:../romance:../oldabstract:../abstract:../../prelude concrete TestResourceFre of TestResource = RulesFre, StructuralFre ** open Prelude, TypesFre, MorphoFre, SyntaxFre in { diff --git a/lib/resource/italian/RulesIta.gf b/lib/resource/italian/RulesIta.gf index f357ccab6..e1ebe36f3 100644 --- a/lib/resource/italian/RulesIta.gf +++ b/lib/resource/italian/RulesIta.gf @@ -1,4 +1,4 @@ --# -path=.:../romance:../abstract:../../prelude -concrete RulesIta of Rules = +concrete RulesIta of Rules = CategoriesIta ** RulesRomance with (SyntaxRomance=SyntaxIta) ; diff --git a/lib/resource/italian/TestResourceIta.gf b/lib/resource/italian/TestResourceIta.gf index 7b214eff3..6997c0961 100644 --- a/lib/resource/italian/TestResourceIta.gf +++ b/lib/resource/italian/TestResourceIta.gf @@ -1,4 +1,4 @@ ---# -path=.:../romance:../abstract:../../prelude +--# -path=.:../romance:../oldabstract:../abstract:../../prelude concrete TestResourceIta of TestResource = RulesIta, StructuralIta ** open Prelude, TypesIta, MorphoIta, SyntaxIta in { diff --git a/lib/resource/norwegian/MorphoNor.gf b/lib/resource/norwegian/MorphoNor.gf index 0a96be878..2d606b2c8 100644 --- a/lib/resource/norwegian/MorphoNor.gf +++ b/lib/resource/norwegian/MorphoNor.gf @@ -79,12 +79,12 @@ oper mkVerb : (_,_,_,_,_,_ : Str) -> Verbum = \spise,spiser,spises,spiste,spist,spis -> {s = table { VI (Inf v) => mkVoice v spise ; - VF (Pres m Act) => spiser ; - VF (Pres m Pass) => spises ; - VF (Pret m v) => mkVoice v spiste ; + VF (Pres Act) => spiser ; + VF (Pres Pass) => spises ; + VF (Pret v) => mkVoice v spiste ; VI (Supin v) => mkVoice v spist ; - VI (PtPret c) => mkCase spist ! c ; - VF Imper => spis + VI (PtPret _ c) => mkCase spist ! c ; ---- GenNum + VF (Imper v) => mkVoice v spis } } ; diff --git a/lib/resource/norwegian/SyntaxNor.gf b/lib/resource/norwegian/SyntaxNor.gf index 68cf9dc18..0b9ded984 100644 --- a/lib/resource/norwegian/SyntaxNor.gf +++ b/lib/resource/norwegian/SyntaxNor.gf @@ -22,17 +22,6 @@ instance SyntaxNor of SyntaxScand = TypesNor ** => Weak } ; - deponentVerb : Verb -> Verb = \finna -> { - s = table { - VF (Pres m _) => finna.s ! VF (Pres m Pass) ; - VF (Pret m _) => finna.s ! VF (Pret m Pass) ; - VI (Inf _) => finna.s ! VI (Inf Pass) ; - VI (Supin _) => finna.s ! VI (Supin Pass) ; - v => finna.s ! v --- Imper ! - } ; - s1 = finna.s1 - } ; - verbFinnas : Verb = deponentVerb (mkVerb "finne" "finner" "finnes" "fant" "funnet" "finn" ** {s1 = []}) ; verbVara = mkVerb "være" "er" nonExist "var" "vært" "vær" ** {s1 = []} ; @@ -112,10 +101,6 @@ instance SyntaxNor of SyntaxScand = TypesNor ** mkDeterminerSgGender3 : Str -> Str -> Str -> SpeciesP -> Determiner = \en,ei,ett -> mkDeterminerSgGender (table {Utr Masc => en ; Utr NoMasc => ei ; Neutr => ett}) ; - adjPastPart : Verb -> Adjective = \verb -> { - s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret c) ---- af - } ; - reflPron : Number -> Person -> Str = \n,p -> case of { => "meg" ; => "deg" ; diff --git a/lib/resource/norwegian/TypesNor.gf b/lib/resource/norwegian/TypesNor.gf index 9a7c551b2..d958063c2 100644 --- a/lib/resource/norwegian/TypesNor.gf +++ b/lib/resource/norwegian/TypesNor.gf @@ -25,14 +25,5 @@ oper param AdjFormPos = Strong GenNum | Weak ; - VFin = - Pres Mode Voice - | Pret Mode Voice - | Imper ; --- no passive - - VInf = - Inf Voice - | Supin Voice - | PtPret Case ; ---- number and gender } diff --git a/lib/resource/scandinavian/CategoriesScand.gf b/lib/resource/scandinavian/CategoriesScand.gf index 397f62102..c34f6dcff 100644 --- a/lib/resource/scandinavian/CategoriesScand.gf +++ b/lib/resource/scandinavian/CategoriesScand.gf @@ -35,8 +35,7 @@ lincat -- = {s : VerbForm => Str ; s1 : Str} ; VP = {s : SForm => Str ; s2 : Bool => Str ; s3 : SForm => Gender => Number => Person => Str} ; - VPI = {s : Str ; s2 : Str ; - s3 : Gender => Number => Person => Str} ; + VPI = {s : VIForm => Gender => Number => Person => Str} ; V2 = TransVerb ; -- = Verb ** {s2 : Preposition} ; V3 = TransVerb ** {s3 : Preposition} ; diff --git a/lib/resource/scandinavian/ClauseScand.gf b/lib/resource/scandinavian/ClauseScand.gf index 4df81faee..b290eff13 100644 --- a/lib/resource/scandinavian/ClauseScand.gf +++ b/lib/resource/scandinavian/ClauseScand.gf @@ -53,6 +53,11 @@ incomplete concrete ClauseScand of Clause = CategoriesScand ** QPredAV np v x = intVerbPhrase np (complVerbAdj v x) ; QPredObjA2V np v x y = intVerbPhrase np (complVerbAdj2 True v x y) ; + IPredV a v = predVerbGroupI True a (predVerb v) ; + IPredV2 a v x = predVerbGroupI True a (complTransVerb v x) ; +---- SPredAP np v = predBeGroup np (\\_ => v.s ! AAdj) ; + IPredAP a v = predVerbGroupI True a (predAdjective v) ; + {- -- Use VPs diff --git a/lib/resource/scandinavian/RulesScand.gf b/lib/resource/scandinavian/RulesScand.gf index 3fd5321bb..3aedc1c7c 100644 --- a/lib/resource/scandinavian/RulesScand.gf +++ b/lib/resource/scandinavian/RulesScand.gf @@ -126,8 +126,8 @@ lin IntSlash = intSlash ; QuestAdv = questAdverbial ; - PosImperVP = imperVerbPhrase True ; - NegImperVP = imperVerbPhrase False ; + PosImpVP = imperVerbPhrase True ; + NegImpVP = imperVerbPhrase False ; IndicPhrase = indicUtt ; QuestPhrase = interrogUtt ; diff --git a/lib/resource/scandinavian/SyntaxScand.gf b/lib/resource/scandinavian/SyntaxScand.gf index 736bf1163..b70ce1365 100644 --- a/lib/resource/scandinavian/SyntaxScand.gf +++ b/lib/resource/scandinavian/SyntaxScand.gf @@ -283,8 +283,10 @@ oper extAdjective : Adj -> Adjective = \adj -> {s = table {f => table {c => adj.s ! AF (Posit f) c}}} ; - adjPastPart : Verb -> Adjective ; - + adjPastPart : Verb -> Adjective = \verb -> { + s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret af c) --- på slagen + } ; + -- Coercions between the compound gen-num type and gender and number: @@ -365,12 +367,12 @@ oper --3 Two-place adjectives -- -- A two-place adjective is an adjective with a preposition used before --- the complement. (Rem. $Preposition = Str$). +-- the complement. AdjCompl = Adjective ** {s2 : Preposition} ; complAdj : AdjCompl -> NounPhrase -> AdjPhrase = \förtjust,dig -> - {s = \\a,c => förtjust.s ! a ! c ++ förtjust.s2 ++ dig.s ! PAcc ; + {s = \\a,c => förtjust.s ! a ! c ++ {-strPrep-} förtjust.s2 ++ dig.s ! PAcc ; p = True } ; @@ -408,6 +410,13 @@ oper -- preposition prefixed to its argument ("mor till x"). -- The type is analogous to two-place adjectives and transitive verbs. + param ComplPrep = CPnoPrep | CPav | CPför | CPi | CPom | CPpå | CPtill ; + + oper + Preposition = Str ; ---- ComplPrep ; --- + + strPrep : ComplPrep -> Str ; + Function = CommNoun ** {s2 : Preposition} ; mkFun : CommNoun -> Preposition -> Function = \f,p -> @@ -425,7 +434,7 @@ oper noun2CommNounPhrase {s = \\n,b => table { Gen => nonExist ; - _ => värde.s ! n ! b ! Nom ++ värde.s2 ++ x.s ! PAcc + _ => värde.s ! n ! b ! Nom ++ {-strPrep-} värde.s2 ++ x.s ! PAcc } ; g = värde.g ; } ; @@ -454,7 +463,7 @@ oper -- Their application starts by filling the first place. appFun2 : Function2 -> NounPhrase -> Function = \flyg, paris -> - {s = \\n,d,c => flyg.s ! n ! d ! c ++ flyg.s2 ++ paris.s ! PAcc ; + {s = \\n,d,c => flyg.s ! n ! d ! c ++ {-strPrep-} flyg.s2 ++ paris.s ! PAcc ; g = flyg.g ; s2 = flyg.s3 } ; @@ -496,15 +505,15 @@ oper hasett : Voice -> Str = \v -> auxHa ++ sett v in case sf of { - VFinite Present Simul => simple (VF (Pres Ind vo)) ; + VFinite Present Simul => simple (VF (Pres vo)) ; VFinite Present Anter => compound auxHar (sett vo) ; - VFinite Past Simul => simple (VF (Pret Ind vo)) ; + VFinite Past Simul => simple (VF (Pret vo)) ; VFinite Past Anter => compound auxHade (sett vo) ; VFinite Future Simul => compound auxSka (see vo) ; VFinite Future Anter => compound auxSka (hasett vo) ; VFinite Condit Simul => compound auxSkulle (see vo) ; VFinite Condit Anter => compound auxSkulle (hasett vo) ; - VImperat => simple (VF Imper) ; --- no passive + VImperat => simple (VF (Imper vo)) ; VInfinit Simul => compound [] (se.s ! VI (Inf vo)) ; VInfinit Anter => compound [] (auxHa ++ sett vo) } ; @@ -521,11 +530,13 @@ oper -- (s3) complement. This discontinuity is needed in sentence formation -- to account for word order variations. No particle needs to be retained. + param VIForm = VIInfinit | VIImperat Bool ; + + oper VerbPhrase : Type = { - s : Str ; - s2 : Str ; - s3 : Gender => Number => Person => Str + s : VIForm => Gender => Number => Person => Str } ; + VerbGroup : Type = { s : SForm => Str ; s2 : Bool => Str ; @@ -537,11 +548,21 @@ oper vgs = vg.s ; vgs3 = vg.s3 in - {s = vg.s ! VInfinit a ; - s2 = vg.s2 ! b ; - s3 = vg.s3 ! VInfinit a ; + {s = table { + VIInfinit => \\g,n,p => + vg.s ! VInfinit a ++ vg.s2 ! b ++ vg.s3 ! VInfinit a ! g ! n ! p ; + VIImperat bo => \\g,n,p => + vg.s ! VImperat ++ vg.s2 ! bo ++ vg.s3 ! VImperat ! g ! n ! p + } ---- bo shadows b } ; + predVerbGroupI : Bool -> {s : Str ; a : Anteriority} -> VerbGroup -> VerbPhrase = + \b,ant,vg -> + let vp = predVerbGroup b ant.a vg in + {s = \\i,g,n,p => ant.s ++ vp.s ! i ! g ! n ! p + } ; + + -- A simple verb can be made into a verb phrase with an empty complement. -- There are two versions, depending on if we want to negate the verb. -- N.B. negation is *not* a function applicable to a verb phrase, since @@ -586,7 +607,7 @@ oper \\g,n,_ => bra.s ! predFormAdj g n ! Nom ++ infinAtt ++ hansover.s ! Sub)) ; predAdjSent2 : AdjCompl -> NounPhrase -> Adjective = \bra,han -> - {s = \\af,c => bra.s ! af ! c ++ bra.s2 ++ han.s ! PAcc} ; + {s = \\af,c => bra.s ! af ! c ++ {-strPrep-} bra.s2 ++ han.s ! PAcc} ; --3 Transitive verbs @@ -605,7 +626,7 @@ oper mkDirectVerb : Verb -> TransVerb = \v -> mkTransVerb v nullPrep ; - nullPrep : Preposition = [] ; + nullPrep : Preposition = [] ; ---- CPnoPrep ; extTransVerb : Verbum -> Preposition -> TransVerb = \v,p -> @@ -615,7 +636,7 @@ oper -- The rule for using transitive verbs is the complementization rule: complTransVerb : TransVerb -> NounPhrase -> VerbGroup = \se,dig -> - useVerb se (\\_,_,_ => se.s1 ++ se.s2 ++ dig.s ! PAcc) ; + useVerb se (\\_,_,_ => se.s1 ++ {-strPrep-} se.s2 ++ dig.s ! PAcc) ; -- Transitive verbs with accusative objects can be used passively. -- The function does not check that the verb is transitive. @@ -638,7 +659,7 @@ oper love ; reflTransVerb : TransVerb -> VerbGroup = \se -> - useVerb se (\\_,n,p => se.s1 ++ se.s2 ++ reflPron n p) ; + useVerb se (\\_,n,p => se.s1 ++ {-strPrep-} se.s2 ++ reflPron n p) ; reflPron : Number -> Person -> Str ; @@ -654,7 +675,7 @@ oper complDitransVerb : DitransVerb -> NounPhrase -> TransVerb = \ge,dig -> {s = ge.s ; - s1 = ge.s1 ++ ge.s2 ++ dig.s ! PAcc ; + s1 = ge.s1 ++ {-strPrep-} ge.s2 ++ dig.s ! PAcc ; s2 = ge.s3 } ; @@ -673,7 +694,7 @@ oper DitransAdjVerb -> NounPhrase -> AdjPhrase -> VerbGroup = \gor,dig,sur -> useVerb gor - (\\_,_,_ => gor.s1 ++ gor.s2 ++ dig.s ! PAcc ++ + (\\_,_,_ => gor.s1 ++ {-strPrep-} gor.s2 ++ dig.s ! PAcc ++ sur.s ! predFormAdj dig.g dig.n ! Nom) ; complAdjVerb : @@ -713,7 +734,7 @@ oper -- The rule for creating locative noun phrases by the preposition "i" -- is a little shaky: "i Sverige" but "på Island". - prepPhrase : Preposition -> NounPhrase -> Adverb = \i,huset -> + prepPhrase : Str -> NounPhrase -> Adverb = \i,huset -> advPost (i ++ huset.s ! PAcc) ; locativeNounPhrase : NounPhrase -> Adverb = @@ -799,12 +820,12 @@ oper complDitransSentVerb : TransVerb -> NounPhrase -> Sentence -> VerbGroup = \sa,honom,duler -> useVerb sa - (\\_,_,_ => sa.s1 ++ sa.s2 ++ honom.s ! PAcc ++ optStr infinAtt ++ duler.s ! Main) ; + (\\_,_,_ => sa.s1 ++ {-strPrep-} sa.s2 ++ honom.s ! PAcc ++ optStr infinAtt ++ duler.s ! Main) ; complDitransQuestVerb : TransVerb -> NounPhrase -> QuestionSent -> VerbGroup = \sa,honom,omduler -> useVerb sa - (\\_,_,_ => sa.s1 ++ sa.s2 ++ honom.s ! PAcc ++ omduler.s ! IndirQ) ; + (\\_,_,_ => sa.s1 ++ {-strPrep-} sa.s2 ++ honom.s ! PAcc ++ omduler.s ! IndirQ) ; --3 Verb-complement verbs -- @@ -820,8 +841,7 @@ oper (\\g,n,p => vilja.s1 ++ vilja.s3 ++ - simma.s ++ simma.s2 ++ ---- Anter! - simma.s3 ! g ! n ! p) ; + simma.s ! VIInfinit ! g ! n ! p) ; transVerbVerb : VerbVerb -> TransVerb -> TransVerb = \vilja,hitta -> {s = vilja.s ; @@ -835,8 +855,7 @@ oper (\\g,n,p => grei.s ! predFormAdj g n ! Nom ++ infinAtt ++ - simma.s ++ simma.s2 ++ - simma.s3 ! g ! n ! p) ; + simma.s ! VIInfinit ! g ! n ! p) ; -- Notice agreement to object vs. subject: @@ -846,11 +865,10 @@ oper Bool -> DitransVerbVerb -> NounPhrase -> VerbPhrase -> VerbGroup = \obj,be,dig,simma -> useVerb be - (\\g,n,p => be.s1 ++ be.s2 ++ dig.s ! PAcc ++ be.s3 ++ - simma.s ++ simma.s2 ++ + (\\g,n,p => be.s1 ++ {-strPrep-} be.s2 ++ dig.s ! PAcc ++ be.s3 ++ if_then_Str obj - (simma.s3 ! dig.g ! dig.n ! dig.p) - (simma.s3 ! g ! n ! p) + (simma.s ! VIInfinit ! dig.g ! dig.n ! dig.p) + (simma.s ! VIInfinit ! g ! n ! p) ) ; complVerbAdj2 : @@ -859,12 +877,11 @@ oper vara (\\g,n,p => grei.s ! predFormAdj g n ! Nom ++ - grei.s2 ++ dig.s ! PAcc ++ + {-strPrep-} grei.s2 ++ dig.s ! PAcc ++ infinAtt ++ - simma.s ++ simma.s2 ++ if_then_Str obj - (simma.s3 ! dig.g ! dig.n ! dig.p) - (simma.s3 ! g ! n ! p) + (simma.s ! VIInfinit ! dig.g ! dig.n ! dig.p) + (simma.s ! VIInfinit ! g ! n ! p) ) ; --2 Sentences missing noun phrases @@ -932,7 +949,7 @@ oper {s = \\c,gn => variants { vilken.s ! RGen ! gn ++ värde.s ! numGN gn ! Indef ! relCase c ; - värde.s ! numGN gn ! Def ! Nom ++ värde.s2 ++ vilken.s ! RPrep ! gn + värde.s ! numGN gn ! Def ! Nom ++ {-strPrep-} värde.s2 ++ vilken.s ! RPrep ! gn } ; g = RG (genNoun värde.g) } ; @@ -954,7 +971,7 @@ oper {s = \\b,sf,gn,p => let jagtalar = jagTalar.s ! b ! s2cl sf Sub ; - om = jagTalar.s2 + om = {-strPrep-} jagTalar.s2 in variants { som.s ! RAcc ! gn ++ jagtalar ++ om ; om ++ som.s ! RPrep ! gn ++ jagtalar @@ -1117,7 +1134,7 @@ oper intSlash : IntPron -> ClauseSlashNounPhrase -> Question = \Vem, jagTalar -> let vem = Vem.s ! PAcc ; - om = jagTalar.s2 + om = {-strPrep-} jagTalar.s2 in {s = \\b,sf => let @@ -1148,7 +1165,7 @@ oper IntAdverb = SS ; - prepIntAdverb : Preposition -> IntPron -> IntAdverb = + prepIntAdverb : Str -> IntPron -> IntAdverb = prepPhrase ; -- A question adverbial can be applied to anything, and whether this makes @@ -1164,9 +1181,9 @@ oper Imperative = {s : Number => Str} ; - imperVerbPhrase : Bool -> VerbGroup -> Imperative = \b,titta -> + imperVerbPhrase : Bool -> VerbPhrase -> Imperative = \b,titta -> {s = \\n => - titta.s ! VImperat ++ titta.s2 ! b ++ titta.s3 ! VImperat ! utrum ! n ! P2 + titta.s ! VIImperat b ! utrum ! n ! P2 } ; imperUtterance : Number -> Imperative -> Utterance = \n,I -> @@ -1371,15 +1388,12 @@ oper -- "What do you want to do? - Wash myself." verbUtterance : VerbPhrase -> Utterance = \vp -> - ss (vp.s ++ vp.s2 ++ vp.s3 ! utrum ! Sg ! P1) ; + ss (vp.s ! VIInfinit ! utrum ! Sg ! P1) ; ----------- changes when parametrizing 20/1/2005 ---- moved from Morphology --- Prepositions are just strings. - Preposition = Str ; - -- Relative pronouns have a special case system. $RPrep$ is the form used -- after a preposition (e.g. "det hus i vilket jag bor"). param @@ -1395,7 +1409,18 @@ oper pronNågon : GenNum => Str ; - deponentVerb : Verb -> Verb ; + deponentVerb : Verb -> Verb = \finna -> { + s = table { + VF (Pres _) => finna.s ! VF (Pres Pass) ; + VF (Pret _) => finna.s ! VF (Pret Pass) ; + VF (Imper _) => finna.s ! VF (Imper Pass) ; + VI (Inf _) => finna.s ! VI (Inf Pass) ; + VI (Supin _) => finna.s ! VI (Supin Pass) ; + v => finna.s ! v + } ; + s1 = finna.s1 + } ; + verbFinnas : Verb ; verbVara : Verb ; diff --git a/lib/resource/scandinavian/TypesScand.gf b/lib/resource/scandinavian/TypesScand.gf index d83fac137..bf0aa01d8 100644 --- a/lib/resource/scandinavian/TypesScand.gf +++ b/lib/resource/scandinavian/TypesScand.gf @@ -96,9 +96,16 @@ oper oper Verbum : Type = {s : VerbForm => Str} ; param - VFin ; - - VInf ; + VFin = + Pres Voice + | Pret Voice + | Imper Voice ; + + VInf = + Inf Voice + | Supin Voice + | PtPret AdjFormPos Case + ; VerbForm = VF VFin diff --git a/lib/resource/spanish/RulesSpa.gf b/lib/resource/spanish/RulesSpa.gf index fb04a1b5d..7b3e61bb8 100644 --- a/lib/resource/spanish/RulesSpa.gf +++ b/lib/resource/spanish/RulesSpa.gf @@ -1,4 +1,4 @@ --# -path=.:../romance:../abstract:../../prelude -concrete RulesSpa of Rules = +concrete RulesSpa of Rules = CategoriesSpa ** RulesRomance with (SyntaxRomance=SyntaxSpa) ; diff --git a/lib/resource/spanish/TestResourceSpa.gf b/lib/resource/spanish/TestResourceSpa.gf index 09059b5f8..7ab00189e 100644 --- a/lib/resource/spanish/TestResourceSpa.gf +++ b/lib/resource/spanish/TestResourceSpa.gf @@ -1,4 +1,4 @@ ---# -path=.:../romance:../abstract:../../prelude +--# -path=.:../romance:../oldabstract:../abstract:../../prelude concrete TestResourceSpa of TestResource = RulesSpa, StructuralSpa ** open Prelude, TypesSpa, MorphoSpa, SyntaxSpa in { diff --git a/lib/resource/swedish/BasicSwe.gf b/lib/resource/swedish/BasicSwe.gf new file mode 100644 index 000000000..282c82ae1 --- /dev/null +++ b/lib/resource/swedish/BasicSwe.gf @@ -0,0 +1,222 @@ +--# -path=.:../scandinavian:../abstract:../../prelude + +concrete BasicSwe of Basic = CategoriesSwe ** open NewParadigmsSwe in { + +flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ; + +lin + airplane_N = regN "flygplan" neutrum ; + answer_V2S = mkV2S (regV "svara") "till" ; + apartment_N = mk2N "lägenhet" "lägenheter" ; + apple_N = regN "äpple" neutrum ; + art_N = mk2N "konst" "konster" ; + ask_V2Q = mkV2Q (regV "fråga") [] ; + baby_N = regN "bebis" utrum ; + bad_ADeg = irregADeg "dålig" "sämre" "sämst"; + bank_N = mk2N "bank" "banker" ; + beautiful_ADeg = mk3ADeg "vacker" "vackert" "vackrast" ; + become_VA = mkVA (mkV "bli" "blir""bli" "blev" "blivit" "bliven") ; + beer_N = regN "öl" neutrum ; + beg_V2V = mkV2V (mkV "be" "ber""be" "blad" "bett" "bedd") [] "att" ; + big_ADeg = irregADeg "stor" "större" "störst"; + bike_N = mk2N "cykel" "cyklar" ; + bird_N = mk2N "fågel" "fåglar" ; + black_ADeg = mk2ADeg "svart" "svart" ; + blue_ADeg = mk2ADeg "blå" "blått"; + boat_N = regN "båt" utrum ; + book_N = mk2N "bok" "böcker" ; + boot_N = mk2N "stövel" "stövlar" ; + boss_N = mk2N "chef" "chefer" ; + boy_N = regN "pojke" utrum ; + bread_N = regN "bröd" neutrum ; + break_V2 = dirV2 (partV (mkV "slå" "slår" "slå" "slog" "slagit" "slagen") "sönder") ; + broad_ADeg = mk2ADeg "bred" "brett" ; + brother_N2 = mkN2 (mascN (mkN "bror" "brodern" "bröder" "bröderna")) "till" ; + brown_ADeg = regADeg "brun" ; + butter_N = regN "smör" neutrum ; + buy_V2 = dirV2 (mk2V "köpa" "köper") ; + camera_N = regN "kamera" utrum ; + cap_N = regN "mössa" utrum ; + car_N = regN "bil" utrum ; + carpet_N = regN "matta" utrum ; + cat_N = mk2N "katt" "katter" ; + ceiling_N = regN "tak" neutrum ; + chair_N = regN "stol" utrum ; + cheese_N = regN "ost" utrum ; + child_N = regN "barn" neutrum ; + church_N = regN "kyrka" utrum ; + city_N = mk2N "stad" "städer" ; + clean_ADeg = regADeg "ren" ; + clever_ADeg = regADeg "klok" ; + close_V2 = dirV2 (regV "stänga") ; + coat_N = regN "rock" utrum ; + cold_ADeg = regADeg "kall" ; + come_V = (mkV "komma" "kommer" "kom" "kom" "kommit" "kommen") ; + computer_N = mk2N "dator" "datorer" ; + country_N = mkN "land" "landet" "länder" "länderna" ; + cousin_N = mk2N "kusin" "kusinerna" ; + cow_N = mk2N "ko" "kor" ; + die_V = (mkV "dö" "dör" "dö" "dog" "dött" "dödd") ; ---- + dirty_ADeg = regADeg "smutsig" ; + doctor_N = mk2N "läkare" "läkare" ; + dog_N = regN "hund" utrum ; + door_N = regN "dörr" utrum ; + drink_V2 = dirV2 (irregV "dricka" "drack" "druckit") ; + easy_A2V = mkA2V (mk2A "lätt" "lätt") "för" ; + eat_V2 = dirV2 (irregV "äta" "åt" "ätit") ; + enemy_N = regN "fiende" neutrum ; + factory_N = mk2N "fabrik" "fabriker" ; + father_N2 = mkN2 (mascN (mkN "far" "fadern" "fäder" "fäderna")) "till" ; + fear_VS = mkVS (regV "frukta") ; + find_V2 = dirV2 (irregV "finna" "fann" "funnit") ; + fish_N = mk2N "fisk" "fiskar" ; + floor_N = regN "golv" neutrum ; + forget_V2 = dirV2 (mkV "glömma" "glömmer" "glöm" "glömde" "glömt" "glömd") ; + fridge_N = regN "kylskåp" neutrum ; + friend_N = mkN "vän" "vännen" "vänner" "vännerna" ; + fruit_N = mk2N "frukt" "frukter" ; + fun_AV = mkAV (regA "rolig") ; + garden_N = regN "trädgård" utrum ; + girl_N = regN "flicka" utrum ; + glove_N = regN "handske" utrum ; + gold_N = regN "guld" neutrum ; + good_ADeg = mkADeg "god" "gott" "goda" "goda" "bättre" "bäst" "bästa" ; + go_V = (mkV "gå" "går" "gå" "gick" "gått" "gången") ; + green_ADeg = regADeg "grön" ; + harbour_N = regN "hamn" utrum; + hate_V2 = dirV2 (regV "hata") ; + hat_N = regN "hatt" utrum ; + have_V2 = dirV2 (mkV "ha" "har" "ha" "hade" "haft" "haft") ; ---- pp + hear_V2 = dirV2 (mkV "höra" "hör" "hör" "hörde" "hört" "hörd") ; + hill_N = regN "kulle" utrum ; + hope_VS = mkVS (depV (regV "hoppas")) ; + horse_N = regN "häst" utrum ; + hot_ADeg = regADeg "het" ; + house_N = regN "hus" neutrum ; + important_ADeg = regADeg "viktig" ; + industry_N = mk2N "industri" "industrier" ; ---- "ien" ?? + iron_N = regN "järn" neutrum ; + king_N = mascN (regN "kung" utrum) ; + know_V2 = dirV2 (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; + lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ; + lamp_N = regN "lampa" utrum; + learn_V2 = dirV2 (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd") ; ---- refl! + leather_N = mkN "läder" "lädret" "läder" "lädren" ; + leave_V2 = dirV2 (regV "lämna") ; + like_V2 = mkV2 (mk2V "tycka" "tycker") "om" ; + listen_V2 = dirV2 (regV "lyssna") ; + live_V = (irregV "leva" "levde" "levt") ; ---- ? + long_ADeg = irregADeg "lång" "längre" "längst" ; + lose_V2 = dirV2 (regV "förlora") ; + love_N = regN "kärlek" utrum ; + love_V2 = dirV2 (regV "älska") ; + man_N = mascN (mkN "man" "mannen" "män" "männen") ; + married_A2 = mkA2 (mk2A "gift" "gift") "med" ; + meat_N = regN "kött" neutrum ; + milk_N = regN "mjölk" utrum ; ---- -ar? + moon_N = regN "måne" utrum ; + mother_N2 = mkN2 (mkN "mor" "modern" "mödrar" "mödrarna") "till" ; + mountain_N = regN "berg" neutrum ; + music_N = mk2N "musik" "musiker" ; ---- er ? + narrow_ADeg = regADeg "smal" ; + new_ADeg = mkADeg "ny" "nytt" "nya" "nya" "nyare" "nyast" "nyaste" ; + newspaper_N = regN "tidning" utrum ; + + oil_N = regN "olja" utrum ; + old_ADeg = mkADeg "gammal" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ; + open_V2 = dirV2 (regV "öppna") ; + paint_V2A = mkV2A (regV "måla") [] ; + paper_N = mkN "papper" "pappret" "papper" "pappren" ; + peace_N = regN "fred" utrum ; ---- ar? + pen_N = regN "penna" utrum ; + planet_N = mk2N "planet" "planeter" ; + plastic_N = mk2N "plastic" "plastiker" ; + play_V2 = dirV2 (regV "spela") ; + policeman_N = mk2N "polis" "poliser" ; + priest_N = mk2N "präst" "präster" ; + probable_AS = mkAS (regA "sannolik") ; + queen_N = regN "drottning" utrum ; + radio_N = regN "radio" utrum ; ---- + rain_V0 = mkV0 (regV "regna") ; + read_V2 = dirV2 (mk2V "läsa" "läser") ; + red_ADeg = mk2ADeg "röd" "rött" ; + religion_N = mk2N "religion" "religioner" ; + restaurant_N = mk2N "restaurang" "restauranger" ; + river_N = mkN "å" "ån" "åar" "åarna" ; + rock_N = regN "sten" utrum ; + roof_N = regN "tak" neutrum ; + rubber_N = mkN "gummi" "gummit" "gummin" "gummina" ; + run_V = (irregV "springa" "sprang" "sprungit") ; + say_VS = mkVS (mkV "säga" "säger" "säg" "sade" "sagt" "sagd") ; + school_N = regN "skola" utrum; + science_N = mk2N "vetenskap" "vetenskaper" ; + sea_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ; + seek_V2 = dirV2 (mk2V "söka" "söker") ; + see_V2 = dirV2 (mkV "se" "ser" "se" "såg" "sett" "sedd") ; + sell_V3 = dirV3 (irregV "sälja" "sålde" "sålt") "to" ; + send_V3 = dirV3 (regV "skicka") "till" ; + sheep_N = mk2N "får" "får" ; + ship_N = regN "skepp" neutrum ; + shirt_N = regN "skjorta" utrum ; + shoe_N = regN "sko" utrum ; + shop_N = mk2N "affär" "affären" ; + short_ADeg = regADeg "kort" ; + silver_N = mkN "silver" "silvret" "silver" "silvren" ; + sister_N = mk2N "syster" "systrar" ; + sleep_V = (irregV "sova" "sov" "sovit") ; + small_ADeg = mkADeg "liten" "litet" "lilla" "små" "mindre" "minst" "minsta" ; + snake_N = regN "orm" utrum ; + sock_N = regN "strumpa" utrum ; + speak_V2 = dirV2 (regV "tala") ; + star_N = regN "stjärna" utrum ; + steel_N = regN "stål" utrum ; + stone_N = regN "sten" utrum ; + stove_N = regN "spis" utrum ; + student_N = mk2N "student" "studenter" ; + stupid_ADeg = mk3ADeg "dum" "dumt" "dumma" ; + sun_N = regN "sol" utrum ; + switch8off_V2 = dirV2 (partV (irregV "stänga" "stängde" "stängt") "av") ; + switch8on_V2 = dirV2 (partV (irregV "slå" "slog" "slagit") "på") ; + table_N = regN "bord" neutrum ; + talk_V3 = mkV3 (regV "prata") "till" "om" ; + teacher_N = mk2N "lärare" "lärare" ; + teach_V2 = dirV2 (regV "undervisa") ; + television_N = mk2N "television" "televisioner" ; + thick_ADeg = regADeg "tjock" ; + thin_ADeg = mk2ADeg "tunn" "tunt" ; + train_N = regN "tåg" neutrum ; + travel_V = mk2V "resa" "reser" ; + tree_N = regN "träd" neutrum ; + ---- trousers_N = regN "trousers" ; ---- pl t ! + ugly_ADeg = regADeg "ful" ; + understand_V2 = dirV2 (mkV "förstå" "förstår" "förstå" "förstod" "förstått" "förstådd") ; + university_N = regN "universitet" neutrum ; + village_N = mkN "by" "byn" "byar" "byarna" ; + wait_V2 = mkV2 (regV "vänta") "på" ; + walk_V = (mkV "gå" "går" "gå" "gick" "gått" "gången") ; + warm_ADeg = regADeg "varm" ; + war_N = regN "krig" neutrum ; + watch_V2 = mkV2 (regV "titta") "på" ; + water_N = mkN "vatten" "vattnet" "vatten" "vattnen" ; + white_ADeg = regADeg "vit" ; + window_N = mkN "fönster" "fönstret" "fönster" "fönstren" ; + wine_N = mkN "vin" "vinet" "viner" "vinerna" ; ---- + win_V2 = dirV2 (irregV "vinna" "vann" "vunnit") ; + woman_N = regN "kvinna" utrum ; + wonder_VQ = mkVQ (regV "undra") ; + wood_N = mkN "trä" "träet" "träen" "träena" ; ---- ? + write_V2 = dirV2 (irregV "skriva" "skrev" "skrivit") ; + yellow_ADeg = regADeg "gul" ; + young_ADeg = irregADeg "ung" "yngre" "yngst" ; + + do_V2 = dirV2 (mkV "göra" "gör" "gör" "gjorde" "gjort" "gjord") ; + now_Adv = mkAdv "nu" ; + already_Adv = mkAdv "redan" ; + song_N = mk2N "sång" "sånger" ; + add_V3 = mkV3 (partV (irregV "lägga" "lade" "lagt") "till") [] "till" ; + number_N = mkN "nummer" "numret" "numren" "numren" ; + put_V2 = mkV2 (irregV "sätta" "satte" "satt") [] ; + stop_V = regV "stanna" ; + jump_V = regV "hoppa" ; + +} ; diff --git a/lib/resource/swedish/ClauseSwe.gf b/lib/resource/swedish/ClauseSwe.gf index a270ca49e..44f642ff5 100644 --- a/lib/resource/swedish/ClauseSwe.gf +++ b/lib/resource/swedish/ClauseSwe.gf @@ -1,3 +1,4 @@ --# -path=.:../scandinavian:../abstract:../../prelude -concrete ClauseSwe of Clause = ClauseScand with (SyntaxScand=SyntaxSwe) ; +concrete ClauseSwe of Clause = CategoriesSwe ** + ClauseScand with (SyntaxScand=SyntaxSwe) ; diff --git a/lib/resource/swedish/MorphoSwe.gf b/lib/resource/swedish/MorphoSwe.gf index 1c791bab2..d1274431d 100644 --- a/lib/resource/swedish/MorphoSwe.gf +++ b/lib/resource/swedish/MorphoSwe.gf @@ -10,69 +10,268 @@ resource MorphoSwe = TypesSwe ** open Prelude in { +-- Nouns + oper - mkVerbPart : (supa,super,sup,söp,supit,supen,upp : Str) -> Verb = - \finna,finner,finn,fann,funnit,funnen,upp -> + mkNoun : (apa,apan,apor,aporna : Str) -> Subst = + \apa,apan,apor,aporna -> + {s = table { + SF Sg Indef c => mkCase c apa ; + SF Sg Def c => mkCase c apan ; + SF Pl Indef c => mkCase c apor ; + SF Pl Def c => mkCase c aporna + } ; + h1 = case last apan of { + "n" => Utr ; + _ => Neutr + } + } ; + + reg2Noun : Str -> Str -> Subst = \bil,bilar -> + let + l = last bil ; + b = Predef.tk 2 bil ; + ar = Predef.dp 2 bilar + in + case ar of { + "or" => case l of { + "a" => decl1Noun bil ; + "r" => sLik bil ; + "o" => mkNoun bil (bil + "n") bilar (bilar + "na") ; + _ => mkNoun bil (bil + "en") bilar (bilar + "na") + } ; + "ar" => ifTok Subst (Predef.tk 2 bilar) bil + (decl2Noun bil) + (case l of { + "e" => decl2Noun bil ; + _ => mkNoun bil (bil + "n") bilar (bilar + "na") + } + ) ; + "er" => decl3Noun bil ; + "en" => ifTok Subst bil bilar (sLik bil) (sRike bil) ; -- ben-ben + _ => ifTok Subst bil bilar ( + case Predef.dp 3 bil of { + "are" => sKikare (init bil) ; + _ => decl5Noun bil + } + ) + (decl5Noun bil) --- rest case with lots of garbage + } ; + +--- this is a very rough heuristic as regards "ar/er" + + regNoun : Str -> Gender -> Subst = \bil,g -> case g of { + Utr => case last bil of { + "a" => decl1Noun bil ; + _ => decl2Noun bil + } ; + Neutr => case last bil of { + "e" => sRike bil ; + _ => decl5Noun bil + } + } ; + + + decl1Noun : Str -> Subst = \apa -> sApa (init apa) ; + + decl2Noun : Str -> Subst = \bil -> + case last bil of { + "e" => sPojke (init bil) ; + _ => mkNoun bil (bil + "en") (bil + "ar") (bil + "arna") + } ; + + decl3Noun : Str -> Subst = \sak -> + case last sak of { + "e" => sVarelse (init sak) ; + "å" => sNivå sak ; + _ => mkNoun sak (sak + "en") (sak + "er") (sak + "erna") + } ; + + decl5Noun : Str -> Subst = \lik -> + mkNoun lik (lik + "et") lik (lik + "en") ; + + +-- Adjectives + + +mkAdjPos : Str -> Str -> Str -> Str -> AdjFormPos -> Str ; +mkAdjPos liten litet lilla sma a = case a of { + Strong gn => case gn of { + ASg Utr => liten ; + ASg Neutr => litet ; + APl => sma + } ; + Weak sn => case sn of { + AxSg NoMasc => lilla ; + AxSg Masc => init lilla + "e" ; + AxPl => sma + } + } ; + +-- The worst-case macro for the full declension (including comparison forms) +-- is not so much worse. + +mkAdjective : Str -> Str -> Str -> Str -> + Str -> Str -> Str -> Adj ; +mkAdjective liten litet lilla sma mindre minst minsta = {s = table { + AF (Posit p) c => mkCase c (mkAdjPos liten litet lilla sma p) ; + AF Compar c => mkCase c mindre ; + AF (Super SupStrong) c => mkCase c minst ; + AF (Super SupWeak) c => mkCase c minsta + } +} ; + +-- It is handy to extract the positive part of a declension only, if +-- the other comparicon forms aren't needed or don't make sense. + +extractPositive : Adj -> {s : AdjFormPos => Case => Str} ; +extractPositive adj = {s = \\a,c => adj.s ! (AF (Posit a) c)} ; + +-- The notion of 'moderately irregular adjective' covers almost all adjectives. + +adjIrreg : (_,_,_,_ : Str) -> Adj ; +adjIrreg god gott battre bast = + mkAdjective god gott (god + "a") (god + "a") battre bast (bast + "a") ; + +-- Often it is possible to derive the $Pos Sg Neutr$ form even if the +-- comparison forms are irregular. + +adjIrreg3 : (_,_,_: Str) -> Adj ; +adjIrreg3 ung yngre yngst = adjIrreg ung (ung + "t") yngre yngst ; + +-- Some adjectives must be given $Pos Sg Utr$ $Pos Sg Neutr$, and $Pos Pl$, +-- e.g. those ending with unstressed "en". + +adjAlmostReg : (_,_,_: Str) -> Adj ; +adjAlmostReg ljummen ljummet ljumma = + mkAdjective ljummen ljummet ljumma ljumma + (ljumma + "re") (ljumma + "st") (ljumma + "ste") ; + +adjReg : Str -> Adj = \fin -> adjAlmostReg fin (fin + "t") (fin + "a") ; + +adj2Reg : Str -> Str -> Adj = \vid,vitt -> adjAlmostReg vid vitt (vid + "a") ; + + +-- Verbs + + mkVerb : (supa,super,sup,söp,supit,supen : Str) -> Verb = + \finna,finner,finn,fann,funnit,funnen -> let funn = ptPretForms funnen in {s = table { - VF (Pres Ind Act) => finner ; - VF (Pres Ind Pass) => finn + "s" ; - VF (Pres Cnj Act) => finn + "e" ; - VF (Pres Cnj Pass) => finn + "es" ; - VF (Pret Ind Act) => fann ; - VF (Pret Ind Pass) => fann + "s" ; - VF (Pret Cnj Act) => fann ; --- = ind - VF (Pret Cnj Pass) => fann + "s" ; --- - VF Imper => finn ; - VI (Inf Act) => finna ; - VI (Inf Pass) => finna + "s" ; - VI (Supin Act) => funnit ; - VI (Supin Pass) => funnit + "s" ; - VI (PtPres Nom) => finn + "ande" ; - VI (PtPres Gen) => finn + "andes" ; + VF (Pres Act) => finner ; + VF (Pres Pass) => mkVoice Pass finn ; + VF (Pret v) => mkVoice v fann ; + VF (Imper v) => mkVoice v finn ; + VI (Inf v) => mkVoice v finna ; + VI (Supin v) => mkVoice v funnit ; VI (PtPret a c) => funn ! a ! c } ; - s1 = upp - } ; + s1 = [] + } ; -ptPretForms : Str -> AdjFormPos => Case => Str = \funnen -> \\a,c => - mkCase c ( - {- ---- - case Predef.dp 2 funnen of { - "en" => let funn : Str = Predef.tk 2 funnen in - case a of { - (Strong (ASg Utr)) => funn + "en" ; - (Strong (ASg Neutr)) => funn + "et" ; - (Strong APl) => funn + "a" ; - (Weak (AxSg NoMasc)) => funn + "a" ; - (Weak (AxSg Masc)) => funn + "e" ; - (Weak AxPl) => funn + "a" - } ; - "ad" => let funn : Str = Predef.tk 2 funnen in - case a of { - (Strong (ASg Utr)) => funn + "ad" ; - (Strong (ASg Neutr)) => funn + "at" ; - (Strong APl) => funn + "ade" ; - (Weak _) => funn + "ade" - } ; + vFinna : (_,_,_ : Str) -> Verb = \finn, fann, funn -> + mkVerb (finn + "a") (finn + "er") finn fann (funn + "it") (funn + "en") ; - _ => --} - funnen ---- to be completed - ---- } - ) ; +-- Now this is more general and subsumes $vFinna$. + + vSälja : (_,_,_ : Str) -> Verb = \sälja, sålde, sålt -> + let + a = last sälja ; + sälj = case a of { + "a" => init sälja ; + _ => sälja + } ; + er = case a of { + "a" => "er" ; + _ => "r" + } ; + såld = case Predef.dp 2 sålt of { + "it" => Predef.tk 2 sålt + "en" ; + _ => init sålt + "d" + } + in + mkVerb sälja (sälj + er) sälj sålde sålt såld ; + + regVerb : (_,_ : Str) -> Verb = \tala,talar -> + let + ar = Predef.dp 2 talar ; + tal = Predef.tk 2 talar ; + forms = case ar of { + "ar" => vTala tal ; + "er" => vLeka tal ; + _ => case last tala of { + "a" => mkVerb tala talar tal (tal + "de") (tala + "t") (tala + "d") ; + _ => mkVerb tala talar tala (tala + "dde") (tala + "tt") (tala + "dd") + } + } + in forms ** {s1 = []} ; + + ptPretForms : Str -> AdjFormPos => Case => Str = \funnen -> \\a,c => + let + funn = Predef.tk 2 funnen ; + en = Predef.dp 2 funnen ; + funne = init funnen ; + n = last funnen ; + m = case last funn of { + "n" => [] ; + _ => "n" + } ; + funna = case en of { + "en" => case a of { + (Strong (ASg Utr)) => funn + "en" ; + (Strong (ASg Neutr)) => funn + "et" ; + (Weak (AxSg Masc)) => funn + m + "e" ; + _ => funn + m + "a" + } ; + "dd" => case a of { + (Strong (ASg Utr)) => funn + "dd" ; + (Strong (ASg Neutr)) => funn + "tt" ; + (Weak (AxSg Masc)) => funn + "dde" ; + _ => funn + "dda" + } ; + "ad" => case a of { + (Strong (ASg Utr)) => funn + "ad" ; + (Strong (ASg Neutr)) => funn + "at" ; + _ => funn + "ade" + } ; + _ => case n of { + "d" => case a of { + (Strong (ASg Utr)) => funne + "d" ; + (Strong (ASg Neutr)) => funne + "t" ; + (Weak (AxSg Masc)) => funne + "de" ; + _ => funne + "da" + } ; + _ => case a of { + (Strong (ASg Utr)) => funne + "t" ; + (Strong (ASg Neutr)) => funne + "t" ; + (Weak (AxSg Masc)) => funne + "te" ; + _ => funne + "ta" + } + } + } + in + mkCase c funna ; mkCase : Case -> Str -> Str = \c,f -> case c of { Nom => f ; - Gen => f + "s" + Gen => f + case last f of { + "s" => [] ; + _ => "s" + } } ; +mkVoice : Voice -> Str -> Str = \c,f -> case c of { + Act => f ; + Pass => f + case last f of { + "s" => "es" ; + _ => "s" + } + } ; -- The most common is a verb without a particle. - mkVerb : (_,_,_,_,_,_ : Str) -> Verb = \supa,super,sup,söp,supit,supen -> - mkVerbPart supa super sup söp supit supen [] ; - + mkVerbPart : (_,_,_,_,_,_,_ : Str) -> Verb = \supa,super,sup,söp,supit,supen,upp -> + {s = (mkVerb supa super sup söp supit supen).s} ** {s1 = upp} ; -- Prepositions are just strings. Preposition = Str ; @@ -524,21 +723,16 @@ oper aAbstrakt : Str -> Adj = \abstrakt -> oper vTala : Str -> Verbum = \tal -> {s = table { - VF (Pres Ind Act) => tal + "ar" ; - VF (Pres Ind Pass) => tal + "as" ; - VF (Pres Cnj Act) => tal + "e" ; - VF (Pres Cnj Pass) => tal + "es" ; - VF (Pret Ind Act) => tal + "ade" ; - VF (Pret Ind Pass) => tal + "ades" ; - VF (Pret Cnj Act) => tal + "ade" ; - VF (Pret Cnj Pass) => tal + "ades" ; - VF Imper => tal + "a" ; + VF (Pres Act) => tal + "ar" ; + VF (Pres Pass) => tal + "as" ; + VF (Pret Act) => tal + "ade" ; + VF (Pret Pass) => tal + "ades" ; + VF (Imper Act) => tal + "a" ; + VF (Imper Pass) => tal + "as" ; VI (Inf Act) => tal + "a" ; VI (Inf Pass) => tal + "as" ; VI (Supin Act) => tal + "at" ; VI (Supin Pass) => tal + "ats" ; - VI (PtPres Nom) => tal + "ande" ; - VI (PtPres Gen) => tal + "andes" ; VI (PtPret (Strong (ASg Utr)) Nom) => tal + "ad" ; VI (PtPret (Strong (ASg Utr)) Gen) => tal + "ads" ; VI (PtPret (Strong (ASg Neutr)) Nom) => tal + "at" ; @@ -556,21 +750,15 @@ oper vTala : Str -> Verbum = \tal -> oper vLeka : Str -> Verbum = \lek -> {s = table { - VF (Pres Ind Act) => lek + "er" ; - VF (Pres Ind Pass) => variants {lek + "s" ; lek + "es"} ; - VF (Pres Cnj Act) => lek + "e" ; - VF (Pres Cnj Pass) => lek + "es" ; - VF (Pret Ind Act) => lek + "te" ; - VF (Pret Ind Pass) => lek + "tes" ; - VF (Pret Cnj Act) => lek + "te" ; - VF (Pret Cnj Pass) => lek + "tes" ; - VF Imper => lek ; + VF (Pres Act) => lek + "er" ; + VF (Pres Pass) => mkVoice Pass lek ; + VF (Pret Act) => lek + "te" ; + VF (Pret Pass) => lek + "tes" ; + VF (Imper v) => mkVoice v lek ; VI (Inf Act) => lek + "a" ; VI (Inf Pass) => lek + "as" ; VI (Supin Act) => lek + "t" ; VI (Supin Pass) => lek + "ts" ; - VI (PtPres Nom) => lek + "ande" ; - VI (PtPres Gen) => lek + "andes" ; VI (PtPret (Strong (ASg Utr)) Nom) => lek + "t" ; VI (PtPret (Strong (ASg Utr)) Gen) => lek + "ts" ; VI (PtPret (Strong (ASg Neutr)) Nom) => lek + "t" ; @@ -588,21 +776,16 @@ oper vLeka : Str -> Verbum = \lek -> oper vTyda : Str -> Verbum = \ty -> {s = table { - VF (Pres Ind Act) => ty + "der" ; - VF (Pres Ind Pass) => variants {ty + "ds" ; ty + "des"} ; - VF (Pres Cnj Act) => ty + "de" ; - VF (Pres Cnj Pass) => ty + "des" ; - VF (Pret Ind Act) => ty + "dde" ; - VF (Pret Ind Pass) => ty + "ddes" ; - VF (Pret Cnj Act) => ty + "dde" ; - VF (Pret Cnj Pass) => ty + "ddes" ; - VF Imper => ty + "d" ; + VF (Pres Act) => ty + "der" ; + VF (Pres Pass) => variants {ty + "ds" ; ty + "des"} ; + VF (Pret Act) => ty + "dde" ; + VF (Pret Pass) => ty + "ddes" ; + VF (Imper Act) => ty + "d" ; + VF (Imper Pass) => ty + "ds" ; VI (Inf Act) => ty + "da" ; VI (Inf Pass) => ty + "das" ; VI (Supin Act) => ty + "tt" ; VI (Supin Pass) => ty + "tts" ; - VI (PtPres Nom) => ty + "dande" ; - VI (PtPres Gen) => ty + "dandes" ; VI (PtPret (Strong (ASg Utr)) Nom) => ty + "dd" ; VI (PtPret (Strong (ASg Utr)) Gen) => ty + "dds" ; VI (PtPret (Strong (ASg Neutr)) Nom) => ty + "tt" ; @@ -620,21 +803,16 @@ oper vTyda : Str -> Verbum = \ty -> oper vVända : Str -> Verbum = \vän -> {s = table { - VF (Pres Ind Act) => vän + "der" ; - VF (Pres Ind Pass) => variants {vän + "ds" ; vän + "des"} ; - VF (Pres Cnj Act) => vän + "de" ; - VF (Pres Cnj Pass) => vän + "des" ; - VF (Pret Ind Act) => vän + "de" ; - VF (Pret Ind Pass) => vän + "des" ; - VF (Pret Cnj Act) => vän + "de" ; - VF (Pret Cnj Pass) => vän + "des" ; - VF Imper => vän + "d" ; + VF (Pres Act) => vän + "der" ; + VF (Pres Pass) => variants {vän + "ds" ; vän + "des"} ; + VF (Pret Act) => vän + "de" ; + VF (Pret Pass) => vän + "des" ; + VF (Imper Act) => vän + "d" ; + VF (Imper Pass) => vän + "ds" ; VI (Inf Act) => vän + "da" ; VI (Inf Pass) => vän + "das" ; VI (Supin Act) => vän + "t" ; VI (Supin Pass) => vän + "ts" ; - VI (PtPres Nom) => vän + "dande" ; - VI (PtPres Gen) => vän + "dandes" ; VI (PtPret (Strong (ASg Utr)) Nom) => vän + "d" ; VI (PtPret (Strong (ASg Utr)) Gen) => vän + "ds" ; VI (PtPret (Strong (ASg Neutr)) Nom) => vän + "t" ; @@ -652,21 +830,16 @@ oper vV oper vByta : Str -> Verbum = \by -> {s = table { - VF (Pres Ind Act) => by + "ter" ; - VF (Pres Ind Pass) => variants {by + "ts" ; by + "tes"} ; - VF (Pres Cnj Act) => by + "te" ; - VF (Pres Cnj Pass) => by + "tes" ; - VF (Pret Ind Act) => by + "tte" ; - VF (Pret Ind Pass) => by + "ttes" ; - VF (Pret Cnj Act) => by + "tte" ; - VF (Pret Cnj Pass) => by + "ttes" ; - VF Imper => by + "t" ; + VF (Pres Act) => by + "ter" ; + VF (Pres Pass) => variants {by + "ts" ; by + "tes"} ; + VF (Pret Act) => by + "tte" ; + VF (Pret Pass) => by + "ttes" ; + VF (Imper Act) => by + "t" ; + VF (Imper Pass) => by + "ts" ; VI (Inf Act) => by + "ta" ; VI (Inf Pass) => by + "tas" ; VI (Supin Act) => by + "tt" ; VI (Supin Pass) => by + "tts" ; - VI (PtPres Nom) => by + "tande" ; - VI (PtPres Gen) => by + "tandes" ; VI (PtPret (Strong (ASg Utr)) Nom) => by + "tt" ; VI (PtPret (Strong (ASg Utr)) Gen) => by + "tts" ; VI (PtPret (Strong (ASg Neutr)) Nom) => by + "tt" ; @@ -682,55 +855,18 @@ oper vByta : Str -> Verbum = \by -> } } ; -oper vGömma : Str -> Verbum = \göm -> - {s = table { - VF (Pres Ind Act) => göm + "mer" ; - VF (Pres Ind Pass) => variants {göm + "s" ; göm + "mes"} ; - VF (Pres Cnj Act) => göm + "me" ; - VF (Pres Cnj Pass) => göm + "mes" ; - VF (Pret Ind Act) => göm + "de" ; - VF (Pret Ind Pass) => göm + "des" ; - VF (Pret Cnj Act) => göm + "de" ; - VF (Pret Cnj Pass) => göm + "des" ; - VF Imper => göm ; - VI (Inf Act) => göm + "ma" ; - VI (Inf Pass) => göm + "mas" ; - VI (Supin Act) => göm + "t" ; - VI (Supin Pass) => göm + "ts" ; - VI (PtPres Nom) => göm + "mande" ; - VI (PtPres Gen) => göm + "mandes" ; - VI (PtPret (Strong (ASg Utr)) Nom) => göm + "d" ; - VI (PtPret (Strong (ASg Utr)) Gen) => göm + "ds" ; - VI (PtPret (Strong (ASg Neutr)) Nom) => göm + "t" ; - VI (PtPret (Strong (ASg Neutr)) Gen) => göm + "ts" ; - VI (PtPret (Strong APl) Nom) => göm + "da" ; - VI (PtPret (Strong APl) Gen) => göm + "das" ; - VI (PtPret (Weak (AxSg NoMasc)) Nom) => göm + "da" ; - VI (PtPret (Weak (AxSg NoMasc)) Gen) => göm + "das" ; - VI (PtPret (Weak (AxSg Masc)) Nom) => göm + "de" ; - VI (PtPret (Weak (AxSg Masc)) Gen) => göm + "des" ; - VI (PtPret (Weak AxPl) Nom) => göm + "da" ; - VI (PtPret (Weak AxPl) Gen) => göm + "das" - } - } ; - oper vHyra : Str -> Verbum = \hyr -> {s = table { - VF (Pres Ind Act) => hyr ; - VF (Pres Ind Pass) => variants {hyr + "s" ; hyr + "es"} ; - VF (Pres Cnj Act) => hyr + "e" ; - VF (Pres Cnj Pass) => hyr + "es" ; - VF (Pret Ind Act) => hyr + "de" ; - VF (Pret Ind Pass) => hyr + "des" ; - VF (Pret Cnj Act) => hyr + "de" ; - VF (Pret Cnj Pass) => hyr + "des" ; - VF Imper => hyr ; + VF (Pres Act) => hyr ; + VF (Pres Pass) => variants {hyr + "s" ; hyr + "es"} ; + VF (Pret Act) => hyr + "de" ; + VF (Pret Pass) => hyr + "des" ; + VF (Imper Act) => hyr ; + VF (Imper Pass) => hyr + "s" ; VI (Inf Act) => hyr + "a" ; VI (Inf Pass) => hyr + "as" ; VI (Supin Act) => hyr + "t" ; VI (Supin Pass) => hyr + "ts" ; - VI (PtPres Nom) => hyr + "ande" ; - VI (PtPres Gen) => hyr + "andes" ; VI (PtPret (Strong (ASg Utr)) Nom) => hyr + "d" ; VI (PtPret (Strong (ASg Utr)) Gen) => hyr + "ds" ; VI (PtPret (Strong (ASg Neutr)) Nom) => hyr + "t" ; @@ -746,70 +882,6 @@ oper vHyra : Str -> Verbum = \hyr -> } } ; -oper vTåla : Str -> Verbum = \tål -> - {s = table { - VF (Pres Ind Act) => tål ; - VF (Pres Ind Pass) => variants {tål + "s" ; tål + "es"} ; - VF (Pres Cnj Act) => tål + "e" ; - VF (Pres Cnj Pass) => tål + "es" ; - VF (Pret Ind Act) => tål + "de" ; - VF (Pret Ind Pass) => tål + "des" ; - VF (Pret Cnj Act) => tål + "de" ; - VF (Pret Cnj Pass) => tål + "des" ; - VF Imper => tål ; - VI (Inf Act) => tål + "a" ; - VI (Inf Pass) => tål + "as" ; - VI (Supin Act) => tål + "t" ; - VI (Supin Pass) => tål + "ts" ; - VI (PtPres Nom) => tål + "ande" ; - VI (PtPres Gen) => tål + "andes" ; - VI (PtPret (Strong (ASg Utr)) Nom) => tål + "d" ; - VI (PtPret (Strong (ASg Utr)) Gen) => tål + "ds" ; - VI (PtPret (Strong (ASg Neutr)) Nom) => tål + "t" ; - VI (PtPret (Strong (ASg Neutr)) Gen) => tål + "ts" ; - VI (PtPret (Strong APl) Nom) => tål + "da" ; - VI (PtPret (Strong APl) Gen) => tål + "das" ; - VI (PtPret (Weak (AxSg NoMasc)) Nom) => tål + "da" ; - VI (PtPret (Weak (AxSg NoMasc)) Gen) => tål + "das" ; - VI (PtPret (Weak (AxSg Masc)) Nom) => tål + "de" ; - VI (PtPret (Weak (AxSg Masc)) Gen) => tål + "des" ; - VI (PtPret (Weak AxPl) Nom) => tål + "da" ; - VI (PtPret (Weak AxPl) Gen) => tål + "das" - } - } ; - -oper vFinna : (_,_,_ : Str) -> Verbum = \finn, fann, funn -> - {s = table { - VF (Pres Ind Act) => finn + "er" ; - VF (Pres Ind Pass) => variants {finn + "s" ; finn + "es"} ; - VF (Pres Cnj Act) => finn + "e" ; - VF (Pres Cnj Pass) => finn + "es" ; - VF (Pret Ind Act) => fann ; - VF (Pret Ind Pass) => fann + "s" ; - VF (Pret Cnj Act) => funn + "e" ; - VF (Pret Cnj Pass) => funn + "es" ; - VF Imper => finn ; - VI (Inf Act) => finn + "a" ; - VI (Inf Pass) => finn + "as" ; - VI (Supin Act) => funn + "it" ; - VI (Supin Pass) => funn + "its" ; - VI (PtPres Nom) => finn + "ande" ; - VI (PtPres Gen) => finn + "andes" ; - VI (PtPret (Strong (ASg Utr)) Nom) => funn + "en" ; - VI (PtPret (Strong (ASg Utr)) Gen) => funn + "ens" ; - VI (PtPret (Strong (ASg Neutr)) Nom) => funn + "et" ; - VI (PtPret (Strong (ASg Neutr)) Gen) => funn + "ets" ; - VI (PtPret (Strong APl) Nom) => funn + "a" ; - VI (PtPret (Strong APl) Gen) => funn + "as" ; - VI (PtPret (Weak (AxSg NoMasc)) Nom) => funn + "a" ; - VI (PtPret (Weak (AxSg NoMasc)) Gen) => funn + "as" ; - VI (PtPret (Weak (AxSg Masc)) Nom) => funn + "e" ; - VI (PtPret (Weak (AxSg Masc)) Gen) => funn + "es" ; - VI (PtPret (Weak AxPl) Nom) => funn + "a" ; - VI (PtPret (Weak AxPl) Gen) => funn + "as" - } - } ; - -- machine-generated exceptional inflection tables from rules.Swe.gf oper mor_1 : Subst = @@ -1065,86 +1137,18 @@ oper liten_1146 : Adj = } } ; -oper giva_1147 : Verbum = - {s = table { - VF (Pres Ind Act) => variants {"giver" ; "ger"} ; - VF (Pres Ind Pass) => variants {"gives" ; "givs" ; "ges"} ; - VF (Pres Conj Act) => "give" ; - VF (Pres Conj Pass) => "gives" ; - VF (Pret Ind Act) => "gav" ; - VF (Pret Ind Pass) => "gavs" ; - VF (Pret Conj Act) => "give" ; - VF (Pret Conj Pass) => "gives" ; - VF Imper => variants {"giv" ; "ge"} ; - VI (Inf Act) => variants {"giva" ; "ge"} ; - VI (Inf Pass) => variants {"givas" ; "ges"} ; - VI (Supin Act) => "givit" ; - VI (Supin Pass) => "givits" ; - VI (PtPres Nom) => "givande" ; - VI (PtPres Gen) => "givandes" ; - VI (PtPret (Strong (ASg Utr)) Nom) => "given" ; - VI (PtPret (Strong (ASg Utr)) Gen) => "givens" ; - VI (PtPret (Strong (ASg Neutr)) Nom) => "givet" ; - VI (PtPret (Strong (ASg Neutr)) Gen) => "givets" ; - VI (PtPret (Strong APl) Nom) => "givna" ; - VI (PtPret (Strong APl) Gen) => "givnas" ; - VI (PtPret (Weak (AxSg NoMasc)) Nom) => "givna" ; - VI (PtPret (Weak (AxSg NoMasc)) Gen) => "givnas" ; - VI (PtPret (Weak (AxSg Masc)) Nom) => "givne" ; - VI (PtPret (Weak (AxSg Masc)) Gen) => "givnes" ; - VI (PtPret (Weak AxPl) Nom) => "givna" ; - VI (PtPret (Weak AxPl) Gen) => "givnas" - } - } ; - -oper gå_1174 : Verbum = - {s = table { - VF (Pres Ind Act) => "går" ; - VF (Pres Ind Pass) => "gås" ; - VF (Pres Cnj Act) => "gå" ; - VF (Pres Cnj Pass) => "gås" ; - VF (Pret Ind Act) => "gick" ; - VF (Pret Ind Pass) => "gicks" ; - VF (Pret Cnj Act) => "ginge" ; - VF (Pret Cnj Pass) => "ginges" ; - VF Imper => "gå" ; - VI (Inf Act) => "gå" ; - VI (Inf Pass) => "gås" ; - VI (Supin Act) => "gått" ; - VI (Supin Pass) => "gåtts" ; - VI (PtPres Nom) => "gående" ; - VI (PtPres Gen) => "gåendes" ; - VI (PtPret (Strong (ASg Utr)) Nom) => "gången" ; - VI (PtPret (Strong (ASg Utr)) Gen) => "gångens" ; - VI (PtPret (Strong (ASg Neutr)) Nom) => "gånget" ; - VI (PtPret (Strong (ASg Neutr)) Gen) => "gångets" ; - VI (PtPret (Strong APl) Nom) => "gångna" ; - VI (PtPret (Strong APl) Gen) => "gångnas" ; - VI (PtPret (Weak (AxSg NoMasc)) Nom) => "gångna" ; - VI (PtPret (Weak (AxSg NoMasc)) Gen) => "gångnas" ; - VI (PtPret (Weak (AxSg Masc)) Nom) => "gångne" ; - VI (PtPret (Weak (AxSg Masc)) Gen) => "gångnes" ; - VI (PtPret (Weak AxPl) Nom) => "gångna" ; - VI (PtPret (Weak AxPl) Gen) => "gångnas" - } - } ; oper hava_1198 : Verbum = {s = table { - VF (Pres Ind Act) => variants {"haver" ; "har"} ; - VF (Pres Ind Pass) => variants {"havs" ; "has"} ; - VF (Pres Conj Act) => "have" ; - VF (Pres Conj Pass) => "haves" ; - VF (Pret Ind Act) => "hade" ; - VF (Pret Ind Pass) => "hades" ; - VF (Pret Conj Act) => "hade" ; - VF (Pret Conj Pass) => "hades" ; - VF Imper => variants {"hav" ; "ha"} ; - VI (Inf Act) => variants {"hava" ; "ha"} ; - VI (Inf Pass) => variants {"havas" ; "has"} ; + VF (Pres Act) => "har" ; + VF (Pres Pass) => "has" ; + VF (Pret Act) => "hade" ; + VF (Pret Pass) => "hades" ; + VF (Imper Act) => "ha" ; + VF (Imper Pass) => "has" ; + VI (Inf Act) => "ha" ; + VI (Inf Pass) => "has" ; VI (Supin Act) => "haft" ; VI (Supin Pass) => "hafts" ; - VI (PtPres Nom) => "havande" ; - VI (PtPres Gen) => "havandes" ; VI (PtPret (Strong (ASg Utr)) Nom) => variants {} ; VI (PtPret (Strong (ASg Utr)) Gen) => variants {} ; VI (PtPret (Strong (ASg Neutr)) Nom) => variants {} ; @@ -1162,21 +1166,15 @@ oper hava_1198 : Verbum = oper vara_1200 : Verbum = {s = table { - VF (Pres Ind Act) => "är" ; - VF (Pres Ind Pass) => variants {} ; - VF (Pres Conj Act) => "vare" ; - VF (Pres Conj Pass) => variants {} ; - VF (Pret Ind Act) => "var" ; - VF (Pret Ind Pass) => variants {} ; - VF (Pret Conj Act) => "vore" ; - VF (Pret Conj Pass) => variants {} ; - VF Imper => "var" ; + VF (Pres Act) => "är" ; + VF (Pres Pass) => variants {} ; + VF (Pret Act) => "var" ; + VF (Pret Pass) => variants {} ; + VF (Imper _) => "var" ; VI (Inf Act) => "vara" ; VI (Inf Pass) => variants {} ; VI (Supin Act) => "varit" ; VI (Supin Pass) => variants {} ; - VI (PtPres Nom) => "varande" ; - VI (PtPres Gen) => "varandes" ; VI (PtPret (Strong (ASg Utr)) Nom) => variants {} ; VI (PtPret (Strong (ASg Utr)) Gen) => variants {} ; VI (PtPret (Strong (ASg Neutr)) Nom) => variants {} ; @@ -1205,6 +1203,4 @@ oper regTal : Str -> LinDigit = \fem -> mkTal fem (fem + "ton") (fem + "tio") ; - - } diff --git a/lib/resource/swedish/NewParadigmsSwe.gf b/lib/resource/swedish/NewParadigmsSwe.gf new file mode 100644 index 000000000..ce06aa005 --- /dev/null +++ b/lib/resource/swedish/NewParadigmsSwe.gf @@ -0,0 +1,348 @@ +--# -path=.:../scandinavian:../abstract:../../prelude + +--1 Swedish Lexical Paradigms UNDER RECONSTRUCTION! +-- +-- Aarne Ranta 2003 +-- +-- This is an API to the user of the resource grammar +-- for adding lexical items. It gives functions for forming +-- expressions of open categories: nouns, adjectives, verbs. +-- +-- Closed categories (determiners, pronouns, conjunctions) are +-- accessed through the resource syntax API, $Structural.gf$. +-- +-- The main difference with $MorphoEng.gf$ is that the types +-- referred to are compiled resource grammar types. We have moreover +-- had the design principle of always having existing forms, rather +-- than stems, as string arguments of the paradigms. +-- +-- The structure of functions for each word class $C$ is the following: +-- first we give a handful of patterns that aim to cover all +-- regular cases. Then we give a worst-case function $mkC$, which serves as an +-- escape to construct the most irregular words of type $C$. +-- However, this function should only seldom be needed: we have a +-- separate module $IrregularEng$, which covers all irregularly inflected +-- words. +-- +-- The following modules are presupposed: + +resource NewParadigmsSwe = + open (Predef=Predef), Prelude, TypesSwe, MorphoSwe, SyntaxSwe, ResourceSwe in { + +--2 Parameters +-- +-- To abstract over gender names, we define the following identifiers. + +oper + Gender : Type ; + + utrum : Gender ; + neutrum : Gender ; + +-- To abstract over number names, we define the following. + + Number : Type ; + + singular : Number ; + plural : Number ; + +-- To abstract over case names, we define the following. + + Case : Type ; + + nominative : Case ; + genitive : Case ; + +-- Prepositions used in many-argument functions are just strings. + + Preposition : Type = Str ; + +--2 Nouns + +-- Worst case: give all four forms. The gender is computed from the +-- last letter of the second form (if "n", then $utrum$, otherwise $neutrum$). + + mkN : (apa,apan,apor,aporna : Str) -> N ; + +-- The regular function takes the singular indefinite form and the gender, +-- and computes the other forms by a heuristic. +-- If in doubt, use the $cc$ command to test! + + regN : Str -> Gender -> N ; + +-- In practice the worst case is often just: give singular and plural indefinite. + + mk2N : (nyckel,nycklar : Str) -> N ; + +-- All nouns created by the previous functions are marked as +-- $nonmasculine$. If you want a $masculine$ noun, wrap it with the following +-- function: + + mascN : N -> N ; + +--3 Compound nouns +-- +-- All the functions above work quite as well to form compound nouns, +-- such as "fotboll". + + +--3 Relational nouns +-- +-- Relational nouns ("daughter of x") need a preposition. + + mkN2 : N -> Preposition -> N2 ; + +-- The most common preposition is "av", and the following is a +-- shortcut for regular, $nonhuman$ relational nouns with "av". + + regN2 : Str -> Gender -> N2 ; + +-- Use the function $mkPreposition$ or see the section on prepositions below to +-- form other prepositions. +-- +-- Three-place relational nouns ("the connection from x to y") need two prepositions. + + mkN3 : N -> Preposition -> Preposition -> N3 ; + + +--3 Relational common noun phrases +-- +-- In some cases, you may want to make a complex $CN$ into a +-- relational noun (e.g. "the old town hall of"). + + cnN2 : CN -> Preposition -> N2 ; + cnN3 : CN -> Preposition -> Preposition -> N3 ; + +-- +--3 Proper names and noun phrases +-- +-- Proper names, with a regular genitive, are formed as follows + + regPN : Str -> Gender -> PN ; -- John, John's + +-- To form a noun phrase that can also be plural and have an irregular +-- genitive, you can use the worst-case function. + + mkNP : Str -> Str -> Number -> Gender -> NP ; + +--2 Adjectives + +-- Non-comparison one-place adjectives need for forms: + + mkA : (galen,galet,galna : Str) -> A ; + +-- For regular adjectives, the other forms are derived. + + regA : Str -> A ; + +-- In practice, two forms are enough. + + mk2A : (bred,brett : Str) -> A ; + +--3 Two-place adjectives +-- +-- Two-place adjectives need a preposition for their second argument. + + mkA2 : A -> Preposition -> A2 ; + +-- Comparison adjectives may need as many as seven forms. + + mkADeg : (liten, litet, lilla, sma, mindre, minst, minsta : Str) -> ADeg ; + +-- The regular pattern works for many adjectives, e.g. those ending +-- with "ig". + + regADeg : Str -> ADeg ; + +-- Just the comparison forms can be irregular. + + irregADeg : (tung,tyngre,tyngst : Str) -> ADeg ; + +-- Sometimes just the positive forms are irregular. + + mk3ADeg : (galen,galet,galna : Str) -> ADeg ; + mk2ADeg : (bred,brett : Str) -> ADeg ; + +-- If comparison is formed by "more, "most", as in general for +-- long adjective, the following pattern is used: + + compoundADeg : A -> ADeg ; -- -/more/most ridiculous + +-- From a given $ADeg$, it is possible to get back to $A$. + + adegA : ADeg -> A ; + + +--2 Adverbs + +-- Adverbs are not inflected. Most lexical ones have position +-- after the verb. Some can be preverbal (e.g. "always"). + + mkAdv : Str -> Adv ; + mkAdV : Str -> AdV ; + +-- Adverbs modifying adjectives and sentences can also be formed. + + mkAdA : Str -> AdA ; + +--2 Prepositions +-- +-- A preposition is just a string. + + mkPreposition : Str -> Preposition ; + +--2 Verbs +-- +-- The worst case needs five forms. + + mkV : (supa,super,sup,söp,supit,supen : Str) -> V ; + +-- The 'regular verb' function is the first conjugation. + + regV : (tala : Str) -> V ; + +-- The almost regular verb function needs the infinitive and the present. + + mk2V : (leka,leker : Str) -> V ; + +-- There is an extensive list of irregular verbs in the module $IrregularSwe$. +-- In practice, it is enough to give three forms, as in school books. + + irregV : (dricka, drack, druckit : Str) -> V ; + + +--3 Verbs with a particle. +-- +-- The particle, such as in "switch on", is given as a string. + + partV : V -> Str -> V ; + +--3 Deponent verbs. +-- +-- Some words are used in passive forms only, e.g. "hoppas". + + depV : V -> V ; + +--3 Two-place verbs +-- +-- Two-place verbs need a preposition, except the special case with direct object. +-- (transitive verbs). Notice that a particle comes from the $V$. + + mkV2 : V -> Preposition -> V2 ; + + dirV2 : V -> V2 ; + +--3 Three-place verbs +-- +-- Three-place (ditransitive) verbs need two prepositions, of which +-- the first one or both can be absent. + + mkV3 : V -> Str -> Str -> V3 ; -- speak, with, about + dirV3 : V -> Str -> V3 ; -- give,_,to + dirdirV3 : V -> V3 ; -- give,_,_ + +--3 Other complement patterns +-- +-- Verbs and adjectives can take complements such as sentences, +-- questions, verb phrases, and adjectives. + + mkV0 : V -> V0 ; + mkVS : V -> VS ; + mkV2S : V -> Str -> V2S ; + mkVV : V -> VV ; + mkV2V : V -> Str -> Str -> V2V ; + mkVA : V -> VA ; + mkV2A : V -> Str -> V2A ; + mkVQ : V -> VQ ; + mkV2Q : V -> Str -> V2Q ; + + mkAS : A -> AS ; + mkA2S : A -> Str -> A2S ; + mkAV : A -> AV ; + mkA2V : A -> Str -> A2V ; + + +--2 Definitions of the paradigms +-- +-- The definitions should not bother the user of the API. So they are +-- hidden from the document. +--. + + Gender = SyntaxSwe.NounGender ; + Number = TypesSwe.Number ; + Case = TypesSwe.Case ; + utrum = NUtr NoMasc ; + neutrum = NNeutr ; + singular = Sg ; + plural = Pl ; + nominative = Nom ; + genitive = Gen ; + + mkN x y z u = extCommNoun (mkNoun x y z u) ** {lock_N = <>} ; + regN x g = extCommNoun (regNoun x (genNoun g)) ** {lock_N = <>} ; + mk2N x g = extCommNoun (reg2Noun x g) ** {lock_N = <>} ; + mascN n = {s = n.s ; g = NUtr Masc ; lock_N = <>} ; + + mkN2 = \n,p -> UseN n ** {lock_N2 = <> ; s2 = p} ; + regN2 n g = mkN2 (regN n g) (mkPreposition "av") ; + mkN3 = \n,p,q -> UseN n ** {lock_N3 = <> ; s2 = p ; s3 = q} ; + cnN2 = \n,p -> n ** {lock_N2 = <> ; s2 = p} ; + cnN3 = \n,p,q -> n ** {lock_N3 = <> ; s2 = p ; s3 = q} ; + + regPN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ; + mkNP x y n g = + {s = table {PGen _ => x ; _ => y} ; g = genNoun g ; n = n ; p = P3 ; + lock_NP = <>} ; + + mkA a b c = extractPositive (adjAlmostReg a b c) ** {lock_A = <>} ; + mk2A a b = extractPositive (adj2Reg a b) ** {lock_A = <>} ; + regA a = extractPositive (adjReg a) ** {lock_A = <>} ; + + mkA2 a p = a ** {s2 = p ; lock_A2 = <>} ; + + mkADeg a b c d e f g = mkAdjective a b c d e f g ** {lock_ADeg = <>} ; + regADeg a = adjReg a ** {lock_ADeg = <>} ; + irregADeg a b c = adjIrreg3 a b c ** {lock_ADeg = <>} ; + mk3ADeg a b c = adjAlmostReg a b c ** {lock_ADeg = <>} ; + mk2ADeg a b = adj2Reg a b ** {lock_ADeg = <>} ; + + mkAdv x = ss x ** {lock_Adv = <>} ; + mkAdV x = ss x ** {lock_AdV = <>} ; + mkAdA x = ss x ** {lock_AdA = <>} ; + + mkPreposition p = p ; + + mkV a b c d e f = mkVerb a b c d e f ** {s1 = [] ; lock_V = <>} ; + + regV a = mk2V a (a + "r") ; + mk2V a b = regVerb a b ** {s1 = [] ; lock_V = <>} ; + + irregV x y z = vSälja x y z + ** {s1 = [] ; lock_V = <>} ; + + partV v p = {s = v.s ; s1 = p ; lock_V = <>} ; + depV v = deponentVerb v ** {lock_V = <>} ; + + mkV2 v p = v ** {s = v.s ; s1 = v.s1 ; s2 = p ; lock_V2 = <>} ; + dirV2 v = mkV2 v [] ; + + mkV3 v p q = v ** {s = v.s ; s1 = v.s1 ; s2 = p ; s3 = q ; lock_V3 = <>} ; + dirV3 v p = mkV3 v [] p ; + dirdirV3 v = dirV3 v [] ; + + mkV0 v = v ** {lock_V0 = <>} ; + mkVS v = v ** {lock_VS = <>} ; + mkV2S v p = mkV2 v p ** {lock_V2S = <>} ; + mkVV v = v ** {s3 = "att" ; lock_VV = <>} ; + mkV2V v p t = mkV2 v p ** {s3 = t ; lock_V2V = <>} ; + mkVA v = v ** {lock_VA = <>} ; + mkV2A v p = mkV2 v p ** {lock_V2A = <>} ; + mkVQ v = v ** {lock_VQ = <>} ; + mkV2Q v p = mkV2 v p ** {lock_V2Q = <>} ; + + mkAS v = v ** {lock_AS = <>} ; + mkA2S v p = mkA2 v p ** {lock_A2S = <>} ; + mkAV v = v ** {lock_AV = <>} ; + mkA2V v p = mkA2 v p ** {lock_A2V = <>} ; + +} ; diff --git a/lib/resource/swedish/RulesSwe.gf b/lib/resource/swedish/RulesSwe.gf index 480bb8c21..0dedf1490 100644 --- a/lib/resource/swedish/RulesSwe.gf +++ b/lib/resource/swedish/RulesSwe.gf @@ -1,4 +1,4 @@ --# -path=.:../scandinavian:../abstract:../../prelude -concrete RulesSwe of Rules = +concrete RulesSwe of Rules = CategoriesSwe ** RulesScand with (SyntaxScand=SyntaxSwe) ; diff --git a/lib/resource/swedish/SyntaxSwe.gf b/lib/resource/swedish/SyntaxSwe.gf index 9bf8704df..5ac4eec5b 100644 --- a/lib/resource/swedish/SyntaxSwe.gf +++ b/lib/resource/swedish/SyntaxSwe.gf @@ -26,17 +26,6 @@ instance SyntaxSwe of SyntaxScand = TypesSwe ** => Weak AxPl } ; - deponentVerb : Verb -> Verb = \finna -> { - s = table { - VF (Pres m _) => finna.s ! VF (Pres m Pass) ; - VF (Pret m _) => finna.s ! VF (Pret m Pass) ; - VI (Inf _) => finna.s ! VI (Inf Pass) ; - VI (Supin _) => finna.s ! VI (Supin Pass) ; - v => finna.s ! v --- Imper ! - } ; - s1 = finna.s1 - } ; - verbVara = vara_1200 ** {s1 = []} ; verbHava = hava_1198 ** {s1 = []}; @@ -118,10 +107,6 @@ instance SyntaxSwe of SyntaxScand = TypesSwe ** -- next - adjPastPart : Verb -> Adjective = \verb -> { - s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret af c) --- på slagen - } ; - reflPron : Number -> Person -> Str = \n,p -> case of { => "mig" ; => "dig" ; @@ -135,4 +120,14 @@ instance SyntaxSwe of SyntaxScand = TypesSwe ** (mkVerb "hålla" "håller" "håll" "höll" "hållit" "hållen" ** {s3 = ["på att"]}) (predVerbGroup True Simul verb) ; + + strPrep : ComplPrep -> Str = \p -> case p of { + CPnoPrep => [] ; + CPav => "av" ; + CPför => "för" ; + CPi => "i" ; + CPom => "om" ; + CPpå => "på" ; + CPtill => "till" + } ; } diff --git a/lib/resource/swedish/TestResourceSwe.gf b/lib/resource/swedish/TestResourceSwe.gf index 1f3e51d84..b5220e8fc 100644 --- a/lib/resource/swedish/TestResourceSwe.gf +++ b/lib/resource/swedish/TestResourceSwe.gf @@ -1,7 +1,7 @@ --# -path=.:../scandinavian:../abstract:../../prelude concrete TestResourceSwe of TestResource = --- RulesSwe, +RulesSwe, ClauseSwe, StructuralSwe ** @@ -28,17 +28,17 @@ lin House = extCommNoun (sHus "hus") ; Light = extCommNoun (sHus "ljus") ; Wine = extCommNoun (sParti "vin") ; - Walk = vNopart gå_1174 ; + Walk = vNopart (mkVerb "gå" "går" "gå" "gick" "gått" "gången") ; Run = vNopart (vFinna "spring" "sprang" "sprung") ; Drink = extTransVerb (vFinna "drick" "drack" "druck") [] ; Love = extTransVerb (vNopart (vTala "älsk")) [] ; Send = extTransVerb (vNopart (vTala "skick")) [] ; Wait = extTransVerb (vNopart (vTala "vänt")) "på" ; - Give = extTransVerb (vNopart (vFinna "giv" "gav" "giv")) [] ** {s3 = "till"} ; --- ge + Give = extTransVerb (vNopart (mkVerb "ge" "ger" "ge" "gav" "givit" "given")) [] ** {s3 = "till"} ; Prefer = extTransVerb (vNopart (vFinna "föredrag" "föredrog" "föredrag")) [] ** {s3 = "framför"} ; --- föredra - Say = vNopart (vLeka "säg") ; --- works in present tense... + Say = vNopart (mkVerb "säga" "säger" "säg" "sade" "sagt" "sagd") ; Prove = vNopart (vTala "bevis") ; SwitchOn = mkDirectVerb (vFinna "sätt" "satte" "satt" ** {s1 = "på"}) ; SwitchOff = mkDirectVerb (vLeka "stäng" ** {s1 = "av"}) ; diff --git a/lib/resource/swedish/TypesSwe.gf b/lib/resource/swedish/TypesSwe.gf index b46f04422..3eae93c12 100644 --- a/lib/resource/swedish/TypesSwe.gf +++ b/lib/resource/swedish/TypesSwe.gf @@ -23,14 +23,4 @@ oper param AdjFormPos = Strong GenNum | Weak SexNum ; - VFin = - Pres Mode Voice - | Pret Mode Voice - | Imper ; --- no passive - - VInf = - Inf Voice - | Supin Voice - | PtPres Case - | PtPret AdjFormPos Case ; } diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs index 3b6f44d87..2c8016a61 100644 --- a/src/GF/Compile/Compile.hs +++ b/src/GF/Compile/Compile.hs @@ -165,12 +165,13 @@ extendCompileEnvCanon ((k,s,c),fts) cgr ft = type TimedCompileEnv = (CompileEnv,[(FilePath,ModTime)]) compileOne :: Options -> TimedCompileEnv -> FullPath -> IOE TimedCompileEnv -compileOne opts env file = do +compileOne opts env@((_,srcgr,_),_) file = do let putp = putPointE opts let gf = fileSuffix file let path = justInitPath file let name = fileBody file + let mos = modules srcgr case gf of -- for multilingual canonical gf, just read the file and update environment @@ -188,12 +189,13 @@ compileOne opts env file = do -- for compiled resource, parse and organize, then update environment "gfr" -> do - sm0 <- putp ("| parsing" +++ file) $ getSourceModule file - let mos = case env of ((_,gr,_),_) -> modules gr + sm0 <- putp ("| parsing" +++ file) $ getSourceModule file sm <- {- putp "creating indirections" $ -} ioeErr $ extendModule mos sm0 +---- experiment with not optimizing gfr +---- sm:_ <- putp " optimizing " $ ioeErr $ evalModule mos sm1 let gfc = gfcFile name - cm <- putp ("+ reading" +++ gfc) $ getCanonModule gfc - ft <- getReadTimes file + cm <- putp ("+ reading" +++ gfc) $ getCanonModule gfc + ft <- getReadTimes file extendCompileEnv env (sm,cm) ft -- for gf source, do full compilation @@ -202,7 +204,12 @@ compileOne opts env file = do (k',sm) <- makeSourceModule opts (fst env) sm0 cm <- putp " generating code... " $ generateModuleCode opts path sm ft <- getReadTimes file - extendCompileEnvInt env (k',sm,cm) ft + + sm':_ <- case snd sm of +---- ModMod n | isModRes n -> putp " optimizing " $ ioeErr $ evalModule mos sm + _ -> return [sm] + + extendCompileEnvInt env (k',sm',cm) ft -- dispatch reused resource at early stage @@ -255,8 +262,11 @@ compileSourceModule opts env@(k,gr,can) mo@(i,mi) = do (k',mo3r:_) <- ioeErr $ refreshModule (k,mos) mo3 - mo4:_ <- putp " optimizing " $ ioeErr $ evalModule mos mo3r - + mo4:_ <- +---- case snd mo1b of +---- ModMod n | isModCnc n -> + putp " optimizing " $ ioeErr $ evalModule mos mo3r +---- _ -> return [mo3r] return (k',mo4) where ---- prDebug mo = ioeIO $ putStrLn $ prGrammar $ MGrammar [mo] ---- debug diff --git a/src/GF/Compile/Extend.hs b/src/GF/Compile/Extend.hs index e0c56e31f..3f2570570 100644 --- a/src/GF/Compile/Extend.hs +++ b/src/GF/Compile/Extend.hs @@ -31,6 +31,12 @@ import Monad extendModule :: [SourceModule] -> SourceModule -> Err SourceModule extendModule ms (name,mod) = case mod of + + ---- Just to allow inheritance in incomplete concrete (which are not + ---- compiled anyway), extensions are not built for them. + ---- Should be replaced by real control. AR 4/2/2005 + ModMod m | mstatus m == MSIncomplete && isModCnc m -> return (name,mod) + ModMod m -> do mod' <- foldM extOne m (extends m) return (name,ModMod mod') @@ -42,10 +48,11 @@ extendModule ms (name,mod) = case mod of -- test that the module types match, and find out if the old is complete testErr (sameMType (mtype m) mt) ("illegal extension type to module" +++ prt name) - return (m,isCompleteModule m) + return (m, isCompleteModule m) +---- return (m, if (isCompleteModule m) then True else not (isCompleteModule mod)) -- build extension in a way depending on whether the old module is complete - js1 <- extendMod isCompl n (jments m0) js + js1 <- extendMod isCompl n name (jments m0) js -- if incomplete, throw away extension information let me' = if isCompl then es else (filter (/=n) es) @@ -55,11 +62,11 @@ extendModule ms (name,mod) = case mod of -- and the process is interrupted if unification fails. -- If the extended module is incomplete, its judgements are just copied. -extendMod :: Bool -> Ident -> BinTree (Ident,Info) -> BinTree (Ident,Info) -> +extendMod :: Bool -> Ident -> Ident -> BinTree (Ident,Info) -> BinTree (Ident,Info) -> Err (BinTree (Ident,Info)) -extendMod isCompl name old new = foldM try new $ tree2list old where +extendMod isCompl name base old new = foldM try new $ tree2list old where try t i@(c,_) = errIn ("constant" +++ prt c) $ - tryInsert (extendAnyInfo isCompl name) indirIf t i + tryInsert (extendAnyInfo isCompl name base) indirIf t i indirIf = if isCompl then indirInfo name else id indirInfo :: Ident -> Info -> Info @@ -76,8 +83,9 @@ perhIndir n p = case p of Yes _ -> May n _ -> p -extendAnyInfo :: Bool -> Ident -> Info -> Info -> Err Info -extendAnyInfo isc n i j = errIn ("building extension for" +++ prt n) $ case (i,j) of +extendAnyInfo :: Bool -> Ident -> Ident -> Info -> Info -> Err Info +extendAnyInfo isc n o i j = + errIn ("building extension for" +++ prt n +++ "in" +++ prt o) $ case (i,j) of (AbsCat mc1 mf1, AbsCat mc2 mf2) -> liftM2 AbsCat (updn isc n mc1 mc2) (updn isc n mf1 mf2) --- add cstrs (AbsFun mt1 md1, AbsFun mt2 md2) -> @@ -107,7 +115,8 @@ extendAnyInfo isc n i j = errIn ("building extension for" +++ prt n) $ case (i,j --- where -updn isc n = if isc then (updatePerhaps n) else (updatePerhapsHard n) +updn isc n = if isc then (updatePerhaps n) else (updatePerhapsHard n) +updc isc n = if True then (updatePerhaps n) else (updatePerhapsHard n) diff --git a/src/GF/Compile/Rebuild.hs b/src/GF/Compile/Rebuild.hs index 815f6aa46..bdd759fa0 100644 --- a/src/GF/Compile/Rebuild.hs +++ b/src/GF/Compile/Rebuild.hs @@ -9,7 +9,7 @@ -- > CVS $Author $ -- > CVS $Revision $ -- --- (Description of the module) +-- Rebuild a source module from incomplete and its with-instance. ----------------------------------------------------------------------------- module Rebuild where @@ -45,7 +45,7 @@ rebuildModule ms mo@(i,mi) = do m1 <- lookupModMod gr i0 testErr (isModRes m1) ("interface expected instead of" +++ prt i0) m' <- do - js' <- extendMod False i0 (jments m1) (jments m) + js' <- extendMod False i0 i (jments m1) (jments m) --- to avoid double inclusions, in instance I of I0 = J0 ** ... case extends m of [] -> return $ replaceJudgements m js' @@ -60,14 +60,14 @@ rebuildModule ms mo@(i,mi) = do _ -> return mi -- add the instance opens to an incomplete module "with" instances - ModWith mt stat ext ops -> do + ModWith mt stat ext me ops -> do let insts = [(inf,inst) | OQualif _ inf inst <- ops] let infs = map fst insts let stat' = ifNull MSComplete (const MSIncomplete) [i | i <- is, notElem i infs] testErr (stat' == MSComplete || stat == MSIncomplete) ("module" +++ prt i +++ "remains incomplete") - Module mt0 _ fs me ops0 js <- lookupModMod gr ext + Module mt0 _ fs me' ops0 js <- lookupModMod gr ext let ops1 = ops ++ [o | o <- ops0, notElem (openedModule o) infs] ++ [oQualif i i | i <- map snd insts] ---- ++ [oSimple i | i <- map snd insts] ---- diff --git a/src/GF/Data/Operations.hs b/src/GF/Data/Operations.hs index 214509142..1b656f52c 100644 --- a/src/GF/Data/Operations.hs +++ b/src/GF/Data/Operations.hs @@ -192,14 +192,17 @@ mapP f p = case p of Nope -> Nope -- this is what happens when matching two values in the same module -unifPerhaps :: (Eq a, Eq b) => Perhaps a b -> Perhaps a b -> Err (Perhaps a b) +unifPerhaps :: (Eq a, Eq b, Show a, Show b) => + Perhaps a b -> Perhaps a b -> Err (Perhaps a b) unifPerhaps p1 p2 = case (p1,p2) of (Nope, _) -> return p2 (_, Nope) -> return p1 - _ -> if p1==p2 then return p1 else Bad "update conflict" + _ -> if p1==p2 then return p1 + else Bad ("update conflict between" ++++ show p1 ++++ show p2) -- this is what happens when updating a module extension -updatePerhaps :: (Eq a,Eq b) => b -> Perhaps a b -> Perhaps a b -> Err (Perhaps a b) +updatePerhaps :: (Eq a,Eq b, Show a, Show b) => + b -> Perhaps a b -> Perhaps a b -> Err (Perhaps a b) updatePerhaps old p1 p2 = case (p1,p2) of (Yes a, Nope) -> return $ may old (May older,Nope) -> return $ may older @@ -207,7 +210,7 @@ updatePerhaps old p1 p2 = case (p1,p2) of _ -> unifPerhaps p1 p2 -- here the value is copied instead of referred to; used for oper types -updatePerhapsHard :: (Eq a, Eq b) => b -> +updatePerhapsHard :: (Eq a, Eq b, Show a, Show b) => b -> Perhaps a b -> Perhaps a b -> Err (Perhaps a b) updatePerhapsHard old p1 p2 = case (p1,p2) of (Yes a, Nope) -> return $ yes a diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs index 533ba75c8..3da4bca9f 100644 --- a/src/GF/Infra/Modules.hs +++ b/src/GF/Infra/Modules.hs @@ -33,7 +33,7 @@ data MGrammar i f a = MGrammar {modules :: [(i,ModInfo i f a)]} data ModInfo i f a = ModMainGrammar (MainGrammar i) | ModMod (Module i f a) - | ModWith (ModuleType i) ModuleStatus i [OpenSpec i] + | ModWith (ModuleType i) ModuleStatus i [i] [OpenSpec i] deriving Show data Module i f a = Module { diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs index c9572d75b..65b52e602 100644 --- a/src/GF/Infra/ReadFiles.hs +++ b/src/GF/Infra/ReadFiles.hs @@ -254,10 +254,18 @@ getModuleHeader ws = case ws of ((MTyResource,name),(m,MUInstance):(n,MUComplete):[(n,MUOther) | n <- ms]) ms -> ((MTyResource,name),(m,MUInstance):[(n,MUOther) | n <- ms]) + "concrete":name:a:ws2 -> case span (/= "with") ws2 of + + (es,_:ms) -> ((MTyOther,name), + [(m,MUOther) | m <- es] ++ + [(n,MUComplete) | n <- ms]) + --- m:"with":ms -> ((MTyOther,name),(m,MUOther):[(n,MUComplete) | n <- ms]) + (ms,[]) -> ((MTyOther,name),[(n,MUOther) | n <- a:ms]) + _:name:ws2 -> case ws2 of "reuse":m:_ -> ((MTyOther,name),[(m,MUReuse)]) - m:n:"with":ms -> - ((MTyOther,name),(m,MUInstance):(n,MUOther):[(n,MUComplete) | n <- ms]) + ---- m:n:"with":ms -> + ---- ((MTyOther,name),(m,MUInstance):(n,MUOther):[(n,MUComplete) | n <- ms]) m:"with":ms -> ((MTyOther,name),(m,MUOther):[(n,MUComplete) | n <- ms]) ms -> ((MTyOther,name),[(n,MUOther) | n <- ms]) diff --git a/src/GF/Source/AbsGF.hs b/src/GF/Source/AbsGF.hs index 4bdc4c6fb..c8b218c2a 100644 --- a/src/GF/Source/AbsGF.hs +++ b/src/GF/Source/AbsGF.hs @@ -54,6 +54,7 @@ data ModType = data ModBody = MBody Extend Opens [TopDef] | MWith Ident [Open] + | MWithE [Ident] Ident [Open] | MReuse Ident | MUnion [Included] deriving (Eq,Ord,Show) @@ -65,7 +66,7 @@ data Extend = data Opens = NoOpens - | Opens [Open] + | OpenIn [Open] deriving (Eq,Ord,Show) data Open = @@ -138,7 +139,7 @@ data DataConstr = deriving (Eq,Ord,Show) data ParDef = - ParDef Ident [ParConstr] + ParDefDir Ident [ParConstr] | ParDefIndir Ident Ident | ParDefAbs Ident deriving (Eq,Ord,Show) diff --git a/src/GF/Source/GF.cf b/src/GF/Source/GF.cf index 98eeb7498..9dd3eaa1f 100644 --- a/src/GF/Source/GF.cf +++ b/src/GF/Source/GF.cf @@ -39,7 +39,8 @@ MTInstance. ModType ::= "instance" Ident "of" Ident ; MTTransfer. ModType ::= "transfer" Ident ":" Open "->" Open ; MBody. ModBody ::= Extend Opens "{" [TopDef] "}" ; -MWith. ModBody ::= Ident "with" [Open] ; +MWith. ModBody ::= Ident "with" [Open] ; +MWithE. ModBody ::= [Ident] "**" Ident "with" [Open] ; MReuse. ModBody ::= "reuse" Ident ; MUnion. ModBody ::= "union" [Included] ; @@ -50,7 +51,7 @@ NoExt. Extend ::= ; separator Open "," ; NoOpens. Opens ::= ; -Opens. Opens ::= "open" [Open] "in" ; +OpenIn. Opens ::= "open" [Open] "in" ; OName. Open ::= Ident ; OQualQO. Open ::= "(" QualOpen Ident ")" ; @@ -105,7 +106,7 @@ DataQId. DataConstr ::= Ident "." Ident ; separator DataConstr "|" ; -ParDef. ParDef ::= Ident "=" [ParConstr] ; +ParDefDir. ParDef ::= Ident "=" [ParConstr] ; ParDefIndir. ParDef ::= Ident "=" "(" "in" Ident ")" ; ParDefAbs. ParDef ::= Ident ; diff --git a/src/GF/Source/GrammarToSource.hs b/src/GF/Source/GrammarToSource.hs index 6be0f3060..346af7101 100644 --- a/src/GF/Source/GrammarToSource.hs +++ b/src/GF/Source/GrammarToSource.hs @@ -62,7 +62,7 @@ trQualOpen q = case q of OQInterface -> P.QOInterface -mkOpens ds = if null ds then P.NoOpens else P.Opens ds +mkOpens ds = if null ds then P.NoOpens else P.OpenIn ds mkTopDefs ds = ds trAnyDef :: (Ident,Info) -> [P.TopDef] @@ -80,7 +80,7 @@ trAnyDef (i,info) = let i' = tri i in case info of ResOper pty ptr -> [P.DefOper [trDef i' pty ptr]] ResParam pp -> [P.DefPar [case pp of - Yes ps -> P.ParDef i' [P.ParConstr (tri c) (map trDecl co) | (c,co) <- ps] + Yes ps -> P.ParDefDir i' [P.ParConstr (tri c) (map trDecl co) | (c,co) <- ps] May b -> P.ParDefIndir i' $ tri b _ -> P.ParDefAbs i']] diff --git a/src/GF/Source/LexGF.hs b/src/GF/Source/LexGF.hs index 3888a59f2..1978273f9 100644 --- a/src/GF/Source/LexGF.hs +++ b/src/GF/Source/LexGF.hs @@ -62,20 +62,18 @@ prToken t = case t of _ -> show t +data BTree = N | B String Tok BTree BTree deriving (Show) + eitherResIdent :: (String -> Tok) -> String -> Tok -eitherResIdent tv s = if isResWord s then (TS s) else (tv s) where - isResWord s = isInTree s $ - B "lincat" (B "def" (B "Type" (B "Str" (B "PType" (B "Lin" N N) N) (B "Tok" (B "Strs" N N) N)) (B "cat" (B "case" (B "abstract" N N) N) (B "data" (B "concrete" N N) N))) (B "include" (B "fun" (B "fn" (B "flags" N N) N) (B "in" (B "grammar" N N) N)) (B "interface" (B "instance" (B "incomplete" N N) N) (B "lin" (B "let" N N) N)))) (B "resource" (B "out" (B "of" (B "lintype" (B "lindef" N N) N) (B "oper" (B "open" N N) N)) (B "pattern" (B "param" (B "package" N N) N) (B "printname" (B "pre" N N) N))) (B "union" (B "table" (B "strs" (B "reuse" N N) N) (B "transfer" (B "tokenizer" N N) N)) (B "where" (B "variants" (B "var" N N) N) (B "with" N N)))) +eitherResIdent tv s = treeFind resWords + where + treeFind N = tv s + treeFind (B a t left right) | s < a = treeFind left + | s > a = treeFind right + | s == a = t -data BTree = N | B String BTree BTree deriving (Show) - -isInTree :: String -> BTree -> Bool -isInTree x tree = case tree of - N -> False - B a left right - | x < a -> isInTree x left - | x > a -> isInTree x right - | x == a -> True +resWords = b "lincat" (b "def" (b "Type" (b "Str" (b "PType" (b "Lin" N N) N) (b "Tok" (b "Strs" N N) N)) (b "cat" (b "case" (b "abstract" N N) N) (b "data" (b "concrete" N N) N))) (b "include" (b "fun" (b "fn" (b "flags" N N) N) (b "in" (b "grammar" N N) N)) (b "interface" (b "instance" (b "incomplete" N N) N) (b "lin" (b "let" N N) N)))) (b "resource" (b "out" (b "of" (b "lintype" (b "lindef" N N) N) (b "oper" (b "open" N N) N)) (b "pattern" (b "param" (b "package" N N) N) (b "printname" (b "pre" N N) N))) (b "union" (b "table" (b "strs" (b "reuse" N N) N) (b "transfer" (b "tokenizer" N N) N)) (b "where" (b "variants" (b "var" N N) N) (b "with" N N)))) + where b s = B s (TS s) unescapeInitTail :: String -> String unescapeInitTail = unesc . tail where diff --git a/src/GF/Source/LexGF.x b/src/GF/Source/LexGF.x index 0486b0f0e..6d231debb 100644 --- a/src/GF/Source/LexGF.x +++ b/src/GF/Source/LexGF.x @@ -68,20 +68,18 @@ prToken t = case t of _ -> show t +data BTree = N | B String Tok BTree BTree deriving (Show) + eitherResIdent :: (String -> Tok) -> String -> Tok -eitherResIdent tv s = if isResWord s then (TS s) else (tv s) where - isResWord s = isInTree s $ - B "lincat" (B "def" (B "Type" (B "Str" (B "PType" (B "Lin" N N) N) (B "Tok" (B "Strs" N N) N)) (B "cat" (B "case" (B "abstract" N N) N) (B "data" (B "concrete" N N) N))) (B "include" (B "fun" (B "fn" (B "flags" N N) N) (B "in" (B "grammar" N N) N)) (B "interface" (B "instance" (B "incomplete" N N) N) (B "lin" (B "let" N N) N)))) (B "resource" (B "out" (B "of" (B "lintype" (B "lindef" N N) N) (B "oper" (B "open" N N) N)) (B "pattern" (B "param" (B "package" N N) N) (B "printname" (B "pre" N N) N))) (B "union" (B "table" (B "strs" (B "reuse" N N) N) (B "transfer" (B "tokenizer" N N) N)) (B "where" (B "variants" (B "var" N N) N) (B "with" N N)))) +eitherResIdent tv s = treeFind resWords + where + treeFind N = tv s + treeFind (B a t left right) | s < a = treeFind left + | s > a = treeFind right + | s == a = t -data BTree = N | B String BTree BTree deriving (Show) - -isInTree :: String -> BTree -> Bool -isInTree x tree = case tree of - N -> False - B a left right - | x < a -> isInTree x left - | x > a -> isInTree x right - | x == a -> True +resWords = b "lincat" (b "def" (b "Type" (b "Str" (b "PType" (b "Lin" N N) N) (b "Tok" (b "Strs" N N) N)) (b "cat" (b "case" (b "abstract" N N) N) (b "data" (b "concrete" N N) N))) (b "include" (b "fun" (b "fn" (b "flags" N N) N) (b "in" (b "grammar" N N) N)) (b "interface" (b "instance" (b "incomplete" N N) N) (b "lin" (b "let" N N) N)))) (b "resource" (b "out" (b "of" (b "lintype" (b "lindef" N N) N) (b "oper" (b "open" N N) N)) (b "pattern" (b "param" (b "package" N N) N) (b "printname" (b "pre" N N) N))) (b "union" (b "table" (b "strs" (b "reuse" N N) N) (b "transfer" (b "tokenizer" N N) N)) (b "where" (b "variants" (b "var" N N) N) (b "with" N N)))) + where b s = B s (TS s) unescapeInitTail :: String -> String unescapeInitTail = unesc . tail where diff --git a/src/GF/Source/ParGF.hs b/src/GF/Source/ParGF.hs index f673d7722..5da21ac2f 100644 --- a/src/GF/Source/ParGF.hs +++ b/src/GF/Source/ParGF.hs @@ -496,21 +496,21 @@ happyOutTok x = unsafeCoerce# x {-# INLINE happyOutTok #-} happyActOffsets :: HappyAddr -happyActOffsets = HappyA# "\x00\x00\x89\x00\xe1\x04\x92\x00\xc6\x04\x00\x00\xfb\x04\x00\x00\x00\x00\x00\x00\x00\x00\xf9\x04\xf8\x00\xe1\x00\xb5\x04\x00\x00\xfc\x04\xb6\x04\x19\x00\x24\x00\x00\x00\x92\x00\xfd\xff\xb6\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x92\x00\x00\x00\x00\x05\xfe\xff\xfd\x04\xfa\x04\x9a\x01\xf4\x04\x00\x00\x00\x00\x00\x00\xae\x04\x00\x00\xb3\x00\x01\x00\xfe\x04\xab\x04\x00\x00\xa5\x04\x54\x00\xf1\x04\xeb\x04\xea\x04\xa0\x04\xa0\x04\xa0\x04\xa0\x04\xa0\x04\xa0\x04\x00\x00\xb3\x00\x00\x00\xe7\x04\x00\x00\xb3\x00\xb3\x00\xb3\x00\xe3\x04\x92\x00\x00\x00\x83\x00\x2c\x00\x5d\x00\x24\x00\x92\x00\x92\x00\xd5\x04\xda\x00\xd2\x04\xa3\x04\x6d\x04\x2c\x00\x7a\x04\x00\x00\x00\x00\xad\x04\xa6\x04\xf6\xff\x00\x00\x94\x04\xa2\x04\x89\x04\x8b\x02\x8d\x04\x00\x00\xb8\x02\x92\x04\x8f\x04\x4a\x04\x8c\x02\x81\x04\x92\x00\xc7\x00\xc7\x00\xc7\x00\x92\x00\x92\x00\x92\x00\x80\x04\x75\x04\xff\xff\x69\x01\x00\x00\x36\x04\x00\x00\x00\x00\x1e\x04\x34\x04\x00\x00\x00\x00\x00\x00\x49\x01\x49\x01\x49\x01\x00\x00\x00\x00\x00\x00\x34\x04\x34\x04\x73\x04\x92\x00\x00\x00\x00\x00\x00\x00\x1f\x04\x00\x00\x92\x00\x92\x00\x53\x04\x92\x00\xf6\xff\x65\x04\x48\x04\x00\x00\x00\x00\x2c\x00\x4f\x04\x40\x04\x50\x04\x07\x04\x2c\x00\x2c\x00\x00\x00\x3b\x04\x92\x00\xf5\x03\x92\x00\x92\x00\x3d\x04\x3c\x04\x38\x04\x2e\x04\x8e\x01\x00\x00\x00\x00\x2b\x04\x11\x04\x25\x04\x21\x04\x2c\x00\x92\x00\x20\x04\x00\x00\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\xde\x03\x3c\x02\xde\x03\xde\x03\xde\x03\x00\x00\x00\x00\x00\x00\xb3\x00\x00\x00\x1c\x04\x00\x00\x00\x00\xdc\x03\xda\x03\x00\x00\xc7\x02\x0d\x04\xdf\x03\x20\x00\x00\x00\xd7\x03\x05\x04\xb6\x03\xb6\x03\xb6\x03\xb6\x03\x1e\x00\x00\x00\x38\x01\xfa\x03\x00\x00\xc1\x00\x00\x00\xf9\x03\xf8\x03\x00\x00\xf6\x03\x98\x03\x98\x03\x00\x00\xf4\x03\xe4\x03\x00\x00\xe2\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe1\x03\x00\x00\xd9\x03\xdd\x03\xce\x03\x00\x00\x00\x00\x16\x00\xcc\x03\x00\x00\x00\x00\x00\x00\xca\x03\x00\x00\x00\x00\xc0\x03\x12\x00\xbf\x03\x00\x00\x2c\x00\x92\x00\x2c\x00\x00\x00\x72\x03\x00\x00\x92\x00\x92\x00\xb4\x03\x00\x00\x00\x00\x00\x00\x88\x03\x00\x00\xa9\x03\x8f\x03\xac\x03\x0a\x02\xae\x03\x9e\x03\x9a\x03\x00\x00\x2c\x00\x92\x00\x00\x00\x40\x03\x2c\x00\x00\x00\x00\x00\x92\x00\x8b\x03\x00\x00\x00\x00\x7d\x03\x7e\x03\x00\x00\x84\x03\x00\x00\x83\x03\x00\x00\x45\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x81\x03\x00\x00\x00\x00\x00\x00\x00\x00\x26\x03\x2c\x00\x00\x00\x00\x00\x00\x00\x2c\x00\x92\x00\x92\x00\x63\x03\x6f\x03\x6b\x03\x00\x00\x2c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x23\x03\x18\x01\x23\x03\x23\x03\x23\x03\x23\x03\x92\x00\x23\x03\x68\x03\x22\x03\x18\x00\x00\x00\x00\x00\x92\x00\x22\x03\x00\x00\x92\x00\x92\x00\x22\x03\x56\x03\x00\x00\x4d\x03\x1c\x01\x00\x00\x00\x00\x4b\x03\x00\x00\x4a\x03\x00\x00\x00\x00\x3c\x03\x0e\x00\x0e\x00\x37\x03\x07\x03\x00\x00\x1e\x03\xfc\x02\x00\x00\xdf\x02\xdf\x02\xdf\x02\x00\x00\x00\x00\x0e\x00\x92\x00\x00\x00\x25\x03\x00\x00\x00\x00\x00\x00\x00\x00\x18\x03\x00\x00\xf8\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x03\x06\x03\x00\x00\x11\x03\x00\x00\x00\x00\x00\x00\x19\x00\x00\x00\x00\x00\x00\x00\x92\x00\x92\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x03\xc6\x02\xc6\x02\x56\x02\xc6\x02\xc6\x02\x18\x01\x92\x00\x00\x00\x00\x00\x94\x00\x04\x03\x00\x00\x30\x02\x00\x00\x0e\x00\xfb\x02\xaf\x02\x00\x00\x00\x00\x00\x00\xaf\x02\x00\x00\x00\x00\x00\x00\xf0\x02\xf4\x02\x00\x00\x00\x00\x92\x00\xee\x02\x00\x00\x00\x00\xde\x02\xf1\x02\xe2\x02\xdd\x02\x00\x00\x93\x02\x93\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x02\x00\x00\x84\x02\xe4\x00\x0e\x00\x0e\x00\xc2\x02\xb0\x02\x00\x00\x00\x00\x00\x00"# +happyActOffsets = HappyA# "\x00\x00\x89\x00\xec\x04\x92\x00\xca\x04\x00\x00\x02\x05\x00\x00\x00\x00\x00\x00\x00\x00\x06\x05\xf8\x00\xe1\x00\xc1\x04\x00\x00\x08\x05\xc7\x04\x19\x00\x24\x00\x00\x00\x92\x00\xfd\xff\xc7\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x92\x00\x00\x00\x0c\x05\xfe\xff\x0a\x05\x01\x05\x9a\x01\xfd\x04\x00\x00\x00\x00\x00\x00\xb6\x04\x00\x00\xb3\x00\x01\x00\xfe\x04\xb8\x04\x00\x00\xb5\x04\x54\x00\xf6\x04\xff\x04\xfc\x04\xb2\x04\xb2\x04\xb2\x04\xb2\x04\xb2\x04\xb2\x04\x00\x00\xb3\x00\x00\x00\xf5\x04\x00\x00\xb3\x00\xb3\x00\xb3\x00\xe3\x04\x92\x00\x00\x00\x83\x00\x2c\x00\x5d\x00\x24\x00\x92\x00\x92\x00\xeb\x04\xda\x00\xf1\x04\xc0\x04\xa1\x04\x2c\x00\xb4\x04\x00\x00\x00\x00\xde\x04\xd7\x04\xf6\xff\x00\x00\xcc\x04\xc6\x04\xa6\x04\x9b\x02\xac\x04\x00\x00\xb8\x02\xab\x04\x93\x04\x63\x04\x67\x03\xa8\x04\x92\x00\xc7\x00\xc7\x00\xc7\x00\x92\x00\x92\x00\x92\x00\x96\x04\x8b\x04\xff\xff\x69\x01\x00\x00\x50\x04\x00\x00\x00\x00\x49\x04\x4a\x04\x00\x00\x00\x00\x00\x00\x49\x01\x49\x01\x49\x01\x00\x00\x00\x00\x00\x00\x4a\x04\x4a\x04\x7d\x04\x92\x00\x00\x00\x00\x00\x00\x00\x3a\x04\x00\x00\x92\x00\x92\x00\x6c\x04\x92\x00\xf6\xff\x7e\x04\x72\x04\x00\x00\x00\x00\x2c\x00\x4f\x04\x78\x04\x67\x04\x1f\x04\x2c\x00\x2c\x00\x00\x00\x65\x04\x92\x00\x1d\x04\x92\x00\x92\x00\x54\x04\x53\x04\x4e\x04\x34\x04\x8e\x01\x00\x00\x00\x00\x33\x04\x29\x04\x3d\x04\x39\x04\x2c\x00\x92\x00\x38\x04\x00\x00\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\xef\x03\x3c\x02\xef\x03\xef\x03\xef\x03\x00\x00\x00\x00\x00\x00\xb3\x00\x00\x00\x32\x04\x00\x00\x00\x00\xf2\x03\xf0\x03\x00\x00\xc7\x02\x23\x04\x02\x04\x20\x00\x00\x00\xeb\x03\x1b\x04\xc8\x03\xc8\x03\xc8\x03\xc8\x03\x1e\x00\x00\x00\x38\x01\x10\x04\x00\x00\xc1\x00\x00\x00\x0f\x04\x0e\x04\x00\x00\x0c\x04\xae\x03\xae\x03\x00\x00\xf9\x03\xf7\x03\x00\x00\xf4\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe4\x03\x00\x00\xdc\x03\xe2\x03\xe1\x03\x00\x00\x00\x00\x16\x00\xdf\x03\x00\x00\x00\x00\x00\x00\xde\x03\x00\x00\x00\x00\xc3\x03\x12\x00\xc9\x03\x00\x00\x2c\x00\x92\x00\x2c\x00\x00\x00\x78\x03\x00\x00\x92\x00\x92\x00\xca\x03\x00\x00\x00\x00\x00\x00\x90\x03\x00\x00\xc1\x03\xa5\x03\xad\x03\x0a\x02\xb3\x03\xb1\x03\xac\x03\x00\x00\x2c\x00\x92\x00\x00\x00\x55\x03\x2c\x00\x00\x00\x00\x00\x92\x00\x8e\x03\x00\x00\x00\x00\x92\x03\x96\x03\x00\x00\x87\x03\x00\x00\x85\x03\x00\x00\x45\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x84\x03\x00\x00\x00\x00\x00\x00\x00\x00\x3c\x03\x2c\x00\x00\x00\x00\x00\x00\x00\x2c\x00\x92\x00\x92\x00\x69\x03\x7d\x03\x81\x03\x00\x00\x2c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x03\x18\x01\x28\x03\x28\x03\x28\x03\x28\x03\x92\x00\x28\x03\x6d\x03\x24\x03\x18\x00\x00\x00\x00\x00\x92\x00\x24\x03\x00\x00\x92\x00\x92\x00\x24\x03\x6c\x03\x00\x00\x65\x03\x1c\x01\x00\x00\x00\x00\x61\x03\x00\x00\x4c\x03\x00\x00\x0d\x03\x51\x03\x0e\x00\x0e\x00\x3d\x03\x0a\x03\x00\x00\x2f\x03\x25\x03\x00\x00\xe0\x02\xde\x02\xde\x02\xde\x02\x00\x00\x00\x00\x0e\x00\x92\x00\x00\x00\x26\x03\x00\x00\x00\x00\x00\x00\x00\x00\x19\x03\x00\x00\xf9\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x03\x0b\x03\x00\x00\x12\x03\x00\x00\x00\x00\x00\x00\x19\x00\x00\x00\x00\x00\x00\x00\x92\x00\x92\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x03\xc6\x02\xc6\x02\x56\x02\xc6\x02\xc6\x02\x18\x01\x92\x00\x00\x00\x00\x00\x94\x00\x04\x03\x00\x00\x0e\x00\x30\x02\x00\x00\x0e\x00\x0e\x03\xb1\x02\x00\x00\x00\x00\x00\x00\x00\x00\xb1\x02\x00\x00\x00\x00\x00\x00\xf4\x02\xf5\x02\x00\x00\x00\x00\x92\x00\xef\x02\x00\x00\x00\x00\xee\x02\xf1\x02\xe3\x02\xdd\x02\x00\x00\x98\x02\x98\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd9\x02\x00\x00\x8f\x02\xe4\x00\x0e\x00\x0e\x00\xc3\x02\xc2\x02\x00\x00\x00\x00\x00\x00"# happyGotoOffsets :: HappyAddr -happyGotoOffsets = HappyA# "\x36\x02\x86\x01\xda\x01\xcb\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3b\x03\x00\x00\x00\x00\x00\x00\x00\x00\xa6\x01\xbb\x02\xe3\x01\x00\x00\x9e\x02\x85\x00\xa8\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb3\x04\x00\x00\x00\x00\x56\x01\x00\x00\x00\x00\xc4\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x99\x02\x07\x00\x00\x00\x96\x02\x94\x02\x00\x00\x00\x00\xc0\x00\x00\x00\x00\x00\x00\x00\x86\x02\x72\x02\x6a\x02\x68\x02\x5d\x02\x5c\x02\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x09\x00\x03\x00\x34\x02\x15\x03\x00\x00\x00\x00\xdc\x01\xa7\x04\x75\x00\x03\x03\x91\x04\x00\x00\x00\x00\x00\x00\x00\x00\x50\x01\xc7\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x71\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x43\x02\x00\x00\x00\x00\x8c\x04\x80\x03\x09\x03\xa0\x01\x74\x04\x6f\x04\x59\x04\x00\x00\x00\x00\x11\x00\xab\x01\x00\x00\x47\x01\x00\x00\x00\x00\x3a\x02\x06\x01\x00\x00\x00\x00\x00\x00\x3b\x03\x3b\x03\x3b\x03\x00\x00\x00\x00\x00\x00\x74\x00\x37\x02\x00\x00\x4d\x04\x00\x00\x00\x00\x00\x00\x11\x02\x00\x00\x82\x02\x35\x04\x00\x00\x30\x04\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x46\x02\x00\x00\x00\x00\x00\x00\x82\x00\x7d\x01\x2d\x01\x00\x00\x00\x00\x1a\x04\xe2\x00\x15\x04\xfd\x03\x00\x00\x00\x00\x00\x00\x00\x00\x40\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1b\x02\xed\x02\x00\x00\x00\x00\xb3\x01\x1a\x00\xdd\x04\xba\x02\xd8\x00\xc5\x04\xc9\x04\xc4\x04\xb0\x04\xaf\x04\x03\x02\x27\x02\x56\x04\x8e\x02\xff\x01\x8a\x03\x02\x02\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x44\x02\x00\x00\x00\x00\x00\x00\x00\x00\x89\x01\x00\x00\xe9\x01\x0b\x01\xd4\x01\xc6\x01\x40\x01\x00\x00\xfc\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x8d\x02\x7c\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3c\x01\x00\x00\x00\x00\x00\x00\x00\x00\x75\x01\x00\x00\x00\x00\xf5\x01\xf1\x03\x3d\x02\x00\x00\x8f\x01\x00\x00\xd0\x02\xc2\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xef\x00\xdb\x03\x00\x00\x62\x01\xdf\x01\x00\x00\x00\x00\xd6\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6e\x00\x5a\x01\x00\x00\x00\x00\x00\x00\x8b\x00\xbe\x03\xb9\x03\x00\x00\x00\x00\x00\x00\x00\x00\x24\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb2\x01\x90\x00\xd1\x00\x88\x02\x2a\x02\x5f\x01\xa3\x03\xc9\x00\x00\x00\xf8\x01\xdb\x00\x00\x00\x00\x00\x97\x03\x0b\x02\x00\x00\x7a\x03\x64\x03\x33\x01\x00\x00\x00\x00\x00\x00\x3f\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x50\x02\x21\x02\x00\x00\x41\x01\x00\x00\x00\x00\x00\x00\x0e\x01\x73\x00\x25\x00\x2b\x01\x00\x00\x00\x00\x21\x00\x5f\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa9\x02\x00\x00\x00\x00\x00\x00\xbd\x01\x48\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x2d\x02\x99\x00\x7c\x00\x6b\x00\x9c\x00\x90\x00\x2c\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x36\x00\x00\x00\x2c\x01\x00\x00\xc2\x03\x00\x00\x00\x00\x00\x00\x42\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6c\x03\xca\x01\x00\x00\x00\x00\x22\x00\x00\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x00\x00\x1b\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# +happyGotoOffsets = HappyA# "\x36\x02\x86\x01\xda\x01\xcb\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3b\x03\x00\x00\x00\x00\x00\x00\x00\x00\xa6\x01\xbb\x02\xe3\x01\x00\x00\x9e\x02\x85\x00\xb6\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb3\x04\x00\x00\x00\x00\x56\x01\x00\x00\x00\x00\xc4\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x8b\x02\x07\x00\x00\x00\x96\x02\x97\x02\x00\x00\x00\x00\xc0\x00\x00\x00\x00\x00\x00\x00\x94\x02\x90\x02\x72\x02\x6a\x02\x68\x02\x5c\x02\x00\x00\x0d\x00\x00\x00\x00\x00\x00\x00\x0b\x00\x09\x00\x03\x00\x45\x02\x15\x03\x00\x00\x00\x00\xdc\x01\xa7\x04\x75\x00\x03\x03\x91\x04\x00\x00\x00\x00\x00\x00\x00\x00\x50\x01\xc7\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x71\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x4c\x02\x00\x00\x00\x00\x8c\x04\x80\x03\x09\x03\xa0\x01\x74\x04\x6f\x04\x59\x04\x00\x00\x00\x00\x11\x00\xab\x01\x00\x00\x47\x01\x00\x00\x00\x00\x3a\x02\x06\x01\x00\x00\x00\x00\x00\x00\x3b\x03\x3b\x03\x3b\x03\x00\x00\x00\x00\x00\x00\x74\x00\x43\x02\x00\x00\x4d\x04\x00\x00\x00\x00\x00\x00\x37\x02\x00\x00\x82\x02\x35\x04\x00\x00\x30\x04\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x46\x02\x00\x00\x00\x00\x00\x00\x82\x00\x7d\x01\x2d\x01\x00\x00\x00\x00\x1a\x04\xe2\x00\x15\x04\xfd\x03\x00\x00\x00\x00\x00\x00\x00\x00\x40\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1b\x02\xed\x02\x00\x00\x00\x00\xb3\x01\x1a\x00\xdd\x04\xba\x02\xd8\x00\xc5\x04\xc9\x04\xc4\x04\xb0\x04\xaf\x04\x11\x02\x27\x02\x56\x04\x8e\x02\x03\x02\x8a\x03\x02\x02\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x44\x02\x00\x00\x00\x00\x00\x00\x00\x00\x89\x01\x00\x00\xff\x01\x0b\x01\xe9\x01\xd4\x01\x40\x01\x00\x00\xfc\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x8d\x02\x7c\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3c\x01\x00\x00\x00\x00\x00\x00\x00\x00\x75\x01\x00\x00\x00\x00\xf5\x01\xf1\x03\x3d\x02\x00\x00\xc6\x01\x00\x00\xd0\x02\xc2\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xef\x00\xdb\x03\x00\x00\x8f\x01\xdf\x01\x00\x00\x00\x00\xd6\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6e\x00\x5a\x01\x00\x00\x00\x00\x00\x00\x8b\x00\xbe\x03\xb9\x03\x00\x00\x00\x00\x00\x00\x00\x00\x24\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb2\x01\x90\x00\xd1\x00\x88\x02\x2a\x02\x62\x01\xa3\x03\xc9\x00\x00\x00\xf8\x01\xdb\x00\x00\x00\x00\x00\x97\x03\x0b\x02\x00\x00\x7a\x03\x64\x03\x33\x01\x00\x00\x00\x00\x00\x00\x4b\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x53\x01\x00\x00\x86\x02\x50\x02\x00\x00\x41\x01\x00\x00\x00\x00\x00\x00\x0e\x01\x00\x00\x73\x00\x25\x00\x2b\x01\x00\x00\x00\x00\x21\x00\x5f\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa9\x02\x00\x00\x00\x00\x00\x00\xbd\x01\x48\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x2d\x02\x99\x00\x7c\x00\x6b\x00\x9c\x00\x90\x00\x2c\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x21\x02\x36\x00\x00\x00\x2c\x01\x00\x00\xfa\x03\x00\x00\x00\x00\x00\x00\x00\x00\x42\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc2\x03\xca\x01\x00\x00\x00\x00\x22\x00\x00\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x00\x00\x1b\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# happyDefActions :: HappyAddr -happyDefActions = HappyA# "\xf6\xff\xd2\xff\x1d\xff\x00\x00\x00\x00\xfb\xff\x89\xff\x85\xff\x84\xff\x7a\xff\x76\xff\x6c\xff\x67\xff\x5c\xff\x00\x00\x86\xff\x00\x00\x8c\xff\x3a\xff\x00\x00\x83\xff\x33\xff\x3a\xff\x00\x00\x48\xff\x46\xff\x45\xff\x47\xff\x49\xff\x00\x00\x81\xff\x00\x00\x8c\xff\x00\x00\x00\x00\x00\x00\x00\x00\xfa\xff\xf9\xff\xf8\xff\x00\x00\xde\xff\x00\x00\x00\x00\x00\x00\x00\x00\xd1\xff\x00\x00\xd2\xff\xf5\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf4\xff\x1a\xff\x1b\xff\x00\x00\x1c\xff\x00\x00\x00\x00\x00\x00\x1e\xff\x5b\xff\x89\xff\x00\x00\x8c\xff\x00\x00\x00\x00\x5b\xff\x00\x00\x91\xff\x00\x00\x8b\xff\x00\x00\x8c\xff\x29\xff\x00\x00\x6b\xff\x3c\xff\x39\xff\x00\x00\x3a\xff\x3b\xff\x35\xff\x32\xff\x00\x00\x00\x00\x00\x00\x82\xff\x89\xff\x00\x00\x00\x00\x00\x00\x91\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x75\xff\x00\x00\x00\x00\x6d\xff\x8c\xff\x4b\xff\x79\xff\x00\x00\x8c\xff\x61\xff\x62\xff\x63\xff\x69\xff\x6a\xff\x68\xff\x64\xff\x7f\xff\x88\xff\x00\x00\x00\x00\x00\x00\x00\x00\x7b\xff\x80\xff\x87\xff\x00\x00\x7e\xff\x33\xff\x00\x00\x00\x00\x00\x00\x3a\xff\x00\x00\x57\xff\x53\xff\x54\xff\x40\xff\x00\x00\x28\xff\x00\x00\x44\xff\x00\x00\x30\xff\x58\xff\x00\x00\x00\x00\x8c\xff\x00\x00\x00\x00\x00\x00\x5a\xff\x00\x00\x00\x00\x91\xff\x4d\xff\x41\xff\x3e\xff\x00\x00\x2c\xff\x00\x00\x00\x00\x5b\xff\x00\x00\xdd\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x17\xff\x19\xff\x18\xff\x15\xff\x16\xff\x00\x00\xe7\xff\xe6\xff\x00\x00\x00\x00\xe8\xff\xdb\xff\x00\x00\x00\x00\x91\xff\xf2\xff\xd7\xff\x00\x00\x00\x00\xcd\xff\x00\x00\x00\x00\x00\x00\x14\xff\x91\xff\x00\x00\xb2\xff\x00\x00\xbf\xff\x00\x00\x00\x00\xb6\xff\x00\x00\x00\x00\x00\x00\xb4\xff\xa6\xff\x00\x00\xbe\xff\x00\x00\xbd\xff\xb5\xff\xbb\xff\xbc\xff\xba\xff\x00\x00\xc3\xff\x00\x00\x00\x00\x00\x00\xb7\xff\xc1\xff\x91\xff\x00\x00\xc2\xff\xc0\xff\x20\xff\x00\x00\xc4\xff\x70\xff\x00\x00\x57\xff\x00\x00\x74\xff\x00\x00\x00\x00\x00\x00\x4f\xff\x00\x00\x6e\xff\x5b\xff\x25\xff\x8f\xff\x8e\xff\x8a\xff\x5f\xff\x00\x00\x34\xff\x2f\xff\x00\x00\x00\x00\x91\xff\x00\x00\x43\xff\x00\x00\x5d\xff\x29\xff\x00\x00\x3f\xff\x00\x00\x00\x00\x38\xff\x66\xff\x00\x00\x00\x00\x35\xff\x31\xff\x00\x00\x00\x00\x7d\xff\x00\x00\x90\xff\x00\x00\x4a\xff\x91\xff\x5e\xff\x78\xff\x37\xff\x77\xff\x7c\xff\x65\xff\x00\x00\x55\xff\x2a\xff\x27\xff\x52\xff\x44\xff\x00\x00\x56\xff\x50\xff\x51\xff\x30\xff\x00\x00\x00\x00\x00\x00\x24\xff\x00\x00\x59\xff\x55\xff\x3d\xff\x2d\xff\x2b\xff\x73\xff\x72\xff\xa0\xff\xb0\xff\x9c\xff\xab\xff\x96\xff\x00\x00\x00\x00\x9e\xff\x00\x00\x9a\xff\x94\xff\xb8\xff\xb9\xff\x00\x00\x98\xff\xb1\xff\x00\x00\x00\x00\xa2\xff\x00\x00\xd5\xff\x00\x00\xd0\xff\xe4\xff\xe5\xff\xca\xff\xdf\xff\xcc\xff\xe0\xff\xdc\xff\x00\x00\xda\xff\xda\xff\x00\x00\x00\x00\xe1\xff\xd9\xff\x00\x00\xde\xff\xcd\xff\x00\x00\x00\x00\xcf\xff\xce\xff\x00\x00\x00\x00\xa1\xff\xc8\xff\xc7\xff\x97\xff\xa4\xff\x20\xff\x93\xff\xa8\xff\x00\x00\x99\xff\xde\xff\x9d\xff\xaf\xff\xa3\xff\x95\xff\xad\xff\xaa\xff\xae\xff\x00\x00\x9b\xff\x21\xff\x1f\xff\x3a\xff\x9f\xff\x4e\xff\x6f\xff\x25\xff\x00\x00\x8d\xff\x60\xff\x2e\xff\x4c\xff\x42\xff\x71\xff\x26\xff\x23\xff\x00\x00\xab\xff\x00\x00\x00\x00\x00\x00\x94\xff\xa5\xff\x00\x00\xc6\xff\xe3\xff\x00\x00\x00\x00\xcb\xff\x00\x00\xd6\xff\xda\xff\x00\x00\xf0\xff\xd8\xff\xe2\xff\xc9\xff\x00\x00\xd4\xff\xc5\xff\x92\xff\x00\x00\x00\x00\xac\xff\xa9\xff\x00\x00\x00\x00\xb3\xff\xa7\xff\x00\x00\x00\x00\xef\xff\x00\x00\xf3\xff\xf0\xff\x00\x00\xd3\xff\x22\xff\xec\xff\xf1\xff\xee\xff\xed\xff\xeb\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xea\xff\xe9\xff"# +happyDefActions = HappyA# "\xf6\xff\xd1\xff\x1c\xff\x00\x00\x00\x00\xfb\xff\x88\xff\x84\xff\x83\xff\x79\xff\x75\xff\x6b\xff\x66\xff\x5b\xff\x00\x00\x85\xff\x00\x00\x8b\xff\x39\xff\x00\x00\x82\xff\x32\xff\x39\xff\x00\x00\x47\xff\x45\xff\x44\xff\x46\xff\x48\xff\x00\x00\x80\xff\x00\x00\x8b\xff\x00\x00\x00\x00\x00\x00\x00\x00\xfa\xff\xf9\xff\xf8\xff\x00\x00\xdd\xff\x00\x00\x00\x00\x00\x00\x00\x00\xd0\xff\x00\x00\xd1\xff\xf5\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf4\xff\x19\xff\x1a\xff\x00\x00\x1b\xff\x00\x00\x00\x00\x00\x00\x1d\xff\x5a\xff\x88\xff\x00\x00\x8b\xff\x00\x00\x00\x00\x5a\xff\x00\x00\x90\xff\x00\x00\x8a\xff\x00\x00\x8b\xff\x28\xff\x00\x00\x6a\xff\x3b\xff\x38\xff\x00\x00\x39\xff\x3a\xff\x34\xff\x31\xff\x00\x00\x00\x00\x00\x00\x81\xff\x88\xff\x00\x00\x00\x00\x00\x00\x90\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x74\xff\x00\x00\x00\x00\x6c\xff\x8b\xff\x4a\xff\x78\xff\x00\x00\x8b\xff\x60\xff\x61\xff\x62\xff\x68\xff\x69\xff\x67\xff\x63\xff\x7e\xff\x87\xff\x00\x00\x00\x00\x00\x00\x00\x00\x7a\xff\x7f\xff\x86\xff\x00\x00\x7d\xff\x32\xff\x00\x00\x00\x00\x00\x00\x39\xff\x00\x00\x56\xff\x52\xff\x53\xff\x3f\xff\x00\x00\x27\xff\x00\x00\x43\xff\x00\x00\x2f\xff\x57\xff\x00\x00\x00\x00\x8b\xff\x00\x00\x00\x00\x00\x00\x59\xff\x00\x00\x00\x00\x90\xff\x4c\xff\x40\xff\x3d\xff\x00\x00\x2b\xff\x00\x00\x00\x00\x5a\xff\x00\x00\xdc\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x16\xff\x18\xff\x17\xff\x14\xff\x15\xff\x00\x00\xe7\xff\xe6\xff\x00\x00\x00\x00\xe8\xff\xda\xff\x00\x00\x00\x00\x90\xff\xf2\xff\xd6\xff\x00\x00\x00\x00\xcc\xff\x00\x00\x00\x00\x00\x00\x13\xff\x90\xff\x00\x00\xb1\xff\x00\x00\xbe\xff\x00\x00\x00\x00\xb5\xff\x00\x00\x00\x00\x00\x00\xb3\xff\xa5\xff\x00\x00\xbd\xff\x00\x00\xbc\xff\xb4\xff\xba\xff\xbb\xff\xb9\xff\x00\x00\xc2\xff\x00\x00\x00\x00\x00\x00\xb6\xff\xc0\xff\x90\xff\x00\x00\xc1\xff\xbf\xff\x1f\xff\x00\x00\xc3\xff\x6f\xff\x00\x00\x56\xff\x00\x00\x73\xff\x00\x00\x00\x00\x00\x00\x4e\xff\x00\x00\x6d\xff\x5a\xff\x24\xff\x8e\xff\x8d\xff\x89\xff\x5e\xff\x00\x00\x33\xff\x2e\xff\x00\x00\x00\x00\x90\xff\x00\x00\x42\xff\x00\x00\x5c\xff\x28\xff\x00\x00\x3e\xff\x00\x00\x00\x00\x37\xff\x65\xff\x00\x00\x00\x00\x34\xff\x30\xff\x00\x00\x00\x00\x7c\xff\x00\x00\x8f\xff\x00\x00\x49\xff\x90\xff\x5d\xff\x77\xff\x36\xff\x76\xff\x7b\xff\x64\xff\x00\x00\x54\xff\x29\xff\x26\xff\x51\xff\x43\xff\x00\x00\x55\xff\x4f\xff\x50\xff\x2f\xff\x00\x00\x00\x00\x00\x00\x23\xff\x00\x00\x58\xff\x54\xff\x3c\xff\x2c\xff\x2a\xff\x72\xff\x71\xff\x9f\xff\xaf\xff\x9b\xff\xaa\xff\x95\xff\x00\x00\x00\x00\x9d\xff\x00\x00\x99\xff\x93\xff\xb7\xff\xb8\xff\x00\x00\x97\xff\xb0\xff\x00\x00\x00\x00\xa1\xff\x00\x00\xd4\xff\x00\x00\xcf\xff\xe4\xff\xe5\xff\xc9\xff\xde\xff\xcb\xff\xdf\xff\xdb\xff\x00\x00\xd9\xff\xd9\xff\x00\x00\x00\x00\xe1\xff\xd8\xff\x00\x00\xdd\xff\x00\x00\xcc\xff\x00\x00\x00\x00\xce\xff\xcd\xff\x00\x00\x00\x00\xa0\xff\xc7\xff\xc6\xff\x96\xff\xa3\xff\x1f\xff\x92\xff\xa7\xff\x00\x00\x98\xff\xdd\xff\x9c\xff\xae\xff\xa2\xff\x94\xff\xac\xff\xa9\xff\xad\xff\x00\x00\x9a\xff\x20\xff\x1e\xff\x39\xff\x9e\xff\x4d\xff\x6e\xff\x24\xff\x00\x00\x8c\xff\x5f\xff\x2d\xff\x4b\xff\x41\xff\x70\xff\x25\xff\x22\xff\x00\x00\xaa\xff\x00\x00\x00\x00\x00\x00\x93\xff\xa4\xff\x00\x00\xc5\xff\xe3\xff\x00\x00\x00\x00\xca\xff\xd9\xff\x00\x00\xd5\xff\xd9\xff\x00\x00\xf0\xff\xd7\xff\xe2\xff\xe0\xff\xc8\xff\x00\x00\xd3\xff\xc4\xff\x91\xff\x00\x00\x00\x00\xab\xff\xa8\xff\x00\x00\x00\x00\xb2\xff\xa6\xff\x00\x00\x00\x00\xef\xff\x00\x00\xf3\xff\xf0\xff\x00\x00\xd2\xff\x21\xff\xec\xff\xf1\xff\xee\xff\xed\xff\xeb\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xea\xff\xe9\xff"# happyCheck :: HappyAddr -happyCheck = HappyA# "\xff\xff\x03\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x19\x00\x00\x00\x00\x00\x15\x00\x05\x00\x00\x00\x03\x00\x19\x00\x05\x00\x02\x00\x1a\x00\x00\x00\x00\x00\x03\x00\x05\x00\x05\x00\x0d\x00\x0a\x00\x00\x00\x10\x00\x05\x00\x0b\x00\x00\x00\x12\x00\x0b\x00\x0f\x00\x10\x00\x0a\x00\x19\x00\x0a\x00\x12\x00\x15\x00\x03\x00\x0c\x00\x05\x00\x19\x00\x12\x00\x1a\x00\x1b\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x10\x00\x24\x00\x24\x00\x25\x00\x27\x00\x4b\x00\x00\x00\x2a\x00\x2a\x00\x19\x00\x2d\x00\x36\x00\x4b\x00\x4b\x00\x4b\x00\x32\x00\x3c\x00\x3d\x00\x18\x00\x2a\x00\x4d\x00\x50\x00\x4d\x00\x4e\x00\x4d\x00\x4e\x00\x4d\x00\x3e\x00\x4d\x00\x4b\x00\x4d\x00\x42\x00\x43\x00\x4b\x00\x4c\x00\x4d\x00\x03\x00\x48\x00\x05\x00\x4b\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x0b\x00\x4b\x00\x4a\x00\x00\x00\x0f\x00\x10\x00\x00\x00\x4b\x00\x4c\x00\x00\x00\x15\x00\x00\x00\x00\x00\x00\x00\x01\x00\x4b\x00\x4c\x00\x4d\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x2c\x00\x24\x00\x00\x00\x2f\x00\x27\x00\x00\x00\x03\x00\x2a\x00\x15\x00\x16\x00\x2d\x00\x00\x00\x01\x00\x02\x00\x0b\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x18\x00\x03\x00\x02\x00\x05\x00\x2a\x00\x00\x00\x06\x00\x3e\x00\x00\x00\x0b\x00\x2a\x00\x42\x00\x43\x00\x0f\x00\x10\x00\x35\x00\x50\x00\x48\x00\x38\x00\x15\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x2a\x00\x3c\x00\x3d\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x2c\x00\x24\x00\x35\x00\x2f\x00\x27\x00\x38\x00\x1f\x00\x2a\x00\x2d\x00\x33\x00\x34\x00\x0d\x00\x3c\x00\x3d\x00\x02\x00\x32\x00\x29\x00\x06\x00\x37\x00\x07\x00\x00\x00\x03\x00\x40\x00\x05\x00\x42\x00\x1b\x00\x1c\x00\x3e\x00\x00\x00\x0b\x00\x13\x00\x42\x00\x43\x00\x0f\x00\x10\x00\x00\x00\x49\x00\x48\x00\x00\x00\x02\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x07\x00\x00\x00\x1a\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x09\x00\x24\x00\x1b\x00\x24\x00\x27\x00\x00\x00\x01\x00\x02\x00\x1a\x00\x2a\x00\x13\x00\x14\x00\x25\x00\x16\x00\x17\x00\x18\x00\x1f\x00\x03\x00\x24\x00\x05\x00\x4b\x00\x4c\x00\x08\x00\x0e\x00\x2a\x00\x0b\x00\x29\x00\x3e\x00\x00\x00\x0f\x00\x10\x00\x42\x00\x43\x00\x00\x00\x2a\x00\x2b\x00\x2c\x00\x48\x00\x4a\x00\x2d\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x03\x00\x0e\x00\x05\x00\x3a\x00\x27\x00\x15\x00\x16\x00\x33\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x0f\x00\x10\x00\x3a\x00\x49\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x2a\x00\x2b\x00\x2c\x00\x00\x00\x45\x00\x46\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x03\x00\x10\x00\x05\x00\x12\x00\x27\x00\x00\x00\x00\x00\x0a\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x00\x00\x10\x00\x04\x00\x17\x00\x2f\x00\x03\x00\x31\x00\x05\x00\x0a\x00\x00\x00\x19\x00\x12\x00\x14\x00\x0b\x00\x22\x00\x00\x00\x33\x00\x0f\x00\x10\x00\x00\x00\x01\x00\x02\x00\x2a\x00\x3a\x00\x00\x00\x33\x00\x34\x00\x00\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x03\x00\x40\x00\x05\x00\x42\x00\x27\x00\x2a\x00\x2b\x00\x2c\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x0f\x00\x10\x00\x2a\x00\x2b\x00\x2c\x00\x00\x00\x01\x00\x02\x00\x2a\x00\x2b\x00\x2c\x00\x4b\x00\x4c\x00\x4d\x00\x4a\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x06\x00\x33\x00\x34\x00\x00\x00\x27\x00\x03\x00\x04\x00\x05\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x0a\x00\x13\x00\x11\x00\x0d\x00\x0e\x00\x03\x00\x10\x00\x05\x00\x00\x00\x01\x00\x02\x00\x03\x00\x16\x00\x0b\x00\x00\x00\x19\x00\x33\x00\x0f\x00\x10\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3a\x00\x33\x00\x34\x00\x00\x00\x00\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x00\x00\x01\x00\x02\x00\x03\x00\x27\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x00\x00\x01\x00\x02\x00\x00\x00\x19\x00\x19\x00\x2d\x00\x2e\x00\x2f\x00\x2a\x00\x2b\x00\x2c\x00\x09\x00\x00\x00\x23\x00\x23\x00\x37\x00\x2d\x00\x4b\x00\x4c\x00\x4d\x00\x00\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x37\x00\x00\x00\x01\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x00\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x00\x00\x37\x00\x33\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x00\x00\x3e\x00\x3a\x00\x00\x00\x00\x00\x47\x00\x48\x00\x2a\x00\x2b\x00\x2c\x00\x47\x00\x48\x00\x00\x00\x45\x00\x46\x00\x04\x00\x33\x00\x34\x00\x00\x00\x33\x00\x34\x00\x0a\x00\x39\x00\x1e\x00\x3b\x00\x39\x00\x17\x00\x3b\x00\x00\x00\x01\x00\x02\x00\x26\x00\x43\x00\x44\x00\x00\x00\x43\x00\x44\x00\x22\x00\x4b\x00\x4c\x00\x00\x00\x33\x00\x34\x00\x00\x00\x20\x00\x2a\x00\x00\x00\x39\x00\x33\x00\x3b\x00\x10\x00\x27\x00\x12\x00\x04\x00\x2a\x00\x3a\x00\x00\x00\x43\x00\x44\x00\x04\x00\x05\x00\x02\x00\x00\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x00\x00\x00\x00\x1e\x00\x00\x00\x01\x00\x02\x00\x1c\x00\x1d\x00\x21\x00\x18\x00\x26\x00\x33\x00\x34\x00\x00\x00\x0d\x00\x28\x00\x0f\x00\x39\x00\x25\x00\x3b\x00\x27\x00\x28\x00\x29\x00\x04\x00\x2b\x00\x00\x00\x00\x00\x43\x00\x44\x00\x10\x00\x25\x00\x12\x00\x33\x00\x34\x00\x35\x00\x36\x00\x2b\x00\x00\x00\x39\x00\x00\x00\x3b\x00\x3c\x00\x3d\x00\x2a\x00\x3f\x00\x33\x00\x34\x00\x00\x00\x33\x00\x44\x00\x45\x00\x39\x00\x47\x00\x3b\x00\x33\x00\x3a\x00\x25\x00\x00\x00\x27\x00\x28\x00\x29\x00\x3a\x00\x2b\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x4b\x00\x00\x00\x33\x00\x34\x00\x35\x00\x36\x00\x00\x00\x00\x00\x39\x00\x04\x00\x3b\x00\x3c\x00\x3d\x00\x00\x00\x3f\x00\x0a\x00\x0c\x00\x0d\x00\x0d\x00\x44\x00\x45\x00\x20\x00\x47\x00\x00\x00\x01\x00\x02\x00\x03\x00\x0c\x00\x27\x00\x1c\x00\x1d\x00\x2a\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x20\x00\x20\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x27\x00\x27\x00\x06\x00\x2a\x00\x2a\x00\x37\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x07\x00\x3e\x00\x3f\x00\x0a\x00\x41\x00\x00\x00\x01\x00\x02\x00\x03\x00\x06\x00\x45\x00\x12\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x00\x00\x01\x00\x02\x00\x03\x00\x05\x00\x37\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x21\x00\x3e\x00\x3f\x00\x4b\x00\x41\x00\x37\x00\x04\x00\x28\x00\x01\x00\x06\x00\x3c\x00\x3d\x00\x3e\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x37\x00\x02\x00\x06\x00\x01\x00\x06\x00\x3c\x00\x3d\x00\x3e\x00\x4b\x00\x37\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x41\x00\x00\x00\x01\x00\x02\x00\x03\x00\x46\x00\x3e\x00\x07\x00\x0c\x00\x4b\x00\x4b\x00\x02\x00\x0e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x0d\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x2d\x00\x0e\x00\x02\x00\x0a\x00\x2d\x00\x4b\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x2d\x00\x2e\x00\x2f\x00\x02\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x03\x00\x37\x00\x3e\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x4b\x00\x3e\x00\x0a\x00\x08\x00\x0b\x00\x37\x00\x02\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x3e\x00\x03\x00\x00\x00\x4b\x00\x4b\x00\x04\x00\x01\x00\x4b\x00\x37\x00\x07\x00\x08\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x00\x00\x01\x00\x02\x00\x03\x00\x1b\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x06\x00\x04\x00\x3e\x00\x04\x00\x04\x00\x0c\x00\x00\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x11\x00\x3e\x00\x04\x00\x01\x00\x11\x00\x17\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x22\x00\x2d\x00\x2e\x00\x2f\x00\x02\x00\x37\x00\x06\x00\x0a\x00\x2a\x00\x2d\x00\x02\x00\x37\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x4b\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x04\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x07\x00\x08\x00\x01\x00\x0c\x00\x01\x00\x37\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x02\x00\x07\x00\x3e\x00\x01\x00\x4b\x00\x02\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x02\x00\x3e\x00\x02\x00\x01\x00\x01\x00\x01\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x4b\x00\x23\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x09\x00\x38\x00\x03\x00\x37\x00\x37\x00\x37\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x07\x00\x04\x00\x04\x00\x01\x00\x16\x00\x37\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x0e\x00\x0c\x00\x3e\x00\x04\x00\x01\x00\x01\x00\x04\x00\x4b\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x4b\x00\x3e\x00\x04\x00\x0d\x00\x00\x00\x08\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x03\x00\x16\x00\x4b\x00\x4d\x00\x37\x00\x17\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x22\x00\x06\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x4b\x00\x2a\x00\x4b\x00\x0d\x00\x03\x00\x37\x00\x04\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x4b\x00\x07\x00\x3e\x00\x06\x00\x0c\x00\x11\x00\x07\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x0a\x00\x3e\x00\x08\x00\x00\x00\x00\x00\x37\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x0a\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x00\x00\x17\x00\x17\x00\x37\x00\x00\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3e\x00\x2d\x00\x22\x00\x22\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2a\x00\x2a\x00\x17\x00\x17\x00\x00\x00\x37\x00\x0a\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x22\x00\x22\x00\x01\x00\x20\x00\x37\x00\x4b\x00\x02\x00\x02\x00\x2a\x00\x2a\x00\x27\x00\x3e\x00\x01\x00\x2a\x00\x17\x00\x50\x00\x4b\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x03\x00\x50\x00\x22\x00\x03\x00\x4b\x00\x37\x00\x03\x00\x08\x00\x50\x00\x0d\x00\x2a\x00\x25\x00\x3e\x00\x27\x00\x28\x00\x29\x00\x12\x00\x2b\x00\x2e\x00\xff\xff\x4b\x00\xff\xff\xff\xff\xff\xff\xff\xff\x33\x00\x34\x00\x35\x00\x36\x00\xff\xff\xff\xff\x39\x00\xff\xff\x3b\x00\x3c\x00\x3d\x00\x23\x00\x3f\x00\xff\xff\x26\x00\xff\xff\xff\xff\x44\x00\x45\x00\xff\xff\x47\x00\xff\xff\xff\xff\xff\xff\x30\x00\x31\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\x45\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"# +happyCheck = HappyA# "\xff\xff\x03\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x01\x00\x19\x00\x00\x00\x00\x00\x15\x00\x05\x00\x00\x00\x03\x00\x19\x00\x05\x00\x02\x00\x1a\x00\x00\x00\x00\x00\x03\x00\x05\x00\x05\x00\x0d\x00\x0a\x00\x00\x00\x10\x00\x05\x00\x0b\x00\x00\x00\x12\x00\x0b\x00\x0f\x00\x10\x00\x0a\x00\x19\x00\x0a\x00\x12\x00\x15\x00\x03\x00\x0c\x00\x05\x00\x19\x00\x12\x00\x1a\x00\x1b\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x10\x00\x24\x00\x24\x00\x25\x00\x27\x00\x4b\x00\x00\x00\x2a\x00\x2a\x00\x19\x00\x2d\x00\x36\x00\x4b\x00\x4b\x00\x4b\x00\x32\x00\x3c\x00\x3d\x00\x18\x00\x2a\x00\x4d\x00\x50\x00\x4d\x00\x4e\x00\x4d\x00\x4e\x00\x4d\x00\x3e\x00\x4d\x00\x4b\x00\x4d\x00\x42\x00\x43\x00\x4b\x00\x4c\x00\x4d\x00\x03\x00\x48\x00\x05\x00\x4b\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x0b\x00\x4b\x00\x4a\x00\x00\x00\x0f\x00\x10\x00\x00\x00\x4b\x00\x4c\x00\x00\x00\x15\x00\x00\x00\x00\x00\x00\x00\x01\x00\x4b\x00\x4c\x00\x4d\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x2c\x00\x24\x00\x00\x00\x2f\x00\x27\x00\x00\x00\x03\x00\x2a\x00\x15\x00\x16\x00\x2d\x00\x00\x00\x01\x00\x02\x00\x0b\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x18\x00\x03\x00\x02\x00\x05\x00\x2a\x00\x00\x00\x06\x00\x3e\x00\x00\x00\x0b\x00\x2a\x00\x42\x00\x43\x00\x0f\x00\x10\x00\x35\x00\x50\x00\x48\x00\x38\x00\x15\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x2a\x00\x3c\x00\x3d\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x2c\x00\x24\x00\x35\x00\x2f\x00\x27\x00\x38\x00\x1f\x00\x2a\x00\x2d\x00\x33\x00\x34\x00\x0d\x00\x3c\x00\x3d\x00\x02\x00\x32\x00\x29\x00\x06\x00\x37\x00\x07\x00\x00\x00\x03\x00\x40\x00\x05\x00\x42\x00\x1b\x00\x1c\x00\x3e\x00\x00\x00\x0b\x00\x13\x00\x42\x00\x43\x00\x0f\x00\x10\x00\x00\x00\x49\x00\x48\x00\x00\x00\x02\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x07\x00\x00\x00\x1a\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x09\x00\x24\x00\x1b\x00\x24\x00\x27\x00\x00\x00\x01\x00\x02\x00\x1a\x00\x2a\x00\x13\x00\x14\x00\x25\x00\x16\x00\x17\x00\x18\x00\x1f\x00\x03\x00\x24\x00\x05\x00\x4b\x00\x4c\x00\x08\x00\x0e\x00\x2a\x00\x0b\x00\x29\x00\x3e\x00\x00\x00\x0f\x00\x10\x00\x42\x00\x43\x00\x00\x00\x2a\x00\x2b\x00\x2c\x00\x48\x00\x4a\x00\x2d\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x03\x00\x0e\x00\x05\x00\x3a\x00\x27\x00\x15\x00\x16\x00\x33\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x0f\x00\x10\x00\x3a\x00\x49\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x2a\x00\x2b\x00\x2c\x00\x00\x00\x45\x00\x46\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x03\x00\x10\x00\x05\x00\x12\x00\x27\x00\x00\x00\x00\x00\x0a\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x00\x00\x10\x00\x04\x00\x17\x00\x2f\x00\x03\x00\x31\x00\x05\x00\x0a\x00\x00\x00\x19\x00\x12\x00\x00\x00\x0b\x00\x22\x00\x00\x00\x33\x00\x0f\x00\x10\x00\x00\x00\x01\x00\x02\x00\x2a\x00\x3a\x00\x14\x00\x33\x00\x34\x00\x00\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x03\x00\x40\x00\x05\x00\x42\x00\x27\x00\x2a\x00\x2b\x00\x2c\x00\x0b\x00\x00\x00\x01\x00\x02\x00\x0f\x00\x10\x00\x2a\x00\x2b\x00\x2c\x00\x00\x00\x01\x00\x02\x00\x2a\x00\x2b\x00\x2c\x00\x4b\x00\x4c\x00\x4d\x00\x4a\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x06\x00\x33\x00\x34\x00\x00\x00\x27\x00\x03\x00\x04\x00\x05\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x0a\x00\x13\x00\x11\x00\x0d\x00\x0e\x00\x03\x00\x10\x00\x05\x00\x00\x00\x01\x00\x02\x00\x03\x00\x16\x00\x0b\x00\x00\x00\x19\x00\x33\x00\x0f\x00\x10\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3a\x00\x33\x00\x34\x00\x00\x00\x00\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x00\x00\x01\x00\x02\x00\x03\x00\x27\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x00\x00\x01\x00\x02\x00\x00\x00\x19\x00\x19\x00\x2d\x00\x2e\x00\x2f\x00\x2a\x00\x2b\x00\x2c\x00\x09\x00\x00\x00\x23\x00\x23\x00\x37\x00\x2d\x00\x4b\x00\x4c\x00\x4d\x00\x00\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x37\x00\x00\x00\x01\x00\x4b\x00\x4c\x00\x4d\x00\x4e\x00\x00\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x00\x00\x37\x00\x33\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x00\x00\x3e\x00\x3a\x00\x00\x00\x00\x00\x47\x00\x48\x00\x2a\x00\x2b\x00\x2c\x00\x47\x00\x48\x00\x00\x00\x45\x00\x46\x00\x04\x00\x33\x00\x34\x00\x00\x00\x33\x00\x34\x00\x0a\x00\x39\x00\x1e\x00\x3b\x00\x39\x00\x17\x00\x3b\x00\x00\x00\x01\x00\x02\x00\x26\x00\x43\x00\x44\x00\x00\x00\x43\x00\x44\x00\x22\x00\x4b\x00\x4c\x00\x00\x00\x33\x00\x34\x00\x00\x00\x20\x00\x2a\x00\x00\x00\x39\x00\x33\x00\x3b\x00\x10\x00\x27\x00\x12\x00\x04\x00\x2a\x00\x3a\x00\x00\x00\x43\x00\x44\x00\x04\x00\x05\x00\x02\x00\x00\x00\x01\x00\x02\x00\x00\x00\x01\x00\x02\x00\x00\x00\x00\x00\x1e\x00\x00\x00\x01\x00\x02\x00\x1c\x00\x1d\x00\x21\x00\x00\x00\x26\x00\x33\x00\x34\x00\x00\x00\x0d\x00\x28\x00\x0f\x00\x39\x00\x25\x00\x3b\x00\x27\x00\x28\x00\x29\x00\x04\x00\x2b\x00\x00\x00\x18\x00\x43\x00\x44\x00\x10\x00\x25\x00\x12\x00\x33\x00\x34\x00\x35\x00\x36\x00\x2b\x00\x00\x00\x39\x00\x00\x00\x3b\x00\x3c\x00\x3d\x00\x2a\x00\x3f\x00\x33\x00\x34\x00\x00\x00\x33\x00\x44\x00\x45\x00\x39\x00\x47\x00\x3b\x00\x33\x00\x3a\x00\x25\x00\x00\x00\x27\x00\x28\x00\x29\x00\x3a\x00\x2b\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x4b\x00\x00\x00\x33\x00\x34\x00\x35\x00\x36\x00\x00\x00\x00\x00\x39\x00\x00\x00\x3b\x00\x3c\x00\x3d\x00\x00\x00\x3f\x00\x10\x00\x00\x00\x12\x00\x0e\x00\x44\x00\x45\x00\x20\x00\x47\x00\x00\x00\x01\x00\x02\x00\x03\x00\x0c\x00\x27\x00\x1c\x00\x1d\x00\x2a\x00\x0c\x00\x0d\x00\x00\x00\x01\x00\x02\x00\x03\x00\x20\x00\x20\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x27\x00\x27\x00\x00\x00\x2a\x00\x2a\x00\x37\x00\x00\x00\x00\x00\x01\x00\x02\x00\x03\x00\x07\x00\x3e\x00\x3f\x00\x0a\x00\x41\x00\x00\x00\x01\x00\x02\x00\x03\x00\x06\x00\x06\x00\x12\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x00\x00\x01\x00\x02\x00\x03\x00\x45\x00\x37\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x21\x00\x3e\x00\x3f\x00\x05\x00\x41\x00\x37\x00\x04\x00\x28\x00\x4b\x00\x01\x00\x3c\x00\x3d\x00\x3e\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x37\x00\x02\x00\x06\x00\x06\x00\x01\x00\x3c\x00\x3d\x00\x3e\x00\x06\x00\x37\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x41\x00\x00\x00\x01\x00\x02\x00\x03\x00\x46\x00\x3e\x00\x01\x00\x0c\x00\x4b\x00\x4b\x00\x07\x00\x02\x00\x00\x00\x01\x00\x02\x00\x03\x00\x0e\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x0d\x00\x2d\x00\x0e\x00\x02\x00\x4b\x00\x4a\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x2d\x00\x2e\x00\x2f\x00\x0a\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x02\x00\x37\x00\x3e\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x32\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x3e\x00\x03\x00\x4b\x00\x0a\x00\x37\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x3e\x00\x04\x00\x0b\x00\x08\x00\x02\x00\x4b\x00\x03\x00\x0a\x00\x37\x00\x4b\x00\x0d\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x00\x00\x01\x00\x02\x00\x03\x00\x01\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x1b\x00\x04\x00\x3e\x00\x4b\x00\x04\x00\x04\x00\x00\x00\x04\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x06\x00\x3e\x00\x0c\x00\x11\x00\x4b\x00\x17\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x22\x00\x2d\x00\x2e\x00\x2f\x00\x04\x00\x37\x00\x01\x00\x06\x00\x2a\x00\x02\x00\x11\x00\x37\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x00\x00\x01\x00\x02\x00\x03\x00\x00\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x07\x00\x08\x00\x0a\x00\x02\x00\x04\x00\x37\x00\x0c\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x01\x00\x01\x00\x3e\x00\x01\x00\x07\x00\x02\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x02\x00\x3e\x00\x01\x00\x4b\x00\x00\x00\x02\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x07\x00\x08\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x02\x00\x01\x00\x01\x00\x01\x00\x37\x00\x4b\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x38\x00\x09\x00\x23\x00\x03\x00\x37\x00\x37\x00\x37\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x07\x00\x4b\x00\x3e\x00\x04\x00\x04\x00\x01\x00\x16\x00\x0c\x00\x0e\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x04\x00\x3e\x00\x01\x00\x01\x00\x00\x00\x08\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x4b\x00\x04\x00\x4b\x00\x04\x00\x37\x00\x17\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x22\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x0d\x00\x2a\x00\x03\x00\x16\x00\x06\x00\x37\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x4b\x00\x4d\x00\x3e\x00\x0d\x00\x03\x00\x07\x00\x4b\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x01\x00\x02\x00\x03\x00\x37\x00\x04\x00\x3e\x00\x4b\x00\x00\x00\x00\x00\x06\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x11\x00\x0c\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x37\x00\x00\x00\x00\x00\x17\x00\x17\x00\x37\x00\x00\x00\x3e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x3e\x00\x0a\x00\x22\x00\x22\x00\x07\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x2a\x00\x2a\x00\x17\x00\x17\x00\x00\x00\x37\x00\x08\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x3e\x00\x22\x00\x22\x00\x0a\x00\x20\x00\x37\x00\x37\x00\x4b\x00\x2d\x00\x2a\x00\x2a\x00\x27\x00\x3e\x00\x01\x00\x2a\x00\x17\x00\x0a\x00\x01\x00\x01\x00\x2d\x00\x2e\x00\x2f\x00\x30\x00\x31\x00\x4b\x00\x02\x00\x22\x00\x03\x00\x02\x00\x37\x00\x4b\x00\x03\x00\x50\x00\x50\x00\x2a\x00\x25\x00\x3e\x00\x27\x00\x28\x00\x29\x00\x03\x00\x2b\x00\x03\x00\x08\x00\x50\x00\x4b\x00\x0d\x00\x12\x00\x4b\x00\x33\x00\x34\x00\x35\x00\x36\x00\x2e\x00\xff\xff\x39\x00\xff\xff\x3b\x00\x3c\x00\x3d\x00\x23\x00\x3f\x00\xff\xff\x26\x00\xff\xff\xff\xff\x44\x00\x45\x00\xff\xff\x47\x00\xff\xff\xff\xff\xff\xff\x30\x00\x31\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\x45\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"# happyTable :: HappyAddr -happyTable = HappyA# "\x00\x00\x50\x00\x3b\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x58\x00\x53\x00\x71\x00\x57\x00\x5a\x01\x57\x01\x95\x00\x58\x00\x96\x00\x47\x01\x74\x00\xf1\x00\x57\x01\x12\x00\x7a\x01\x13\x00\x02\x01\x7f\x00\x57\x01\x97\x00\x5a\x01\x14\x00\x4b\x00\xc8\x01\xc3\x01\x15\x00\x16\x00\x7f\x00\x98\x00\xc2\x01\xc9\x01\x17\x00\x95\x00\x5e\x00\x96\x00\x58\x00\x9e\x01\xea\x00\xf2\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x97\x00\x1e\x00\xf3\x00\xf4\x00\x1f\x00\x06\x00\xb6\x01\x20\x00\xec\x00\x98\x00\x62\x00\x72\x00\x06\x00\x06\x00\x06\x00\x21\x00\x54\x00\x18\x01\xab\x00\xa0\x01\xbd\x00\xff\xff\x3d\x00\xd4\x00\x3d\x00\x3e\x00\xbe\x00\x22\x00\xbf\x00\x06\x00\xc1\x00\x23\x00\x24\x00\x06\x00\x26\x00\x27\x00\x12\x00\x25\x00\x13\x00\x06\x00\x06\x00\x26\x00\x27\x00\x28\x00\x14\x00\x06\x00\x64\x01\xae\x01\x15\x00\x16\x00\x4b\x00\x06\x00\x26\x00\x53\x00\x17\x00\x5c\x01\x4b\x00\xa0\x00\x5c\x00\x06\x00\x26\x00\x27\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x2e\x00\x1e\x00\x0e\x01\x2f\x00\x1f\x00\x53\x00\xa9\x00\x20\x00\xa1\x01\x5e\x01\x62\x00\xfa\x00\x8e\x00\x8f\x00\xaa\x00\x21\x00\x44\x00\x07\x00\x08\x00\x09\x00\xab\x00\x12\x00\xab\x01\x13\x00\x0f\x01\xb0\x01\xac\x01\x22\x00\x76\x01\x14\x00\x22\x01\x23\x00\x24\x00\x15\x00\x16\x00\x10\x01\xf7\xff\x25\x00\x91\x01\x17\x00\x06\x00\x26\x00\x27\x00\x28\x00\x0f\x01\x54\x00\x89\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x2e\x00\x1e\x00\x10\x01\x2f\x00\x1f\x00\x11\x01\x77\x01\x20\x00\x85\x01\xa2\x00\x0a\x01\x40\x00\x54\x00\x55\x00\x54\x01\x21\x00\xad\x01\x31\x00\x0f\x00\x55\x01\x4b\x00\x12\x00\x0b\x01\x48\x00\x8f\x01\x41\x00\x42\x00\x22\x00\x83\x01\x14\x00\x2c\x00\x23\x00\x24\x00\x15\x00\x16\x00\x4b\x00\x86\x01\x25\x00\x76\x01\x9c\x00\x06\x00\x26\x00\x27\x00\x28\x00\x9d\x00\x4b\x00\xea\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x66\x00\x1e\x00\xf2\x00\x7c\x01\x1f\x00\x8d\x00\x8e\x00\x8f\x00\xea\x00\xec\x00\x67\x00\x68\x00\x84\x01\x69\x00\x6a\x00\x6b\x00\x77\x01\x12\x00\xeb\x00\x48\x00\x06\x00\x26\x00\x36\xff\x98\x01\xec\x00\x14\x00\x78\x01\x22\x00\x4b\x00\x15\x00\x16\x00\x23\x00\x24\x00\x5c\x01\x4c\x00\x4d\x00\x07\x01\x25\x00\x9b\x01\xc7\x01\x06\x00\x26\x00\x27\x00\x28\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x71\x00\xa2\x01\x88\x01\xc8\x01\x1f\x00\x5d\x01\x5e\x01\x90\x00\x49\x00\x8d\x00\x8e\x00\x8f\x00\x15\x00\x16\x00\x91\x00\x6c\x00\x9f\x01\x57\x01\xfa\x00\x8e\x00\x8f\x00\x4c\x00\x4d\x00\x23\x01\xd5\x00\x92\x00\x2f\x01\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x95\x00\xa7\x01\x96\x00\x67\x01\x1f\x00\x57\x01\xa5\x01\x7f\x00\x06\x00\x26\x00\x27\x00\x28\x00\x25\x01\x97\x00\x7e\x00\xd6\x00\x6e\x01\x12\x00\x6f\x01\x48\x00\x7f\x00\x4b\x00\x98\x00\x58\x01\x6c\x01\x14\x00\x71\x01\x4b\x00\x90\x00\x15\x00\x16\x00\xfa\x00\x8e\x00\x8f\x00\xd8\x00\x89\x01\x7e\x01\xa2\x00\x0a\x01\x2d\x01\x06\x00\x26\x00\x27\x00\x28\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x71\x00\x0b\x01\x48\x00\x0c\x01\x1f\x00\x4c\x00\x4d\x00\x63\x00\x49\x00\x8d\x00\x8e\x00\x8f\x00\x15\x00\x16\x00\x4c\x00\x4d\x00\x98\x00\xfa\x00\x8e\x00\x8f\x00\x4c\x00\x4d\x00\x4e\x00\x06\x00\x26\x00\x27\x00\x44\x01\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x2b\x00\xa2\x00\x90\x01\x3d\x01\x1f\x00\x95\x00\x7e\x00\x96\x00\x06\x00\x26\x00\x27\x00\x28\x00\x7f\x00\x2c\x00\x61\x01\x02\x01\x57\xff\x47\x00\x97\x00\x48\x00\x06\x00\x07\x00\x08\x00\x09\x00\x57\xff\x49\x00\x62\x00\x98\x00\x90\x00\x15\x00\x16\x00\x44\x00\x07\x00\x08\x00\x09\x00\x00\x01\xa2\x00\x0d\x01\xf5\x00\xf5\x00\x06\x00\x26\x00\x27\x00\x28\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x06\x00\x07\x00\x08\x00\x09\x00\x1f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x5a\x01\x8d\x00\x8e\x00\x8f\x00\xbf\x01\xf6\x00\xf6\x00\x0a\x00\x0b\x00\x78\x00\x4c\x00\x4d\x00\x63\x00\xc0\x01\x5b\x01\x88\x01\xf7\x00\x0f\x00\x6f\x00\x06\x00\x26\x00\x27\x00\xa1\x00\x8e\x00\x8f\x00\xfa\x00\x8e\x00\x8f\x00\x0f\x00\x5b\x00\x5c\x00\x06\x00\x26\x00\x27\x00\x28\x00\x5f\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x39\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x39\x01\x0f\x00\xfa\x00\x8e\x00\x8f\x00\xe1\x00\x0f\x00\x90\x00\x10\x00\x8d\x00\x8e\x00\x8f\x00\xda\x00\x10\x00\x91\x00\xd5\x00\xe4\x00\x3a\x01\x94\x01\x4c\x00\x4d\x00\x63\x00\x3a\x01\x3b\x01\x4b\x00\x92\x00\x93\x00\x34\x01\xa2\x00\xa3\x00\x1e\x01\xa2\x00\xa3\x00\x7f\x00\xa4\x00\xe2\x00\xa5\x00\xa4\x00\xd6\x00\xa5\x00\xfa\x00\x8e\x00\x8f\x00\x7a\x01\xa6\x00\xa7\x00\x57\x01\xa6\x00\x2c\x01\xd7\x00\x28\x00\x29\x00\xe1\x00\xa2\x00\xa3\x00\xed\x00\xdb\x00\xd8\x00\x80\x01\xa4\x00\x90\x00\xa5\x00\x66\x01\x74\x01\x67\x01\xa9\x01\xdd\x00\x56\x01\x21\x01\xa6\x00\x40\x01\x2f\x00\x30\x00\x24\x01\xfa\x00\x8e\x00\x8f\x00\x8d\x00\x8e\x00\x8f\x00\x80\x00\xcb\x00\xe2\x00\x8d\x00\x8e\x00\x8f\x00\x81\x01\xb1\x01\xee\x00\xab\x00\xe3\x00\xa2\x00\xa3\x00\x57\x01\xcc\x00\x7f\x01\xcd\x00\xa4\x00\xad\x00\xa5\x00\xae\x00\xaf\x00\xb0\x00\xb0\x01\xb1\x00\xc2\x00\xc3\x00\xa6\x00\xfb\x00\x68\x01\xdf\x00\x67\x01\xb2\x00\xb3\x00\xb4\x00\xb5\x00\xe0\x00\xc4\x00\xb6\x00\xc5\x00\xb7\x00\xb8\x00\xb9\x00\xce\x00\xba\x00\xa2\x00\xa3\x00\xc6\x00\x90\x00\xbb\x00\xbc\x00\xa4\x00\xbd\x00\x3e\x01\x90\x00\x00\x01\xad\x00\x4b\x00\xae\x00\xaf\x00\xb0\x00\x15\x01\xb1\x00\x06\x00\x07\x00\x08\x00\x09\x00\xc7\x00\x06\x00\x80\x01\xb2\x00\xb3\x00\xb4\x00\xb5\x00\x4b\x00\x4b\x00\xb6\x00\x7e\x00\xb7\x00\xb8\x00\xb9\x00\x32\x00\xba\x00\x7f\x00\x85\x00\x86\x00\x80\x00\xbb\x00\xbc\x00\xdb\x00\xbd\x00\x06\x00\x07\x00\x08\x00\x09\x00\x33\x00\x4e\x01\x81\x01\x82\x01\xdd\x00\x42\x00\x52\x00\x5e\x00\x07\x00\x08\x00\x09\x00\xdb\x00\xdb\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x1c\x01\x4f\x01\xdc\x00\xcb\x01\xdd\x00\xdd\x00\x0f\x00\xed\x00\x5e\x00\x07\x00\x08\x00\x09\x00\x3c\xff\x10\x00\x59\x00\x3c\xff\x1d\x01\x44\x00\x07\x00\x08\x00\x09\x00\xcc\x01\xc6\x01\x6f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x58\x00\x06\x00\x07\x00\x08\x00\x09\x00\xc5\x01\x0f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x5f\x00\xee\x00\x10\x00\x59\x00\x06\x00\x5a\x00\x0f\x00\xbb\x01\xef\x00\xbc\x01\xbe\x01\x54\x00\x95\x01\x10\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x5f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x45\x00\x0f\x00\xbd\x01\xbf\x01\xb5\x01\xb6\x01\x54\x00\x60\x00\x10\x00\x06\x00\x0f\x00\xa7\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\x3c\x01\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\xd0\x00\x06\x00\x07\x00\x08\x00\x09\x00\xd1\x00\x10\x00\xb3\x01\xaa\x01\x06\x00\x06\x00\x47\x01\x97\x01\x06\x00\x07\x00\x08\x00\x09\x00\x98\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\xf9\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x9a\x01\x9b\x01\x9d\x01\xa5\x01\xa4\x01\x06\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\x9f\x00\x0a\x00\x0b\x00\x79\x00\x66\x01\x0f\x00\x44\x00\x07\x00\x08\x00\x09\x00\x6a\x01\x0f\x00\x10\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\xaa\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\xb3\x01\x06\x00\x10\x00\x6b\x01\x70\x01\x6c\x01\x0f\x00\x71\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\xac\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x6c\x00\x10\x00\x7c\x01\xb7\x01\x06\x00\x06\x00\x8b\x01\x8c\x01\x06\x00\x0f\x00\xb8\x01\xc1\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x93\x01\x06\x00\x07\x00\x08\x00\x09\x00\x8d\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x29\x01\x93\x01\x10\x00\x27\x01\x28\x01\x2a\x01\xd5\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9d\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x72\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x2b\x01\x10\x00\x31\x01\x32\x01\x36\x01\xd6\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x73\x01\xd9\x00\x0a\x00\x0b\x00\x7a\x00\x33\x01\x0f\x00\x35\x01\x37\x01\xd8\x00\x38\x01\x39\x01\x0f\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x06\x00\x06\x00\x07\x00\x08\x00\x09\x00\xb7\x01\x42\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x75\x01\xb8\x01\xb9\x01\x44\x01\x43\x01\x46\x01\x0f\x00\x48\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x7d\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x49\x01\x4a\x01\x10\x00\x4b\x01\x06\x00\x4c\x01\x4d\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x8d\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x8e\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x4e\x01\x10\x00\x51\x01\x52\x01\x53\x01\x56\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x06\x00\x65\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x2b\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x2e\x01\x0f\x00\x61\x01\x63\x01\xcb\x00\xd2\x00\x0f\x00\xd3\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x3f\x01\xd4\x00\xf9\x00\xfd\x00\xfe\x00\xff\x00\x0f\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x05\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x00\x01\x85\x00\x10\x00\x03\x01\x04\x01\x05\x01\x0a\x01\x06\x00\x14\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x06\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x08\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x10\x00\x13\x01\x17\x01\xd5\x00\x15\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x19\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x1b\x01\x0f\x00\x18\x01\x1b\x01\x06\x00\x27\x00\x0f\x00\xd6\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\xe0\x00\x21\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x1f\x01\x06\x00\xd8\x00\x06\x00\x6e\x00\x75\x00\x0f\x00\x7d\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x75\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x06\x00\x82\x00\x10\x00\x83\x00\x84\x00\x87\x00\x89\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x76\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x77\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x88\x00\x10\x00\x8b\x00\xd5\x00\xd5\x00\x8d\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x8c\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x7b\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9d\x00\x0f\x00\xd5\x00\xd5\x00\xd6\x00\xd6\x00\x0f\x00\x4b\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x10\x00\x9a\x00\xe5\x00\xe6\x00\x9b\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x5f\x00\xd8\x00\xd8\x00\xd6\x00\xd6\x00\xd5\x00\x0f\x00\x7f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x51\x00\x10\x00\xe7\x00\xe9\x00\xc1\x00\xdb\x00\x0f\x00\x06\x00\xc9\x00\xca\x00\xd8\x00\xd8\x00\xe8\x00\x10\x00\x3b\x00\xdd\x00\xd6\x00\xff\xff\x06\x00\x44\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x4a\x00\xff\xff\xf0\x00\x4b\x00\x06\x00\x0f\x00\x51\x00\x65\x00\xff\xff\x6e\x00\xd8\x00\xad\x00\x10\x00\xae\x00\xaf\x00\xb0\x00\x6f\x00\xb1\x00\x2b\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb2\x00\xb3\x00\xb4\x00\xb5\x00\x00\x00\x00\x00\xb6\x00\x00\x00\xb7\x00\xb8\x00\xb9\x00\x35\x00\xba\x00\x00\x00\x36\x00\x00\x00\x00\x00\xbb\x00\xbc\x00\x00\x00\xbd\x00\x00\x00\x00\x00\x00\x00\x37\x00\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x39\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# +happyTable = HappyA# "\x00\x00\x50\x00\x3b\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x3b\x00\x3c\x00\x58\x00\x53\x00\x71\x00\x57\x00\x5a\x01\x57\x01\x95\x00\x58\x00\x96\x00\x47\x01\x74\x00\xf1\x00\x57\x01\x12\x00\x7b\x01\x13\x00\x02\x01\x7f\x00\x57\x01\x97\x00\x5a\x01\x14\x00\x4b\x00\xcb\x01\xc6\x01\x15\x00\x16\x00\x7f\x00\x98\x00\xc5\x01\xcc\x01\x17\x00\x95\x00\x5e\x00\x96\x00\x58\x00\x9f\x01\xea\x00\xf2\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x97\x00\x1e\x00\xf3\x00\xf4\x00\x1f\x00\x06\x00\xb9\x01\x20\x00\xec\x00\x98\x00\x62\x00\x72\x00\x06\x00\x06\x00\x06\x00\x21\x00\x54\x00\x18\x01\xab\x00\xa1\x01\xbd\x00\xff\xff\x3d\x00\xd4\x00\x3d\x00\x3e\x00\xbe\x00\x22\x00\xbf\x00\x06\x00\xc1\x00\x23\x00\x24\x00\x06\x00\x26\x00\x27\x00\x12\x00\x25\x00\x13\x00\x06\x00\x06\x00\x26\x00\x27\x00\x28\x00\x14\x00\x06\x00\x64\x01\xb1\x01\x15\x00\x16\x00\x4b\x00\x06\x00\x26\x00\x53\x00\x17\x00\x5c\x01\x4b\x00\xa0\x00\x5c\x00\x06\x00\x26\x00\x27\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x2e\x00\x1e\x00\x0e\x01\x2f\x00\x1f\x00\x53\x00\xa9\x00\x20\x00\xa2\x01\x5e\x01\x62\x00\xfa\x00\x8e\x00\x8f\x00\xaa\x00\x21\x00\x44\x00\x07\x00\x08\x00\x09\x00\xab\x00\x12\x00\xae\x01\x13\x00\x0f\x01\xb3\x01\xaf\x01\x22\x00\x77\x01\x14\x00\x22\x01\x23\x00\x24\x00\x15\x00\x16\x00\x10\x01\xf7\xff\x25\x00\x92\x01\x17\x00\x06\x00\x26\x00\x27\x00\x28\x00\x0f\x01\x54\x00\x89\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x2e\x00\x1e\x00\x10\x01\x2f\x00\x1f\x00\x11\x01\x78\x01\x20\x00\x86\x01\xa2\x00\x0a\x01\x40\x00\x54\x00\x55\x00\x54\x01\x21\x00\xb0\x01\x31\x00\x0f\x00\x55\x01\x4b\x00\x12\x00\x0b\x01\x48\x00\x90\x01\x41\x00\x42\x00\x22\x00\x84\x01\x14\x00\x2c\x00\x23\x00\x24\x00\x15\x00\x16\x00\x4b\x00\x87\x01\x25\x00\x77\x01\x9c\x00\x06\x00\x26\x00\x27\x00\x28\x00\x9d\x00\x4b\x00\xea\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x66\x00\x1e\x00\xf2\x00\x7d\x01\x1f\x00\x8d\x00\x8e\x00\x8f\x00\xea\x00\xec\x00\x67\x00\x68\x00\x85\x01\x69\x00\x6a\x00\x6b\x00\x78\x01\x12\x00\xeb\x00\x48\x00\x06\x00\x26\x00\x35\xff\x99\x01\xec\x00\x14\x00\x79\x01\x22\x00\x4b\x00\x15\x00\x16\x00\x23\x00\x24\x00\x5c\x01\x4c\x00\x4d\x00\x07\x01\x25\x00\x9c\x01\xca\x01\x06\x00\x26\x00\x27\x00\x28\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x71\x00\xa4\x01\x89\x01\xcb\x01\x1f\x00\x5d\x01\x5e\x01\x90\x00\x49\x00\x8d\x00\x8e\x00\x8f\x00\x15\x00\x16\x00\x91\x00\x6c\x00\xa0\x01\x57\x01\xfa\x00\x8e\x00\x8f\x00\x4c\x00\x4d\x00\x23\x01\xd5\x00\x92\x00\x2f\x01\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x95\x00\xa9\x01\x96\x00\x67\x01\x1f\x00\x57\x01\xa7\x01\x7f\x00\x06\x00\x26\x00\x27\x00\x28\x00\x25\x01\x97\x00\x7e\x00\xd6\x00\x6f\x01\x12\x00\x70\x01\x48\x00\x7f\x00\x4b\x00\x98\x00\x58\x01\x6a\x01\x14\x00\x72\x01\x4b\x00\x90\x00\x15\x00\x16\x00\xfa\x00\x8e\x00\x8f\x00\xd8\x00\x8a\x01\x6d\x01\xa2\x00\x0a\x01\x7f\x01\x06\x00\x26\x00\x27\x00\x28\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x71\x00\x0b\x01\x48\x00\x0c\x01\x1f\x00\x4c\x00\x4d\x00\x63\x00\x49\x00\x8d\x00\x8e\x00\x8f\x00\x15\x00\x16\x00\x4c\x00\x4d\x00\x98\x00\xfa\x00\x8e\x00\x8f\x00\x4c\x00\x4d\x00\x4e\x00\x06\x00\x26\x00\x27\x00\x44\x01\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x2b\x00\xa2\x00\x91\x01\x2d\x01\x1f\x00\x95\x00\x7e\x00\x96\x00\x06\x00\x26\x00\x27\x00\x28\x00\x7f\x00\x2c\x00\x61\x01\x02\x01\x56\xff\x47\x00\x97\x00\x48\x00\x06\x00\x07\x00\x08\x00\x09\x00\x56\xff\x49\x00\x62\x00\x98\x00\x90\x00\x15\x00\x16\x00\x44\x00\x07\x00\x08\x00\x09\x00\x00\x01\xa2\x00\x0d\x01\xf5\x00\xf5\x00\x06\x00\x26\x00\x27\x00\x28\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x06\x00\x07\x00\x08\x00\x09\x00\x1f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x3d\x01\x8d\x00\x8e\x00\x8f\x00\xc2\x01\xf6\x00\xf6\x00\x0a\x00\x0b\x00\x78\x00\x4c\x00\x4d\x00\x63\x00\xc3\x01\x5a\x01\x89\x01\xf7\x00\x0f\x00\x6f\x00\x06\x00\x26\x00\x27\x00\xa1\x00\x8e\x00\x8f\x00\xfa\x00\x8e\x00\x8f\x00\x0f\x00\x5b\x00\x5c\x00\x06\x00\x26\x00\x27\x00\x28\x00\x5b\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x39\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x39\x01\x0f\x00\xfa\x00\x8e\x00\x8f\x00\xe1\x00\x0f\x00\x90\x00\x10\x00\x8d\x00\x8e\x00\x8f\x00\x5f\x01\x10\x00\x91\x00\xd5\x00\xda\x00\x3a\x01\x95\x01\x4c\x00\x4d\x00\x63\x00\x3a\x01\x3b\x01\x4b\x00\x92\x00\x93\x00\x34\x01\xa2\x00\xa3\x00\xe4\x00\xa2\x00\xa3\x00\x7f\x00\xa4\x00\xe2\x00\xa5\x00\xa4\x00\xd6\x00\xa5\x00\xfa\x00\x8e\x00\x8f\x00\x7b\x01\xa6\x00\xa7\x00\x57\x01\xa6\x00\x2c\x01\xd7\x00\x28\x00\x29\x00\xe1\x00\xa2\x00\xa3\x00\xed\x00\xdb\x00\xd8\x00\x81\x01\xa4\x00\x90\x00\xa5\x00\xab\x01\x75\x01\x67\x01\xab\x01\xdd\x00\x56\x01\x1e\x01\xa6\x00\x40\x01\x2f\x00\x30\x00\x24\x01\xfa\x00\x8e\x00\x8f\x00\x8d\x00\x8e\x00\x8f\x00\x21\x01\xcb\x00\xe2\x00\x8d\x00\x8e\x00\x8f\x00\x82\x01\xb4\x01\xee\x00\x80\x00\xe3\x00\xa2\x00\xa3\x00\x57\x01\xcc\x00\x80\x01\xcd\x00\xa4\x00\xad\x00\xa5\x00\xae\x00\xaf\x00\xb0\x00\xb3\x01\xb1\x00\xc2\x00\xab\x00\xa6\x00\xfb\x00\x66\x01\xdf\x00\x67\x01\xb2\x00\xb3\x00\xb4\x00\xb5\x00\xe0\x00\xc3\x00\xb6\x00\xc4\x00\xb7\x00\xb8\x00\xb9\x00\xce\x00\xba\x00\xa2\x00\xa3\x00\xc5\x00\x90\x00\xbb\x00\xbc\x00\xa4\x00\xbd\x00\x3e\x01\x90\x00\x00\x01\xad\x00\x4b\x00\xae\x00\xaf\x00\xb0\x00\x15\x01\xb1\x00\x06\x00\x07\x00\x08\x00\x09\x00\x57\x01\x06\x00\x81\x01\xb2\x00\xb3\x00\xb4\x00\xb5\x00\x4b\x00\x4b\x00\xb6\x00\xc6\x00\xb7\x00\xb8\x00\xb9\x00\xc7\x00\xba\x00\x68\x01\x32\x00\x67\x01\x42\x00\xbb\x00\xbc\x00\xdb\x00\xbd\x00\x06\x00\x07\x00\x08\x00\x09\x00\x33\x00\x4e\x01\x82\x01\x83\x01\xdd\x00\x85\x00\x86\x00\x5e\x00\x07\x00\x08\x00\x09\x00\xdb\x00\xdb\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x1c\x01\x4f\x01\xdc\x00\x52\x00\xdd\x00\xdd\x00\x0f\x00\xed\x00\x5e\x00\x07\x00\x08\x00\x09\x00\x3b\xff\x10\x00\x59\x00\x3b\xff\x1d\x01\x44\x00\x07\x00\x08\x00\x09\x00\xce\x01\xcf\x01\x6f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x58\x00\x06\x00\x07\x00\x08\x00\x09\x00\xc9\x01\x0f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x5f\x00\xee\x00\x10\x00\x59\x00\xc8\x01\x5a\x00\x0f\x00\xbe\x01\xef\x00\x06\x00\xbf\x01\x54\x00\x96\x01\x10\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x5f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x45\x00\x0f\x00\xc0\x01\xc1\x01\xc2\x01\xb8\x01\x54\x00\x60\x00\x10\x00\xb9\x01\x0f\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\x3c\x01\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\xd0\x00\x06\x00\x07\x00\x08\x00\x09\x00\xd1\x00\x10\x00\xa9\x01\xad\x01\x06\x00\x06\x00\xb6\x01\x47\x01\x06\x00\x07\x00\x08\x00\x09\x00\x98\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\xf9\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x99\x01\x9b\x01\x9c\x01\x9e\x01\x06\x00\xa4\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\x9f\x00\x0a\x00\x0b\x00\x79\x00\xa7\x01\x0f\x00\x44\x00\x07\x00\x08\x00\x09\x00\x66\x01\x0f\x00\x10\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x00\xaa\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\xb6\x01\xa6\x01\x10\x00\x6a\x01\x06\x00\x6c\x01\x0f\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\xaf\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x6c\x00\x10\x00\x7e\x00\x6d\x01\x71\x01\x72\x01\x06\x00\x7d\x01\x7f\x00\x0f\x00\x06\x00\x80\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x94\x01\x06\x00\x07\x00\x08\x00\x09\x00\x8d\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x8e\x01\x8c\x01\x10\x00\x06\x00\x94\x01\x27\x01\xd5\x00\x28\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9e\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x73\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x29\x01\x10\x00\x2a\x01\x2b\x01\x06\x00\xd6\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x74\x01\xd9\x00\x0a\x00\x0b\x00\x7a\x00\x31\x01\x0f\x00\x32\x01\x35\x01\xd8\x00\x33\x01\x36\x01\x0f\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x38\x01\x06\x00\x07\x00\x08\x00\x09\x00\xba\x01\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x76\x01\xbb\x01\xc4\x01\x37\x01\x39\x01\x42\x01\x0f\x00\x43\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x7e\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x44\x01\x46\x01\x10\x00\x48\x01\x4a\x01\x49\x01\x4b\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x8e\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x8f\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x4c\x01\x10\x00\x4d\x01\x06\x00\xba\x01\x4e\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\xbb\x01\xbc\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x2b\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x2e\x01\x0f\x00\x51\x01\x52\x01\x53\x01\x56\x01\x0f\x00\x06\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x3f\x01\x63\x01\x61\x01\x65\x01\xcb\x00\xd2\x00\x0f\x00\xd3\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x05\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\xd4\x00\x06\x00\x10\x00\xf9\x00\xfd\x00\xfe\x00\xff\x00\x85\x00\x00\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x06\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x08\x01\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x03\x01\x10\x00\x04\x01\x05\x01\xd5\x00\x15\x01\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x19\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x1b\x01\x0f\x00\x06\x00\x0a\x01\x06\x00\x13\x01\x0f\x00\xd6\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\xe0\x00\x14\x01\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x1f\x01\x17\x01\xd8\x00\x18\x01\x1b\x01\x21\x01\x0f\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x75\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x06\x00\x27\x00\x10\x00\x6e\x00\x75\x00\x82\x00\x06\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x76\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x77\x00\x0f\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0f\x00\x7d\x00\x10\x00\x06\x00\xd5\x00\xd5\x00\x83\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x87\x00\x84\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x7b\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x9d\x00\x0f\x00\xd5\x00\xd5\x00\xd6\x00\xd6\x00\x0f\x00\x4b\x00\x10\x00\x06\x00\x07\x00\x08\x00\x09\x00\x10\x00\x88\x00\xe5\x00\xe6\x00\x89\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x5f\x00\xd8\x00\xd8\x00\xd6\x00\xd6\x00\xd5\x00\x0f\x00\x8b\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x51\x00\x10\x00\xe7\x00\xe9\x00\x8c\x00\xdb\x00\x0f\x00\x8d\x00\x06\x00\x9a\x00\xd8\x00\xd8\x00\xe8\x00\x10\x00\x9b\x00\xdd\x00\xd6\x00\x7f\x00\xc1\x00\x3b\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x06\x00\xc9\x00\xf0\x00\x44\x00\xca\x00\x0f\x00\x06\x00\x4a\x00\xff\xff\xff\xff\xd8\x00\xad\x00\x10\x00\xae\x00\xaf\x00\xb0\x00\x4b\x00\xb1\x00\x51\x00\x65\x00\xff\xff\x06\x00\x6e\x00\x6f\x00\x06\x00\xb2\x00\xb3\x00\xb4\x00\xb5\x00\x2b\x00\x00\x00\xb6\x00\x00\x00\xb7\x00\xb8\x00\xb9\x00\x35\x00\xba\x00\x00\x00\x36\x00\x00\x00\x00\x00\xbb\x00\xbc\x00\x00\x00\xbd\x00\x00\x00\x00\x00\x00\x00\x37\x00\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x39\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"# -happyReduceArr = array (4, 235) [ +happyReduceArr = array (4, 236) [ (4 , happyReduce_4), (5 , happyReduce_5), (6 , happyReduce_6), @@ -742,7 +742,8 @@ happyReduceArr = array (4, 235) [ (232 , happyReduce_232), (233 , happyReduce_233), (234 , happyReduce_234), - (235 , happyReduce_235) + (235 , happyReduce_235), + (236 , happyReduce_236) ] happy_n_terms = 81 :: Int @@ -1003,29 +1004,43 @@ happyReduction_30 happy_x_3 (MWith happy_var_1 happy_var_3 )}} -happyReduce_31 = happySpecReduce_2 13# happyReduction_31 -happyReduction_31 happy_x_2 +happyReduce_31 = happyReduce 5# 13# happyReduction_31 +happyReduction_31 (happy_x_5 `HappyStk` + happy_x_4 `HappyStk` + happy_x_3 `HappyStk` + happy_x_2 `HappyStk` + happy_x_1 `HappyStk` + happyRest) + = case happyOut49 happy_x_1 of { happy_var_1 -> + case happyOut7 happy_x_3 of { happy_var_3 -> + case happyOut23 happy_x_5 of { happy_var_5 -> + happyIn20 + (MWithE happy_var_1 happy_var_3 happy_var_5 + ) `HappyStk` happyRest}}} + +happyReduce_32 = happySpecReduce_2 13# happyReduction_32 +happyReduction_32 happy_x_2 happy_x_1 = case happyOut7 happy_x_2 of { happy_var_2 -> happyIn20 (MReuse happy_var_2 )} -happyReduce_32 = happySpecReduce_2 13# happyReduction_32 -happyReduction_32 happy_x_2 +happyReduce_33 = happySpecReduce_2 13# happyReduction_33 +happyReduction_33 happy_x_2 happy_x_1 = case happyOut28 happy_x_2 of { happy_var_2 -> happyIn20 (MUnion happy_var_2 )} -happyReduce_33 = happySpecReduce_0 14# happyReduction_33 -happyReduction_33 = happyIn21 +happyReduce_34 = happySpecReduce_0 14# happyReduction_34 +happyReduction_34 = happyIn21 ([] ) -happyReduce_34 = happySpecReduce_2 14# happyReduction_34 -happyReduction_34 happy_x_2 +happyReduce_35 = happySpecReduce_2 14# happyReduction_35 +happyReduction_35 happy_x_2 happy_x_1 = case happyOut21 happy_x_1 of { happy_var_1 -> case happyOut31 happy_x_2 of { happy_var_2 -> @@ -1033,33 +1048,33 @@ happyReduction_34 happy_x_2 (flip (:) happy_var_1 happy_var_2 )}} -happyReduce_35 = happySpecReduce_2 15# happyReduction_35 -happyReduction_35 happy_x_2 +happyReduce_36 = happySpecReduce_2 15# happyReduction_36 +happyReduction_36 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> happyIn22 (Ext happy_var_1 )} -happyReduce_36 = happySpecReduce_0 15# happyReduction_36 -happyReduction_36 = happyIn22 +happyReduce_37 = happySpecReduce_0 15# happyReduction_37 +happyReduction_37 = happyIn22 (NoExt ) -happyReduce_37 = happySpecReduce_0 16# happyReduction_37 -happyReduction_37 = happyIn23 +happyReduce_38 = happySpecReduce_0 16# happyReduction_38 +happyReduction_38 = happyIn23 ([] ) -happyReduce_38 = happySpecReduce_1 16# happyReduction_38 -happyReduction_38 happy_x_1 +happyReduce_39 = happySpecReduce_1 16# happyReduction_39 +happyReduction_39 happy_x_1 = case happyOut25 happy_x_1 of { happy_var_1 -> happyIn23 ((:[]) happy_var_1 )} -happyReduce_39 = happySpecReduce_3 16# happyReduction_39 -happyReduction_39 happy_x_3 +happyReduce_40 = happySpecReduce_3 16# happyReduction_40 +happyReduction_40 happy_x_3 happy_x_2 happy_x_1 = case happyOut25 happy_x_1 of { happy_var_1 -> @@ -1068,29 +1083,29 @@ happyReduction_39 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_40 = happySpecReduce_0 17# happyReduction_40 -happyReduction_40 = happyIn24 +happyReduce_41 = happySpecReduce_0 17# happyReduction_41 +happyReduction_41 = happyIn24 (NoOpens ) -happyReduce_41 = happySpecReduce_3 17# happyReduction_41 -happyReduction_41 happy_x_3 +happyReduce_42 = happySpecReduce_3 17# happyReduction_42 +happyReduction_42 happy_x_3 happy_x_2 happy_x_1 = case happyOut23 happy_x_2 of { happy_var_2 -> happyIn24 - (Opens happy_var_2 + (OpenIn happy_var_2 )} -happyReduce_42 = happySpecReduce_1 18# happyReduction_42 -happyReduction_42 happy_x_1 +happyReduce_43 = happySpecReduce_1 18# happyReduction_43 +happyReduction_43 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn25 (OName happy_var_1 )} -happyReduce_43 = happyReduce 4# 18# happyReduction_43 -happyReduction_43 (happy_x_4 `HappyStk` +happyReduce_44 = happyReduce 4# 18# happyReduction_44 +happyReduction_44 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -1101,8 +1116,8 @@ happyReduction_43 (happy_x_4 `HappyStk` (OQualQO happy_var_2 happy_var_3 ) `HappyStk` happyRest}} -happyReduce_44 = happyReduce 6# 18# happyReduction_44 -happyReduction_44 (happy_x_6 `HappyStk` +happyReduce_45 = happyReduce 6# 18# happyReduction_45 +happyReduction_45 (happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` @@ -1116,48 +1131,48 @@ happyReduction_44 (happy_x_6 `HappyStk` (OQual happy_var_2 happy_var_3 happy_var_5 ) `HappyStk` happyRest}}} -happyReduce_45 = happySpecReduce_0 19# happyReduction_45 -happyReduction_45 = happyIn26 +happyReduce_46 = happySpecReduce_0 19# happyReduction_46 +happyReduction_46 = happyIn26 (CMCompl ) -happyReduce_46 = happySpecReduce_1 19# happyReduction_46 -happyReduction_46 happy_x_1 +happyReduce_47 = happySpecReduce_1 19# happyReduction_47 +happyReduction_47 happy_x_1 = happyIn26 (CMIncompl ) -happyReduce_47 = happySpecReduce_0 20# happyReduction_47 -happyReduction_47 = happyIn27 +happyReduce_48 = happySpecReduce_0 20# happyReduction_48 +happyReduction_48 = happyIn27 (QOCompl ) -happyReduce_48 = happySpecReduce_1 20# happyReduction_48 -happyReduction_48 happy_x_1 - = happyIn27 - (QOIncompl - ) - happyReduce_49 = happySpecReduce_1 20# happyReduction_49 happyReduction_49 happy_x_1 + = happyIn27 + (QOIncompl + ) + +happyReduce_50 = happySpecReduce_1 20# happyReduction_50 +happyReduction_50 happy_x_1 = happyIn27 (QOInterface ) -happyReduce_50 = happySpecReduce_0 21# happyReduction_50 -happyReduction_50 = happyIn28 +happyReduce_51 = happySpecReduce_0 21# happyReduction_51 +happyReduction_51 = happyIn28 ([] ) -happyReduce_51 = happySpecReduce_1 21# happyReduction_51 -happyReduction_51 happy_x_1 +happyReduce_52 = happySpecReduce_1 21# happyReduction_52 +happyReduction_52 happy_x_1 = case happyOut29 happy_x_1 of { happy_var_1 -> happyIn28 ((:[]) happy_var_1 )} -happyReduce_52 = happySpecReduce_3 21# happyReduction_52 -happyReduction_52 happy_x_3 +happyReduce_53 = happySpecReduce_3 21# happyReduction_53 +happyReduction_53 happy_x_3 happy_x_2 happy_x_1 = case happyOut29 happy_x_1 of { happy_var_1 -> @@ -1166,15 +1181,15 @@ happyReduction_52 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_53 = happySpecReduce_1 22# happyReduction_53 -happyReduction_53 happy_x_1 +happyReduce_54 = happySpecReduce_1 22# happyReduction_54 +happyReduction_54 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn29 (IAll happy_var_1 )} -happyReduce_54 = happyReduce 4# 22# happyReduction_54 -happyReduction_54 (happy_x_4 `HappyStk` +happyReduce_55 = happyReduce 4# 22# happyReduction_55 +happyReduction_55 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -1185,8 +1200,8 @@ happyReduction_54 (happy_x_4 `HappyStk` (ISome happy_var_1 happy_var_3 ) `HappyStk` happyRest}} -happyReduce_55 = happySpecReduce_3 23# happyReduction_55 -happyReduction_55 happy_x_3 +happyReduce_56 = happySpecReduce_3 23# happyReduction_56 +happyReduction_56 happy_x_3 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> @@ -1195,8 +1210,8 @@ happyReduction_55 happy_x_3 (DDecl happy_var_1 happy_var_3 )}} -happyReduce_56 = happySpecReduce_3 23# happyReduction_56 -happyReduction_56 happy_x_3 +happyReduce_57 = happySpecReduce_3 23# happyReduction_57 +happyReduction_57 happy_x_3 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> @@ -1205,8 +1220,8 @@ happyReduction_56 happy_x_3 (DDef happy_var_1 happy_var_3 )}} -happyReduce_57 = happyReduce 4# 23# happyReduction_57 -happyReduction_57 (happy_x_4 `HappyStk` +happyReduce_58 = happyReduce 4# 23# happyReduction_58 +happyReduction_58 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -1218,8 +1233,8 @@ happyReduction_57 (happy_x_4 `HappyStk` (DPatt happy_var_1 happy_var_2 happy_var_4 ) `HappyStk` happyRest}}} -happyReduce_58 = happyReduce 5# 23# happyReduction_58 -happyReduction_58 (happy_x_5 `HappyStk` +happyReduce_59 = happyReduce 5# 23# happyReduction_59 +happyReduction_59 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -1232,105 +1247,105 @@ happyReduction_58 (happy_x_5 `HappyStk` (DFull happy_var_1 happy_var_3 happy_var_5 ) `HappyStk` happyRest}}} -happyReduce_59 = happySpecReduce_2 24# happyReduction_59 -happyReduction_59 happy_x_2 +happyReduce_60 = happySpecReduce_2 24# happyReduction_60 +happyReduction_60 happy_x_2 happy_x_1 = case happyOut42 happy_x_2 of { happy_var_2 -> happyIn31 (DefCat happy_var_2 )} -happyReduce_60 = happySpecReduce_2 24# happyReduction_60 -happyReduction_60 happy_x_2 - happy_x_1 - = case happyOut43 happy_x_2 of { happy_var_2 -> - happyIn31 - (DefFun happy_var_2 - )} - happyReduce_61 = happySpecReduce_2 24# happyReduction_61 happyReduction_61 happy_x_2 happy_x_1 = case happyOut43 happy_x_2 of { happy_var_2 -> happyIn31 - (DefFunData happy_var_2 + (DefFun happy_var_2 )} happyReduce_62 = happySpecReduce_2 24# happyReduction_62 happyReduction_62 happy_x_2 + happy_x_1 + = case happyOut43 happy_x_2 of { happy_var_2 -> + happyIn31 + (DefFunData happy_var_2 + )} + +happyReduce_63 = happySpecReduce_2 24# happyReduction_63 +happyReduction_63 happy_x_2 happy_x_1 = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 (DefDef happy_var_2 )} -happyReduce_63 = happySpecReduce_2 24# happyReduction_63 -happyReduction_63 happy_x_2 +happyReduce_64 = happySpecReduce_2 24# happyReduction_64 +happyReduction_64 happy_x_2 happy_x_1 = case happyOut44 happy_x_2 of { happy_var_2 -> happyIn31 (DefData happy_var_2 )} -happyReduce_64 = happySpecReduce_2 24# happyReduction_64 -happyReduction_64 happy_x_2 +happyReduce_65 = happySpecReduce_2 24# happyReduction_65 +happyReduction_65 happy_x_2 happy_x_1 = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 (DefTrans happy_var_2 )} -happyReduce_65 = happySpecReduce_2 24# happyReduction_65 -happyReduction_65 happy_x_2 +happyReduce_66 = happySpecReduce_2 24# happyReduction_66 +happyReduction_66 happy_x_2 happy_x_1 = case happyOut45 happy_x_2 of { happy_var_2 -> happyIn31 (DefPar happy_var_2 )} -happyReduce_66 = happySpecReduce_2 24# happyReduction_66 -happyReduction_66 happy_x_2 +happyReduce_67 = happySpecReduce_2 24# happyReduction_67 +happyReduction_67 happy_x_2 happy_x_1 = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 (DefOper happy_var_2 )} -happyReduce_67 = happySpecReduce_2 24# happyReduction_67 -happyReduction_67 happy_x_2 +happyReduce_68 = happySpecReduce_2 24# happyReduction_68 +happyReduction_68 happy_x_2 happy_x_1 = case happyOut46 happy_x_2 of { happy_var_2 -> happyIn31 (DefLincat happy_var_2 )} -happyReduce_68 = happySpecReduce_2 24# happyReduction_68 -happyReduction_68 happy_x_2 - happy_x_1 - = case happyOut41 happy_x_2 of { happy_var_2 -> - happyIn31 - (DefLindef happy_var_2 - )} - happyReduce_69 = happySpecReduce_2 24# happyReduction_69 happyReduction_69 happy_x_2 happy_x_1 = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 - (DefLin happy_var_2 + (DefLindef happy_var_2 )} -happyReduce_70 = happySpecReduce_3 24# happyReduction_70 -happyReduction_70 happy_x_3 - happy_x_2 +happyReduce_70 = happySpecReduce_2 24# happyReduction_70 +happyReduction_70 happy_x_2 happy_x_1 - = case happyOut46 happy_x_3 of { happy_var_3 -> + = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 - (DefPrintCat happy_var_3 + (DefLin happy_var_2 )} happyReduce_71 = happySpecReduce_3 24# happyReduction_71 happyReduction_71 happy_x_3 + happy_x_2 + happy_x_1 + = case happyOut46 happy_x_3 of { happy_var_3 -> + happyIn31 + (DefPrintCat happy_var_3 + )} + +happyReduce_72 = happySpecReduce_3 24# happyReduction_72 +happyReduction_72 happy_x_3 happy_x_2 happy_x_1 = case happyOut46 happy_x_3 of { happy_var_3 -> @@ -1338,40 +1353,40 @@ happyReduction_71 happy_x_3 (DefPrintFun happy_var_3 )} -happyReduce_72 = happySpecReduce_2 24# happyReduction_72 -happyReduction_72 happy_x_2 +happyReduce_73 = happySpecReduce_2 24# happyReduction_73 +happyReduction_73 happy_x_2 happy_x_1 = case happyOut47 happy_x_2 of { happy_var_2 -> happyIn31 (DefFlag happy_var_2 )} -happyReduce_73 = happySpecReduce_2 24# happyReduction_73 -happyReduction_73 happy_x_2 +happyReduce_74 = happySpecReduce_2 24# happyReduction_74 +happyReduction_74 happy_x_2 happy_x_1 = case happyOut46 happy_x_2 of { happy_var_2 -> happyIn31 (DefPrintOld happy_var_2 )} -happyReduce_74 = happySpecReduce_2 24# happyReduction_74 -happyReduction_74 happy_x_2 - happy_x_1 - = case happyOut41 happy_x_2 of { happy_var_2 -> - happyIn31 - (DefLintype happy_var_2 - )} - happyReduce_75 = happySpecReduce_2 24# happyReduction_75 happyReduction_75 happy_x_2 + happy_x_1 + = case happyOut41 happy_x_2 of { happy_var_2 -> + happyIn31 + (DefLintype happy_var_2 + )} + +happyReduce_76 = happySpecReduce_2 24# happyReduction_76 +happyReduction_76 happy_x_2 happy_x_1 = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 (DefPattern happy_var_2 )} -happyReduce_76 = happyReduce 7# 24# happyReduction_76 -happyReduction_76 (happy_x_7 `HappyStk` +happyReduce_77 = happyReduce 7# 24# happyReduction_77 +happyReduction_77 (happy_x_7 `HappyStk` happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` @@ -1385,16 +1400,16 @@ happyReduction_76 (happy_x_7 `HappyStk` (DefPackage happy_var_2 (reverse happy_var_5) ) `HappyStk` happyRest}} -happyReduce_77 = happySpecReduce_2 24# happyReduction_77 -happyReduction_77 happy_x_2 +happyReduce_78 = happySpecReduce_2 24# happyReduction_78 +happyReduction_78 happy_x_2 happy_x_1 = case happyOut41 happy_x_2 of { happy_var_2 -> happyIn31 (DefVars happy_var_2 )} -happyReduce_78 = happySpecReduce_3 24# happyReduction_78 -happyReduction_78 happy_x_3 +happyReduce_79 = happySpecReduce_3 24# happyReduction_79 +happyReduction_79 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_2 of { happy_var_2 -> @@ -1402,8 +1417,8 @@ happyReduction_78 happy_x_3 (DefTokenizer happy_var_2 )} -happyReduce_79 = happySpecReduce_2 25# happyReduction_79 -happyReduction_79 happy_x_2 +happyReduce_80 = happySpecReduce_2 25# happyReduction_80 +happyReduction_80 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> case happyOut81 happy_x_2 of { happy_var_2 -> @@ -1411,8 +1426,8 @@ happyReduction_79 happy_x_2 (CatDef happy_var_1 (reverse happy_var_2) )}} -happyReduce_80 = happySpecReduce_3 26# happyReduction_80 -happyReduction_80 happy_x_3 +happyReduce_81 = happySpecReduce_3 26# happyReduction_81 +happyReduction_81 happy_x_3 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> @@ -1421,8 +1436,8 @@ happyReduction_80 happy_x_3 (FunDef happy_var_1 happy_var_3 )}} -happyReduce_81 = happySpecReduce_3 27# happyReduction_81 -happyReduction_81 happy_x_3 +happyReduce_82 = happySpecReduce_3 27# happyReduction_82 +happyReduction_82 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> @@ -1431,15 +1446,15 @@ happyReduction_81 happy_x_3 (DataDef happy_var_1 happy_var_3 )}} -happyReduce_82 = happySpecReduce_1 28# happyReduction_82 -happyReduction_82 happy_x_1 +happyReduce_83 = happySpecReduce_1 28# happyReduction_83 +happyReduction_83 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn35 (DataId happy_var_1 )} -happyReduce_83 = happySpecReduce_3 28# happyReduction_83 -happyReduction_83 happy_x_3 +happyReduce_84 = happySpecReduce_3 28# happyReduction_84 +happyReduction_84 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> @@ -1448,20 +1463,20 @@ happyReduction_83 happy_x_3 (DataQId happy_var_1 happy_var_3 )}} -happyReduce_84 = happySpecReduce_0 29# happyReduction_84 -happyReduction_84 = happyIn36 +happyReduce_85 = happySpecReduce_0 29# happyReduction_85 +happyReduction_85 = happyIn36 ([] ) -happyReduce_85 = happySpecReduce_1 29# happyReduction_85 -happyReduction_85 happy_x_1 +happyReduce_86 = happySpecReduce_1 29# happyReduction_86 +happyReduction_86 happy_x_1 = case happyOut35 happy_x_1 of { happy_var_1 -> happyIn36 ((:[]) happy_var_1 )} -happyReduce_86 = happySpecReduce_3 29# happyReduction_86 -happyReduction_86 happy_x_3 +happyReduce_87 = happySpecReduce_3 29# happyReduction_87 +happyReduction_87 happy_x_3 happy_x_2 happy_x_1 = case happyOut35 happy_x_1 of { happy_var_1 -> @@ -1470,18 +1485,18 @@ happyReduction_86 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_87 = happySpecReduce_3 30# happyReduction_87 -happyReduction_87 happy_x_3 +happyReduce_88 = happySpecReduce_3 30# happyReduction_88 +happyReduction_88 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> case happyOut48 happy_x_3 of { happy_var_3 -> happyIn37 - (ParDef happy_var_1 happy_var_3 + (ParDefDir happy_var_1 happy_var_3 )}} -happyReduce_88 = happyReduce 6# 30# happyReduction_88 -happyReduction_88 (happy_x_6 `HappyStk` +happyReduce_89 = happyReduce 6# 30# happyReduction_89 +happyReduction_89 (happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` @@ -1494,15 +1509,15 @@ happyReduction_88 (happy_x_6 `HappyStk` (ParDefIndir happy_var_1 happy_var_5 ) `HappyStk` happyRest}} -happyReduce_89 = happySpecReduce_1 30# happyReduction_89 -happyReduction_89 happy_x_1 +happyReduce_90 = happySpecReduce_1 30# happyReduction_90 +happyReduction_90 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn37 (ParDefAbs happy_var_1 )} -happyReduce_90 = happySpecReduce_2 31# happyReduction_90 -happyReduction_90 happy_x_2 +happyReduce_91 = happySpecReduce_2 31# happyReduction_91 +happyReduction_91 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> case happyOut81 happy_x_2 of { happy_var_2 -> @@ -1510,8 +1525,8 @@ happyReduction_90 happy_x_2 (ParConstr happy_var_1 (reverse happy_var_2) )}} -happyReduce_91 = happySpecReduce_3 32# happyReduction_91 -happyReduction_91 happy_x_3 +happyReduce_92 = happySpecReduce_3 32# happyReduction_92 +happyReduction_92 happy_x_3 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> @@ -1520,8 +1535,8 @@ happyReduction_91 happy_x_3 (PrintDef happy_var_1 happy_var_3 )}} -happyReduce_92 = happySpecReduce_3 33# happyReduction_92 -happyReduction_92 happy_x_3 +happyReduce_93 = happySpecReduce_3 33# happyReduction_93 +happyReduction_93 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> @@ -1530,16 +1545,16 @@ happyReduction_92 happy_x_3 (FlagDef happy_var_1 happy_var_3 )}} -happyReduce_93 = happySpecReduce_2 34# happyReduction_93 -happyReduction_93 happy_x_2 +happyReduce_94 = happySpecReduce_2 34# happyReduction_94 +happyReduction_94 happy_x_2 happy_x_1 = case happyOut30 happy_x_1 of { happy_var_1 -> happyIn41 ((:[]) happy_var_1 )} -happyReduce_94 = happySpecReduce_3 34# happyReduction_94 -happyReduction_94 happy_x_3 +happyReduce_95 = happySpecReduce_3 34# happyReduction_95 +happyReduction_95 happy_x_3 happy_x_2 happy_x_1 = case happyOut30 happy_x_1 of { happy_var_1 -> @@ -1548,16 +1563,16 @@ happyReduction_94 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_95 = happySpecReduce_2 35# happyReduction_95 -happyReduction_95 happy_x_2 +happyReduce_96 = happySpecReduce_2 35# happyReduction_96 +happyReduction_96 happy_x_2 happy_x_1 = case happyOut32 happy_x_1 of { happy_var_1 -> happyIn42 ((:[]) happy_var_1 )} -happyReduce_96 = happySpecReduce_3 35# happyReduction_96 -happyReduction_96 happy_x_3 +happyReduce_97 = happySpecReduce_3 35# happyReduction_97 +happyReduction_97 happy_x_3 happy_x_2 happy_x_1 = case happyOut32 happy_x_1 of { happy_var_1 -> @@ -1566,16 +1581,16 @@ happyReduction_96 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_97 = happySpecReduce_2 36# happyReduction_97 -happyReduction_97 happy_x_2 +happyReduce_98 = happySpecReduce_2 36# happyReduction_98 +happyReduction_98 happy_x_2 happy_x_1 = case happyOut33 happy_x_1 of { happy_var_1 -> happyIn43 ((:[]) happy_var_1 )} -happyReduce_98 = happySpecReduce_3 36# happyReduction_98 -happyReduction_98 happy_x_3 +happyReduce_99 = happySpecReduce_3 36# happyReduction_99 +happyReduction_99 happy_x_3 happy_x_2 happy_x_1 = case happyOut33 happy_x_1 of { happy_var_1 -> @@ -1584,16 +1599,16 @@ happyReduction_98 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_99 = happySpecReduce_2 37# happyReduction_99 -happyReduction_99 happy_x_2 +happyReduce_100 = happySpecReduce_2 37# happyReduction_100 +happyReduction_100 happy_x_2 happy_x_1 = case happyOut34 happy_x_1 of { happy_var_1 -> happyIn44 ((:[]) happy_var_1 )} -happyReduce_100 = happySpecReduce_3 37# happyReduction_100 -happyReduction_100 happy_x_3 +happyReduce_101 = happySpecReduce_3 37# happyReduction_101 +happyReduction_101 happy_x_3 happy_x_2 happy_x_1 = case happyOut34 happy_x_1 of { happy_var_1 -> @@ -1602,16 +1617,16 @@ happyReduction_100 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_101 = happySpecReduce_2 38# happyReduction_101 -happyReduction_101 happy_x_2 +happyReduce_102 = happySpecReduce_2 38# happyReduction_102 +happyReduction_102 happy_x_2 happy_x_1 = case happyOut37 happy_x_1 of { happy_var_1 -> happyIn45 ((:[]) happy_var_1 )} -happyReduce_102 = happySpecReduce_3 38# happyReduction_102 -happyReduction_102 happy_x_3 +happyReduce_103 = happySpecReduce_3 38# happyReduction_103 +happyReduction_103 happy_x_3 happy_x_2 happy_x_1 = case happyOut37 happy_x_1 of { happy_var_1 -> @@ -1620,16 +1635,16 @@ happyReduction_102 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_103 = happySpecReduce_2 39# happyReduction_103 -happyReduction_103 happy_x_2 +happyReduce_104 = happySpecReduce_2 39# happyReduction_104 +happyReduction_104 happy_x_2 happy_x_1 = case happyOut39 happy_x_1 of { happy_var_1 -> happyIn46 ((:[]) happy_var_1 )} -happyReduce_104 = happySpecReduce_3 39# happyReduction_104 -happyReduction_104 happy_x_3 +happyReduce_105 = happySpecReduce_3 39# happyReduction_105 +happyReduction_105 happy_x_3 happy_x_2 happy_x_1 = case happyOut39 happy_x_1 of { happy_var_1 -> @@ -1638,16 +1653,16 @@ happyReduction_104 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_105 = happySpecReduce_2 40# happyReduction_105 -happyReduction_105 happy_x_2 +happyReduce_106 = happySpecReduce_2 40# happyReduction_106 +happyReduction_106 happy_x_2 happy_x_1 = case happyOut40 happy_x_1 of { happy_var_1 -> happyIn47 ((:[]) happy_var_1 )} -happyReduce_106 = happySpecReduce_3 40# happyReduction_106 -happyReduction_106 happy_x_3 +happyReduce_107 = happySpecReduce_3 40# happyReduction_107 +happyReduction_107 happy_x_3 happy_x_2 happy_x_1 = case happyOut40 happy_x_1 of { happy_var_1 -> @@ -1656,20 +1671,20 @@ happyReduction_106 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_107 = happySpecReduce_0 41# happyReduction_107 -happyReduction_107 = happyIn48 +happyReduce_108 = happySpecReduce_0 41# happyReduction_108 +happyReduction_108 = happyIn48 ([] ) -happyReduce_108 = happySpecReduce_1 41# happyReduction_108 -happyReduction_108 happy_x_1 +happyReduce_109 = happySpecReduce_1 41# happyReduction_109 +happyReduction_109 happy_x_1 = case happyOut38 happy_x_1 of { happy_var_1 -> happyIn48 ((:[]) happy_var_1 )} -happyReduce_109 = happySpecReduce_3 41# happyReduction_109 -happyReduction_109 happy_x_3 +happyReduce_110 = happySpecReduce_3 41# happyReduction_110 +happyReduction_110 happy_x_3 happy_x_2 happy_x_1 = case happyOut38 happy_x_1 of { happy_var_1 -> @@ -1678,15 +1693,15 @@ happyReduction_109 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_110 = happySpecReduce_1 42# happyReduction_110 -happyReduction_110 happy_x_1 +happyReduce_111 = happySpecReduce_1 42# happyReduction_111 +happyReduction_111 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn49 ((:[]) happy_var_1 )} -happyReduce_111 = happySpecReduce_3 42# happyReduction_111 -happyReduction_111 happy_x_3 +happyReduce_112 = happySpecReduce_3 42# happyReduction_112 +happyReduction_112 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> @@ -1695,18 +1710,18 @@ happyReduction_111 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_112 = happySpecReduce_3 43# happyReduction_112 -happyReduction_112 happy_x_3 - happy_x_2 - happy_x_1 - = case happyOut49 happy_x_1 of { happy_var_1 -> - case happyOut56 happy_x_3 of { happy_var_3 -> - happyIn50 - (LDDecl happy_var_1 happy_var_3 - )}} - happyReduce_113 = happySpecReduce_3 43# happyReduction_113 happyReduction_113 happy_x_3 + happy_x_2 + happy_x_1 + = case happyOut49 happy_x_1 of { happy_var_1 -> + case happyOut56 happy_x_3 of { happy_var_3 -> + happyIn50 + (LDDecl happy_var_1 happy_var_3 + )}} + +happyReduce_114 = happySpecReduce_3 43# happyReduction_114 +happyReduction_114 happy_x_3 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> @@ -1715,8 +1730,8 @@ happyReduction_113 happy_x_3 (LDDef happy_var_1 happy_var_3 )}} -happyReduce_114 = happyReduce 5# 43# happyReduction_114 -happyReduction_114 (happy_x_5 `HappyStk` +happyReduce_115 = happyReduce 5# 43# happyReduction_115 +happyReduction_115 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -1729,20 +1744,20 @@ happyReduction_114 (happy_x_5 `HappyStk` (LDFull happy_var_1 happy_var_3 happy_var_5 ) `HappyStk` happyRest}}} -happyReduce_115 = happySpecReduce_0 44# happyReduction_115 -happyReduction_115 = happyIn51 +happyReduce_116 = happySpecReduce_0 44# happyReduction_116 +happyReduction_116 = happyIn51 ([] ) -happyReduce_116 = happySpecReduce_1 44# happyReduction_116 -happyReduction_116 happy_x_1 +happyReduce_117 = happySpecReduce_1 44# happyReduction_117 +happyReduction_117 happy_x_1 = case happyOut50 happy_x_1 of { happy_var_1 -> happyIn51 ((:[]) happy_var_1 )} -happyReduce_117 = happySpecReduce_3 44# happyReduction_117 -happyReduction_117 happy_x_3 +happyReduce_118 = happySpecReduce_3 44# happyReduction_118 +happyReduction_118 happy_x_3 happy_x_2 happy_x_1 = case happyOut50 happy_x_1 of { happy_var_1 -> @@ -1751,24 +1766,24 @@ happyReduction_117 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_118 = happySpecReduce_1 45# happyReduction_118 -happyReduction_118 happy_x_1 +happyReduce_119 = happySpecReduce_1 45# happyReduction_119 +happyReduction_119 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn52 (EIdent happy_var_1 )} -happyReduce_119 = happySpecReduce_3 45# happyReduction_119 -happyReduction_119 happy_x_3 - happy_x_2 - happy_x_1 - = case happyOut7 happy_x_2 of { happy_var_2 -> - happyIn52 - (EConstr happy_var_2 - )} - happyReduce_120 = happySpecReduce_3 45# happyReduction_120 happyReduction_120 happy_x_3 + happy_x_2 + happy_x_1 + = case happyOut7 happy_x_2 of { happy_var_2 -> + happyIn52 + (EConstr happy_var_2 + )} + +happyReduce_121 = happySpecReduce_3 45# happyReduction_121 +happyReduction_121 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_2 of { happy_var_2 -> @@ -1776,48 +1791,48 @@ happyReduction_120 happy_x_3 (ECons happy_var_2 )} -happyReduce_121 = happySpecReduce_1 45# happyReduction_121 -happyReduction_121 happy_x_1 +happyReduce_122 = happySpecReduce_1 45# happyReduction_122 +happyReduction_122 happy_x_1 = case happyOut62 happy_x_1 of { happy_var_1 -> happyIn52 (ESort happy_var_1 )} -happyReduce_122 = happySpecReduce_1 45# happyReduction_122 -happyReduction_122 happy_x_1 +happyReduce_123 = happySpecReduce_1 45# happyReduction_123 +happyReduction_123 happy_x_1 = case happyOut8 happy_x_1 of { happy_var_1 -> happyIn52 (EString happy_var_1 )} -happyReduce_123 = happySpecReduce_1 45# happyReduction_123 -happyReduction_123 happy_x_1 +happyReduce_124 = happySpecReduce_1 45# happyReduction_124 +happyReduction_124 happy_x_1 = case happyOut9 happy_x_1 of { happy_var_1 -> happyIn52 (EInt happy_var_1 )} -happyReduce_124 = happySpecReduce_1 45# happyReduction_124 -happyReduction_124 happy_x_1 +happyReduce_125 = happySpecReduce_1 45# happyReduction_125 +happyReduction_125 happy_x_1 = happyIn52 (EMeta ) -happyReduce_125 = happySpecReduce_2 45# happyReduction_125 -happyReduction_125 happy_x_2 +happyReduce_126 = happySpecReduce_2 45# happyReduction_126 +happyReduction_126 happy_x_2 happy_x_1 = happyIn52 (EEmpty ) -happyReduce_126 = happySpecReduce_1 45# happyReduction_126 -happyReduction_126 happy_x_1 +happyReduce_127 = happySpecReduce_1 45# happyReduction_127 +happyReduction_127 happy_x_1 = happyIn52 (EData ) -happyReduce_127 = happySpecReduce_3 45# happyReduction_127 -happyReduction_127 happy_x_3 +happyReduce_128 = happySpecReduce_3 45# happyReduction_128 +happyReduction_128 happy_x_3 happy_x_2 happy_x_1 = case happyOut8 happy_x_2 of { happy_var_2 -> @@ -1825,8 +1840,8 @@ happyReduction_127 happy_x_3 (EStrings happy_var_2 )} -happyReduce_128 = happySpecReduce_3 45# happyReduction_128 -happyReduction_128 happy_x_3 +happyReduce_129 = happySpecReduce_3 45# happyReduction_129 +happyReduction_129 happy_x_3 happy_x_2 happy_x_1 = case happyOut51 happy_x_2 of { happy_var_2 -> @@ -1834,8 +1849,8 @@ happyReduction_128 happy_x_3 (ERecord happy_var_2 )} -happyReduce_129 = happySpecReduce_3 45# happyReduction_129 -happyReduction_129 happy_x_3 +happyReduce_130 = happySpecReduce_3 45# happyReduction_130 +happyReduction_130 happy_x_3 happy_x_2 happy_x_1 = case happyOut72 happy_x_2 of { happy_var_2 -> @@ -1843,8 +1858,8 @@ happyReduction_129 happy_x_3 (ETuple happy_var_2 )} -happyReduce_130 = happyReduce 4# 45# happyReduction_130 -happyReduction_130 (happy_x_4 `HappyStk` +happyReduce_131 = happyReduce 4# 45# happyReduction_131 +happyReduction_131 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -1854,8 +1869,8 @@ happyReduction_130 (happy_x_4 `HappyStk` (EIndir happy_var_3 ) `HappyStk` happyRest} -happyReduce_131 = happyReduce 5# 45# happyReduction_131 -happyReduction_131 (happy_x_5 `HappyStk` +happyReduce_132 = happyReduce 5# 45# happyReduction_132 +happyReduction_132 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -1867,8 +1882,8 @@ happyReduction_131 (happy_x_5 `HappyStk` (ETyped happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_132 = happySpecReduce_3 45# happyReduction_132 -happyReduction_132 happy_x_3 +happyReduce_133 = happySpecReduce_3 45# happyReduction_133 +happyReduction_133 happy_x_3 happy_x_2 happy_x_1 = case happyOut56 happy_x_2 of { happy_var_2 -> @@ -1876,15 +1891,15 @@ happyReduction_132 happy_x_3 (happy_var_2 )} -happyReduce_133 = happySpecReduce_1 45# happyReduction_133 -happyReduction_133 happy_x_1 +happyReduce_134 = happySpecReduce_1 45# happyReduction_134 +happyReduction_134 happy_x_1 = case happyOut10 happy_x_1 of { happy_var_1 -> happyIn52 (ELString happy_var_1 )} -happyReduce_134 = happySpecReduce_3 46# happyReduction_134 -happyReduction_134 happy_x_3 +happyReduce_135 = happySpecReduce_3 46# happyReduction_135 +happyReduction_135 happy_x_3 happy_x_2 happy_x_1 = case happyOut53 happy_x_1 of { happy_var_1 -> @@ -1893,21 +1908,21 @@ happyReduction_134 happy_x_3 (EProj happy_var_1 happy_var_3 )}} -happyReduce_135 = happyReduce 5# 46# happyReduction_135 -happyReduction_135 (happy_x_5 `HappyStk` - happy_x_4 `HappyStk` - happy_x_3 `HappyStk` - happy_x_2 `HappyStk` - happy_x_1 `HappyStk` - happyRest) - = case happyOut7 happy_x_2 of { happy_var_2 -> - case happyOut7 happy_x_4 of { happy_var_4 -> - happyIn53 - (EQConstr happy_var_2 happy_var_4 - ) `HappyStk` happyRest}} - happyReduce_136 = happyReduce 5# 46# happyReduction_136 happyReduction_136 (happy_x_5 `HappyStk` + happy_x_4 `HappyStk` + happy_x_3 `HappyStk` + happy_x_2 `HappyStk` + happy_x_1 `HappyStk` + happyRest) + = case happyOut7 happy_x_2 of { happy_var_2 -> + case happyOut7 happy_x_4 of { happy_var_4 -> + happyIn53 + (EQConstr happy_var_2 happy_var_4 + ) `HappyStk` happyRest}} + +happyReduce_137 = happyReduce 5# 46# happyReduction_137 +happyReduction_137 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -1919,15 +1934,15 @@ happyReduction_136 (happy_x_5 `HappyStk` (EQCons happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_137 = happySpecReduce_1 46# happyReduction_137 -happyReduction_137 happy_x_1 +happyReduce_138 = happySpecReduce_1 46# happyReduction_138 +happyReduction_138 happy_x_1 = case happyOut52 happy_x_1 of { happy_var_1 -> happyIn53 (happy_var_1 )} -happyReduce_138 = happySpecReduce_2 47# happyReduction_138 -happyReduction_138 happy_x_2 +happyReduce_139 = happySpecReduce_2 47# happyReduction_139 +happyReduction_139 happy_x_2 happy_x_1 = case happyOut54 happy_x_1 of { happy_var_1 -> case happyOut53 happy_x_2 of { happy_var_2 -> @@ -1935,8 +1950,8 @@ happyReduction_138 happy_x_2 (EApp happy_var_1 happy_var_2 )}} -happyReduce_139 = happyReduce 4# 47# happyReduction_139 -happyReduction_139 (happy_x_4 `HappyStk` +happyReduce_140 = happyReduce 4# 47# happyReduction_140 +happyReduction_140 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -1946,8 +1961,8 @@ happyReduction_139 (happy_x_4 `HappyStk` (ETable happy_var_3 ) `HappyStk` happyRest} -happyReduce_140 = happyReduce 5# 47# happyReduction_140 -happyReduction_140 (happy_x_5 `HappyStk` +happyReduce_141 = happyReduce 5# 47# happyReduction_141 +happyReduction_141 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -1959,8 +1974,8 @@ happyReduction_140 (happy_x_5 `HappyStk` (ETTable happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_141 = happyReduce 5# 47# happyReduction_141 -happyReduction_141 (happy_x_5 `HappyStk` +happyReduce_142 = happyReduce 5# 47# happyReduction_142 +happyReduction_142 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -1972,8 +1987,8 @@ happyReduction_141 (happy_x_5 `HappyStk` (EVTable happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_142 = happyReduce 6# 47# happyReduction_142 -happyReduction_142 (happy_x_6 `HappyStk` +happyReduce_143 = happyReduce 6# 47# happyReduction_143 +happyReduction_143 (happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` @@ -1986,8 +2001,8 @@ happyReduction_142 (happy_x_6 `HappyStk` (ECase happy_var_2 happy_var_5 ) `HappyStk` happyRest}} -happyReduce_143 = happyReduce 4# 47# happyReduction_143 -happyReduction_143 (happy_x_4 `HappyStk` +happyReduce_144 = happyReduce 4# 47# happyReduction_144 +happyReduction_144 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -1997,8 +2012,8 @@ happyReduction_143 (happy_x_4 `HappyStk` (EVariants happy_var_3 ) `HappyStk` happyRest} -happyReduce_144 = happyReduce 6# 47# happyReduction_144 -happyReduction_144 (happy_x_6 `HappyStk` +happyReduce_145 = happyReduce 6# 47# happyReduction_145 +happyReduction_145 (happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` @@ -2011,8 +2026,8 @@ happyReduction_144 (happy_x_6 `HappyStk` (EPre happy_var_3 happy_var_5 ) `HappyStk` happyRest}} -happyReduce_145 = happyReduce 4# 47# happyReduction_145 -happyReduction_145 (happy_x_4 `HappyStk` +happyReduce_146 = happyReduce 4# 47# happyReduction_146 +happyReduction_146 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -2022,8 +2037,8 @@ happyReduction_145 (happy_x_4 `HappyStk` (EStrs happy_var_3 ) `HappyStk` happyRest} -happyReduce_146 = happySpecReduce_3 47# happyReduction_146 -happyReduction_146 happy_x_3 +happyReduce_147 = happySpecReduce_3 47# happyReduction_147 +happyReduction_147 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> @@ -2032,31 +2047,21 @@ happyReduction_146 happy_x_3 (EConAt happy_var_1 happy_var_3 )}} -happyReduce_147 = happySpecReduce_1 47# happyReduction_147 -happyReduction_147 happy_x_1 +happyReduce_148 = happySpecReduce_1 47# happyReduction_148 +happyReduction_148 happy_x_1 = case happyOut53 happy_x_1 of { happy_var_1 -> happyIn54 (happy_var_1 )} -happyReduce_148 = happySpecReduce_2 47# happyReduction_148 -happyReduction_148 happy_x_2 +happyReduce_149 = happySpecReduce_2 47# happyReduction_149 +happyReduction_149 happy_x_2 happy_x_1 = case happyOut7 happy_x_2 of { happy_var_2 -> happyIn54 (ELin happy_var_2 )} -happyReduce_149 = happySpecReduce_3 48# happyReduction_149 -happyReduction_149 happy_x_3 - happy_x_2 - happy_x_1 - = case happyOut55 happy_x_1 of { happy_var_1 -> - case happyOut54 happy_x_3 of { happy_var_3 -> - happyIn55 - (ESelect happy_var_1 happy_var_3 - )}} - happyReduce_150 = happySpecReduce_3 48# happyReduction_150 happyReduction_150 happy_x_3 happy_x_2 @@ -2064,11 +2069,21 @@ happyReduction_150 happy_x_3 = case happyOut55 happy_x_1 of { happy_var_1 -> case happyOut54 happy_x_3 of { happy_var_3 -> happyIn55 - (ETupTyp happy_var_1 happy_var_3 + (ESelect happy_var_1 happy_var_3 )}} happyReduce_151 = happySpecReduce_3 48# happyReduction_151 happyReduction_151 happy_x_3 + happy_x_2 + happy_x_1 + = case happyOut55 happy_x_1 of { happy_var_1 -> + case happyOut54 happy_x_3 of { happy_var_3 -> + happyIn55 + (ETupTyp happy_var_1 happy_var_3 + )}} + +happyReduce_152 = happySpecReduce_3 48# happyReduction_152 +happyReduction_152 happy_x_3 happy_x_2 happy_x_1 = case happyOut55 happy_x_1 of { happy_var_1 -> @@ -2077,15 +2092,15 @@ happyReduction_151 happy_x_3 (EExtend happy_var_1 happy_var_3 )}} -happyReduce_152 = happySpecReduce_1 48# happyReduction_152 -happyReduction_152 happy_x_1 +happyReduce_153 = happySpecReduce_1 48# happyReduction_153 +happyReduction_153 happy_x_1 = case happyOut54 happy_x_1 of { happy_var_1 -> happyIn55 (happy_var_1 )} -happyReduce_153 = happyReduce 4# 49# happyReduction_153 -happyReduction_153 (happy_x_4 `HappyStk` +happyReduce_154 = happyReduce 4# 49# happyReduction_154 +happyReduction_154 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -2096,8 +2111,8 @@ happyReduction_153 (happy_x_4 `HappyStk` (EAbstr happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_154 = happyReduce 5# 49# happyReduction_154 -happyReduction_154 (happy_x_5 `HappyStk` +happyReduce_155 = happyReduce 5# 49# happyReduction_155 +happyReduction_155 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -2109,8 +2124,8 @@ happyReduction_154 (happy_x_5 `HappyStk` (ECTable happy_var_3 happy_var_5 ) `HappyStk` happyRest}} -happyReduce_155 = happySpecReduce_3 49# happyReduction_155 -happyReduction_155 happy_x_3 +happyReduce_156 = happySpecReduce_3 49# happyReduction_156 +happyReduction_156 happy_x_3 happy_x_2 happy_x_1 = case happyOut69 happy_x_1 of { happy_var_1 -> @@ -2119,16 +2134,6 @@ happyReduction_155 happy_x_3 (EProd happy_var_1 happy_var_3 )}} -happyReduce_156 = happySpecReduce_3 49# happyReduction_156 -happyReduction_156 happy_x_3 - happy_x_2 - happy_x_1 - = case happyOut55 happy_x_1 of { happy_var_1 -> - case happyOut56 happy_x_3 of { happy_var_3 -> - happyIn56 - (ETType happy_var_1 happy_var_3 - )}} - happyReduce_157 = happySpecReduce_3 49# happyReduction_157 happyReduction_157 happy_x_3 happy_x_2 @@ -2136,11 +2141,21 @@ happyReduction_157 happy_x_3 = case happyOut55 happy_x_1 of { happy_var_1 -> case happyOut56 happy_x_3 of { happy_var_3 -> happyIn56 - (EConcat happy_var_1 happy_var_3 + (ETType happy_var_1 happy_var_3 )}} happyReduce_158 = happySpecReduce_3 49# happyReduction_158 happyReduction_158 happy_x_3 + happy_x_2 + happy_x_1 + = case happyOut55 happy_x_1 of { happy_var_1 -> + case happyOut56 happy_x_3 of { happy_var_3 -> + happyIn56 + (EConcat happy_var_1 happy_var_3 + )}} + +happyReduce_159 = happySpecReduce_3 49# happyReduction_159 +happyReduction_159 happy_x_3 happy_x_2 happy_x_1 = case happyOut55 happy_x_1 of { happy_var_1 -> @@ -2149,8 +2164,8 @@ happyReduction_158 happy_x_3 (EGlue happy_var_1 happy_var_3 )}} -happyReduce_159 = happyReduce 6# 49# happyReduction_159 -happyReduction_159 (happy_x_6 `HappyStk` +happyReduce_160 = happyReduce 6# 49# happyReduction_160 +happyReduction_160 (happy_x_6 `HappyStk` happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` @@ -2163,8 +2178,8 @@ happyReduction_159 (happy_x_6 `HappyStk` (ELet happy_var_3 happy_var_6 ) `HappyStk` happyRest}} -happyReduce_160 = happyReduce 4# 49# happyReduction_160 -happyReduction_160 (happy_x_4 `HappyStk` +happyReduce_161 = happyReduce 4# 49# happyReduction_161 +happyReduction_161 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -2175,8 +2190,8 @@ happyReduction_160 (happy_x_4 `HappyStk` (ELetb happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_161 = happyReduce 5# 49# happyReduction_161 -happyReduction_161 (happy_x_5 `HappyStk` +happyReduce_162 = happyReduce 5# 49# happyReduction_162 +happyReduction_162 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -2188,8 +2203,8 @@ happyReduction_161 (happy_x_5 `HappyStk` (EWhere happy_var_1 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_162 = happyReduce 4# 49# happyReduction_162 -happyReduction_162 (happy_x_4 `HappyStk` +happyReduce_163 = happyReduce 4# 49# happyReduction_163 +happyReduction_163 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -2199,27 +2214,27 @@ happyReduction_162 (happy_x_4 `HappyStk` (EEqs happy_var_3 ) `HappyStk` happyRest} -happyReduce_163 = happySpecReduce_1 49# happyReduction_163 -happyReduction_163 happy_x_1 +happyReduce_164 = happySpecReduce_1 49# happyReduction_164 +happyReduction_164 happy_x_1 = case happyOut55 happy_x_1 of { happy_var_1 -> happyIn56 (happy_var_1 )} -happyReduce_164 = happySpecReduce_0 50# happyReduction_164 -happyReduction_164 = happyIn57 +happyReduce_165 = happySpecReduce_0 50# happyReduction_165 +happyReduction_165 = happyIn57 ([] ) -happyReduce_165 = happySpecReduce_1 50# happyReduction_165 -happyReduction_165 happy_x_1 +happyReduce_166 = happySpecReduce_1 50# happyReduction_166 +happyReduction_166 happy_x_1 = case happyOut56 happy_x_1 of { happy_var_1 -> happyIn57 ((:[]) happy_var_1 )} -happyReduce_166 = happySpecReduce_3 50# happyReduction_166 -happyReduction_166 happy_x_3 +happyReduce_167 = happySpecReduce_3 50# happyReduction_167 +happyReduction_167 happy_x_3 happy_x_2 happy_x_1 = case happyOut56 happy_x_1 of { happy_var_1 -> @@ -2228,21 +2243,21 @@ happyReduction_166 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_167 = happySpecReduce_1 51# happyReduction_167 -happyReduction_167 happy_x_1 +happyReduce_168 = happySpecReduce_1 51# happyReduction_168 +happyReduction_168 happy_x_1 = happyIn58 (PW ) -happyReduce_168 = happySpecReduce_1 51# happyReduction_168 -happyReduction_168 happy_x_1 +happyReduce_169 = happySpecReduce_1 51# happyReduction_169 +happyReduction_169 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn58 (PV happy_var_1 )} -happyReduce_169 = happySpecReduce_3 51# happyReduction_169 -happyReduction_169 happy_x_3 +happyReduce_170 = happySpecReduce_3 51# happyReduction_170 +happyReduction_170 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_2 of { happy_var_2 -> @@ -2250,8 +2265,8 @@ happyReduction_169 happy_x_3 (PCon happy_var_2 )} -happyReduce_170 = happySpecReduce_3 51# happyReduction_170 -happyReduction_170 happy_x_3 +happyReduce_171 = happySpecReduce_3 51# happyReduction_171 +happyReduction_171 happy_x_3 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> @@ -2260,22 +2275,22 @@ happyReduction_170 happy_x_3 (PQ happy_var_1 happy_var_3 )}} -happyReduce_171 = happySpecReduce_1 51# happyReduction_171 -happyReduction_171 happy_x_1 +happyReduce_172 = happySpecReduce_1 51# happyReduction_172 +happyReduction_172 happy_x_1 = case happyOut9 happy_x_1 of { happy_var_1 -> happyIn58 (PInt happy_var_1 )} -happyReduce_172 = happySpecReduce_1 51# happyReduction_172 -happyReduction_172 happy_x_1 +happyReduce_173 = happySpecReduce_1 51# happyReduction_173 +happyReduction_173 happy_x_1 = case happyOut8 happy_x_1 of { happy_var_1 -> happyIn58 (PStr happy_var_1 )} -happyReduce_173 = happySpecReduce_3 51# happyReduction_173 -happyReduction_173 happy_x_3 +happyReduce_174 = happySpecReduce_3 51# happyReduction_174 +happyReduction_174 happy_x_3 happy_x_2 happy_x_1 = case happyOut63 happy_x_2 of { happy_var_2 -> @@ -2283,8 +2298,8 @@ happyReduction_173 happy_x_3 (PR happy_var_2 )} -happyReduce_174 = happySpecReduce_3 51# happyReduction_174 -happyReduction_174 happy_x_3 +happyReduce_175 = happySpecReduce_3 51# happyReduction_175 +happyReduction_175 happy_x_3 happy_x_2 happy_x_1 = case happyOut73 happy_x_2 of { happy_var_2 -> @@ -2292,8 +2307,8 @@ happyReduction_174 happy_x_3 (PTup happy_var_2 )} -happyReduce_175 = happySpecReduce_3 51# happyReduction_175 -happyReduction_175 happy_x_3 +happyReduce_176 = happySpecReduce_3 51# happyReduction_176 +happyReduction_176 happy_x_3 happy_x_2 happy_x_1 = case happyOut59 happy_x_2 of { happy_var_2 -> @@ -2301,8 +2316,8 @@ happyReduction_175 happy_x_3 (happy_var_2 )} -happyReduce_176 = happySpecReduce_2 52# happyReduction_176 -happyReduction_176 happy_x_2 +happyReduce_177 = happySpecReduce_2 52# happyReduction_177 +happyReduction_177 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> case happyOut65 happy_x_2 of { happy_var_2 -> @@ -2310,8 +2325,8 @@ happyReduction_176 happy_x_2 (PC happy_var_1 happy_var_2 )}} -happyReduce_177 = happyReduce 4# 52# happyReduction_177 -happyReduction_177 (happy_x_4 `HappyStk` +happyReduce_178 = happyReduce 4# 52# happyReduction_178 +happyReduction_178 (happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` happy_x_1 `HappyStk` @@ -2323,15 +2338,15 @@ happyReduction_177 (happy_x_4 `HappyStk` (PQC happy_var_1 happy_var_3 happy_var_4 ) `HappyStk` happyRest}}} -happyReduce_178 = happySpecReduce_1 52# happyReduction_178 -happyReduction_178 happy_x_1 +happyReduce_179 = happySpecReduce_1 52# happyReduction_179 +happyReduction_179 happy_x_1 = case happyOut58 happy_x_1 of { happy_var_1 -> happyIn59 (happy_var_1 )} -happyReduce_179 = happySpecReduce_3 53# happyReduction_179 -happyReduction_179 happy_x_3 +happyReduce_180 = happySpecReduce_3 53# happyReduction_180 +happyReduction_180 happy_x_3 happy_x_2 happy_x_1 = case happyOut49 happy_x_1 of { happy_var_1 -> @@ -2340,65 +2355,65 @@ happyReduction_179 happy_x_3 (PA happy_var_1 happy_var_3 )}} -happyReduce_180 = happySpecReduce_1 54# happyReduction_180 -happyReduction_180 happy_x_1 +happyReduce_181 = happySpecReduce_1 54# happyReduction_181 +happyReduction_181 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn61 (LIdent happy_var_1 )} -happyReduce_181 = happySpecReduce_2 54# happyReduction_181 -happyReduction_181 happy_x_2 +happyReduce_182 = happySpecReduce_2 54# happyReduction_182 +happyReduction_182 happy_x_2 happy_x_1 = case happyOut9 happy_x_2 of { happy_var_2 -> happyIn61 (LVar happy_var_2 )} -happyReduce_182 = happySpecReduce_1 55# happyReduction_182 -happyReduction_182 happy_x_1 - = happyIn62 - (Sort_Type - ) - happyReduce_183 = happySpecReduce_1 55# happyReduction_183 happyReduction_183 happy_x_1 = happyIn62 - (Sort_PType + (Sort_Type ) happyReduce_184 = happySpecReduce_1 55# happyReduction_184 happyReduction_184 happy_x_1 = happyIn62 - (Sort_Tok + (Sort_PType ) happyReduce_185 = happySpecReduce_1 55# happyReduction_185 happyReduction_185 happy_x_1 = happyIn62 - (Sort_Str + (Sort_Tok ) happyReduce_186 = happySpecReduce_1 55# happyReduction_186 happyReduction_186 happy_x_1 + = happyIn62 + (Sort_Str + ) + +happyReduce_187 = happySpecReduce_1 55# happyReduction_187 +happyReduction_187 happy_x_1 = happyIn62 (Sort_Strs ) -happyReduce_187 = happySpecReduce_0 56# happyReduction_187 -happyReduction_187 = happyIn63 +happyReduce_188 = happySpecReduce_0 56# happyReduction_188 +happyReduction_188 = happyIn63 ([] ) -happyReduce_188 = happySpecReduce_1 56# happyReduction_188 -happyReduction_188 happy_x_1 +happyReduce_189 = happySpecReduce_1 56# happyReduction_189 +happyReduction_189 happy_x_1 = case happyOut60 happy_x_1 of { happy_var_1 -> happyIn63 ((:[]) happy_var_1 )} -happyReduce_189 = happySpecReduce_3 56# happyReduction_189 -happyReduction_189 happy_x_3 +happyReduce_190 = happySpecReduce_3 56# happyReduction_190 +happyReduction_190 happy_x_3 happy_x_2 happy_x_1 = case happyOut60 happy_x_1 of { happy_var_1 -> @@ -2407,22 +2422,22 @@ happyReduction_189 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_190 = happySpecReduce_1 57# happyReduction_190 -happyReduction_190 happy_x_1 +happyReduce_191 = happySpecReduce_1 57# happyReduction_191 +happyReduction_191 happy_x_1 = case happyOut59 happy_x_1 of { happy_var_1 -> happyIn64 (AltP happy_var_1 )} -happyReduce_191 = happySpecReduce_1 58# happyReduction_191 -happyReduction_191 happy_x_1 +happyReduce_192 = happySpecReduce_1 58# happyReduction_192 +happyReduction_192 happy_x_1 = case happyOut58 happy_x_1 of { happy_var_1 -> happyIn65 ((:[]) happy_var_1 )} -happyReduce_192 = happySpecReduce_2 58# happyReduction_192 -happyReduction_192 happy_x_2 +happyReduce_193 = happySpecReduce_2 58# happyReduction_193 +happyReduction_193 happy_x_2 happy_x_1 = case happyOut58 happy_x_1 of { happy_var_1 -> case happyOut65 happy_x_2 of { happy_var_2 -> @@ -2430,15 +2445,15 @@ happyReduction_192 happy_x_2 ((:) happy_var_1 happy_var_2 )}} -happyReduce_193 = happySpecReduce_1 59# happyReduction_193 -happyReduction_193 happy_x_1 +happyReduce_194 = happySpecReduce_1 59# happyReduction_194 +happyReduction_194 happy_x_1 = case happyOut64 happy_x_1 of { happy_var_1 -> happyIn66 ((:[]) happy_var_1 )} -happyReduce_194 = happySpecReduce_3 59# happyReduction_194 -happyReduction_194 happy_x_3 +happyReduce_195 = happySpecReduce_3 59# happyReduction_195 +happyReduction_195 happy_x_3 happy_x_2 happy_x_1 = case happyOut64 happy_x_1 of { happy_var_1 -> @@ -2447,33 +2462,33 @@ happyReduction_194 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_195 = happySpecReduce_1 60# happyReduction_195 -happyReduction_195 happy_x_1 +happyReduce_196 = happySpecReduce_1 60# happyReduction_196 +happyReduction_196 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn67 (BIdent happy_var_1 )} -happyReduce_196 = happySpecReduce_1 60# happyReduction_196 -happyReduction_196 happy_x_1 +happyReduce_197 = happySpecReduce_1 60# happyReduction_197 +happyReduction_197 happy_x_1 = happyIn67 (BWild ) -happyReduce_197 = happySpecReduce_0 61# happyReduction_197 -happyReduction_197 = happyIn68 +happyReduce_198 = happySpecReduce_0 61# happyReduction_198 +happyReduction_198 = happyIn68 ([] ) -happyReduce_198 = happySpecReduce_1 61# happyReduction_198 -happyReduction_198 happy_x_1 +happyReduce_199 = happySpecReduce_1 61# happyReduction_199 +happyReduction_199 happy_x_1 = case happyOut67 happy_x_1 of { happy_var_1 -> happyIn68 ((:[]) happy_var_1 )} -happyReduce_199 = happySpecReduce_3 61# happyReduction_199 -happyReduction_199 happy_x_3 +happyReduce_200 = happySpecReduce_3 61# happyReduction_200 +happyReduction_200 happy_x_3 happy_x_2 happy_x_1 = case happyOut67 happy_x_1 of { happy_var_1 -> @@ -2482,8 +2497,8 @@ happyReduction_199 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_200 = happyReduce 5# 62# happyReduction_200 -happyReduction_200 (happy_x_5 `HappyStk` +happyReduce_201 = happyReduce 5# 62# happyReduction_201 +happyReduction_201 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -2495,41 +2510,41 @@ happyReduction_200 (happy_x_5 `HappyStk` (DDec happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_201 = happySpecReduce_1 62# happyReduction_201 -happyReduction_201 happy_x_1 +happyReduce_202 = happySpecReduce_1 62# happyReduction_202 +happyReduction_202 happy_x_1 = case happyOut54 happy_x_1 of { happy_var_1 -> happyIn69 (DExp happy_var_1 )} -happyReduce_202 = happySpecReduce_1 63# happyReduction_202 -happyReduction_202 happy_x_1 +happyReduce_203 = happySpecReduce_1 63# happyReduction_203 +happyReduction_203 happy_x_1 = case happyOut56 happy_x_1 of { happy_var_1 -> happyIn70 (TComp happy_var_1 )} -happyReduce_203 = happySpecReduce_1 64# happyReduction_203 -happyReduction_203 happy_x_1 +happyReduce_204 = happySpecReduce_1 64# happyReduction_204 +happyReduction_204 happy_x_1 = case happyOut59 happy_x_1 of { happy_var_1 -> happyIn71 (PTComp happy_var_1 )} -happyReduce_204 = happySpecReduce_0 65# happyReduction_204 -happyReduction_204 = happyIn72 +happyReduce_205 = happySpecReduce_0 65# happyReduction_205 +happyReduction_205 = happyIn72 ([] ) -happyReduce_205 = happySpecReduce_1 65# happyReduction_205 -happyReduction_205 happy_x_1 +happyReduce_206 = happySpecReduce_1 65# happyReduction_206 +happyReduction_206 happy_x_1 = case happyOut70 happy_x_1 of { happy_var_1 -> happyIn72 ((:[]) happy_var_1 )} -happyReduce_206 = happySpecReduce_3 65# happyReduction_206 -happyReduction_206 happy_x_3 +happyReduce_207 = happySpecReduce_3 65# happyReduction_207 +happyReduction_207 happy_x_3 happy_x_2 happy_x_1 = case happyOut70 happy_x_1 of { happy_var_1 -> @@ -2538,20 +2553,20 @@ happyReduction_206 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_207 = happySpecReduce_0 66# happyReduction_207 -happyReduction_207 = happyIn73 +happyReduce_208 = happySpecReduce_0 66# happyReduction_208 +happyReduction_208 = happyIn73 ([] ) -happyReduce_208 = happySpecReduce_1 66# happyReduction_208 -happyReduction_208 happy_x_1 +happyReduce_209 = happySpecReduce_1 66# happyReduction_209 +happyReduction_209 happy_x_1 = case happyOut71 happy_x_1 of { happy_var_1 -> happyIn73 ((:[]) happy_var_1 )} -happyReduce_209 = happySpecReduce_3 66# happyReduction_209 -happyReduction_209 happy_x_3 +happyReduce_210 = happySpecReduce_3 66# happyReduction_210 +happyReduction_210 happy_x_3 happy_x_2 happy_x_1 = case happyOut71 happy_x_1 of { happy_var_1 -> @@ -2560,8 +2575,8 @@ happyReduction_209 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_210 = happySpecReduce_3 67# happyReduction_210 -happyReduction_210 happy_x_3 +happyReduce_211 = happySpecReduce_3 67# happyReduction_211 +happyReduction_211 happy_x_3 happy_x_2 happy_x_1 = case happyOut66 happy_x_1 of { happy_var_1 -> @@ -2570,15 +2585,15 @@ happyReduction_210 happy_x_3 (Case happy_var_1 happy_var_3 )}} -happyReduce_211 = happySpecReduce_1 68# happyReduction_211 -happyReduction_211 happy_x_1 +happyReduce_212 = happySpecReduce_1 68# happyReduction_212 +happyReduction_212 happy_x_1 = case happyOut74 happy_x_1 of { happy_var_1 -> happyIn75 ((:[]) happy_var_1 )} -happyReduce_212 = happySpecReduce_3 68# happyReduction_212 -happyReduction_212 happy_x_3 +happyReduce_213 = happySpecReduce_3 68# happyReduction_213 +happyReduction_213 happy_x_3 happy_x_2 happy_x_1 = case happyOut74 happy_x_1 of { happy_var_1 -> @@ -2587,8 +2602,8 @@ happyReduction_212 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_213 = happySpecReduce_3 69# happyReduction_213 -happyReduction_213 happy_x_3 +happyReduce_214 = happySpecReduce_3 69# happyReduction_214 +happyReduction_214 happy_x_3 happy_x_2 happy_x_1 = case happyOut65 happy_x_1 of { happy_var_1 -> @@ -2597,20 +2612,20 @@ happyReduction_213 happy_x_3 (Equ happy_var_1 happy_var_3 )}} -happyReduce_214 = happySpecReduce_0 70# happyReduction_214 -happyReduction_214 = happyIn77 +happyReduce_215 = happySpecReduce_0 70# happyReduction_215 +happyReduction_215 = happyIn77 ([] ) -happyReduce_215 = happySpecReduce_1 70# happyReduction_215 -happyReduction_215 happy_x_1 +happyReduce_216 = happySpecReduce_1 70# happyReduction_216 +happyReduction_216 happy_x_1 = case happyOut76 happy_x_1 of { happy_var_1 -> happyIn77 ((:[]) happy_var_1 )} -happyReduce_216 = happySpecReduce_3 70# happyReduction_216 -happyReduction_216 happy_x_3 +happyReduce_217 = happySpecReduce_3 70# happyReduction_217 +happyReduction_217 happy_x_3 happy_x_2 happy_x_1 = case happyOut76 happy_x_1 of { happy_var_1 -> @@ -2619,8 +2634,8 @@ happyReduction_216 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_217 = happySpecReduce_3 71# happyReduction_217 -happyReduction_217 happy_x_3 +happyReduce_218 = happySpecReduce_3 71# happyReduction_218 +happyReduction_218 happy_x_3 happy_x_2 happy_x_1 = case happyOut56 happy_x_1 of { happy_var_1 -> @@ -2629,20 +2644,20 @@ happyReduction_217 happy_x_3 (Alt happy_var_1 happy_var_3 )}} -happyReduce_218 = happySpecReduce_0 72# happyReduction_218 -happyReduction_218 = happyIn79 +happyReduce_219 = happySpecReduce_0 72# happyReduction_219 +happyReduction_219 = happyIn79 ([] ) -happyReduce_219 = happySpecReduce_1 72# happyReduction_219 -happyReduction_219 happy_x_1 +happyReduce_220 = happySpecReduce_1 72# happyReduction_220 +happyReduction_220 happy_x_1 = case happyOut78 happy_x_1 of { happy_var_1 -> happyIn79 ((:[]) happy_var_1 )} -happyReduce_220 = happySpecReduce_3 72# happyReduction_220 -happyReduction_220 happy_x_3 +happyReduce_221 = happySpecReduce_3 72# happyReduction_221 +happyReduction_221 happy_x_3 happy_x_2 happy_x_1 = case happyOut78 happy_x_1 of { happy_var_1 -> @@ -2651,8 +2666,8 @@ happyReduction_220 happy_x_3 ((:) happy_var_1 happy_var_3 )}} -happyReduce_221 = happyReduce 5# 73# happyReduction_221 -happyReduction_221 (happy_x_5 `HappyStk` +happyReduce_222 = happyReduce 5# 73# happyReduction_222 +happyReduction_222 (happy_x_5 `HappyStk` happy_x_4 `HappyStk` happy_x_3 `HappyStk` happy_x_2 `HappyStk` @@ -2664,20 +2679,20 @@ happyReduction_221 (happy_x_5 `HappyStk` (DDDec happy_var_2 happy_var_4 ) `HappyStk` happyRest}} -happyReduce_222 = happySpecReduce_1 73# happyReduction_222 -happyReduction_222 happy_x_1 +happyReduce_223 = happySpecReduce_1 73# happyReduction_223 +happyReduction_223 happy_x_1 = case happyOut52 happy_x_1 of { happy_var_1 -> happyIn80 (DDExp happy_var_1 )} -happyReduce_223 = happySpecReduce_0 74# happyReduction_223 -happyReduction_223 = happyIn81 +happyReduce_224 = happySpecReduce_0 74# happyReduction_224 +happyReduction_224 = happyIn81 ([] ) -happyReduce_224 = happySpecReduce_2 74# happyReduction_224 -happyReduction_224 happy_x_2 +happyReduce_225 = happySpecReduce_2 74# happyReduction_225 +happyReduction_225 happy_x_2 happy_x_1 = case happyOut81 happy_x_1 of { happy_var_1 -> case happyOut80 happy_x_2 of { happy_var_2 -> @@ -2685,8 +2700,8 @@ happyReduction_224 happy_x_2 (flip (:) happy_var_1 happy_var_2 )}} -happyReduce_225 = happySpecReduce_2 75# happyReduction_225 -happyReduction_225 happy_x_2 +happyReduce_226 = happySpecReduce_2 75# happyReduction_226 +happyReduction_226 happy_x_2 happy_x_1 = case happyOut83 happy_x_1 of { happy_var_1 -> case happyOut21 happy_x_2 of { happy_var_2 -> @@ -2694,47 +2709,39 @@ happyReduction_225 happy_x_2 (OldGr happy_var_1 (reverse happy_var_2) )}} -happyReduce_226 = happySpecReduce_0 76# happyReduction_226 -happyReduction_226 = happyIn83 +happyReduce_227 = happySpecReduce_0 76# happyReduction_227 +happyReduction_227 = happyIn83 (NoIncl ) -happyReduce_227 = happySpecReduce_2 76# happyReduction_227 -happyReduction_227 happy_x_2 +happyReduce_228 = happySpecReduce_2 76# happyReduction_228 +happyReduction_228 happy_x_2 happy_x_1 = case happyOut85 happy_x_2 of { happy_var_2 -> happyIn83 (Incl happy_var_2 )} -happyReduce_228 = happySpecReduce_1 77# happyReduction_228 -happyReduction_228 happy_x_1 +happyReduce_229 = happySpecReduce_1 77# happyReduction_229 +happyReduction_229 happy_x_1 = case happyOut8 happy_x_1 of { happy_var_1 -> happyIn84 (FString happy_var_1 )} -happyReduce_229 = happySpecReduce_1 77# happyReduction_229 -happyReduction_229 happy_x_1 +happyReduce_230 = happySpecReduce_1 77# happyReduction_230 +happyReduction_230 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> happyIn84 (FIdent happy_var_1 )} -happyReduce_230 = happySpecReduce_2 77# happyReduction_230 -happyReduction_230 happy_x_2 - happy_x_1 - = case happyOut84 happy_x_2 of { happy_var_2 -> - happyIn84 - (FSlash happy_var_2 - )} - happyReduce_231 = happySpecReduce_2 77# happyReduction_231 happyReduction_231 happy_x_2 happy_x_1 = case happyOut84 happy_x_2 of { happy_var_2 -> happyIn84 - (FDot happy_var_2 + (FSlash happy_var_2 )} happyReduce_232 = happySpecReduce_2 77# happyReduction_232 @@ -2742,11 +2749,19 @@ happyReduction_232 happy_x_2 happy_x_1 = case happyOut84 happy_x_2 of { happy_var_2 -> happyIn84 - (FMinus happy_var_2 + (FDot happy_var_2 )} happyReduce_233 = happySpecReduce_2 77# happyReduction_233 happyReduction_233 happy_x_2 + happy_x_1 + = case happyOut84 happy_x_2 of { happy_var_2 -> + happyIn84 + (FMinus happy_var_2 + )} + +happyReduce_234 = happySpecReduce_2 77# happyReduction_234 +happyReduction_234 happy_x_2 happy_x_1 = case happyOut7 happy_x_1 of { happy_var_1 -> case happyOut84 happy_x_2 of { happy_var_2 -> @@ -2754,16 +2769,16 @@ happyReduction_233 happy_x_2 (FAddId happy_var_1 happy_var_2 )}} -happyReduce_234 = happySpecReduce_2 78# happyReduction_234 -happyReduction_234 happy_x_2 +happyReduce_235 = happySpecReduce_2 78# happyReduction_235 +happyReduction_235 happy_x_2 happy_x_1 = case happyOut84 happy_x_1 of { happy_var_1 -> happyIn85 ((:[]) happy_var_1 )} -happyReduce_235 = happySpecReduce_3 78# happyReduction_235 -happyReduction_235 happy_x_3 +happyReduce_236 = happySpecReduce_3 78# happyReduction_236 +happyReduction_236 happy_x_3 happy_x_2 happy_x_1 = case happyOut84 happy_x_1 of { happy_var_1 -> @@ -2889,7 +2904,7 @@ happyError ts = myLexer = tokens {-# LINE 1 "GenericTemplate.hs" #-} --- $Id: ParGF.hs,v 1.8 2005/02/04 14:17:06 bringert Exp $ +-- $Id: ParGF.hs,v 1.9 2005/02/04 20:18:00 aarne Exp $ diff --git a/src/GF/Source/PrintGF.hs b/src/GF/Source/PrintGF.hs index d210c47e0..f8c4a3e13 100644 --- a/src/GF/Source/PrintGF.hs +++ b/src/GF/Source/PrintGF.hs @@ -158,6 +158,7 @@ instance Print ModBody where prt i e = case e of MBody extend opens topdefs -> prPrec i 0 (concatD [prt 0 extend , prt 0 opens , doc (showString "{") , prt 0 topdefs , doc (showString "}")]) MWith id opens -> prPrec i 0 (concatD [prt 0 id , doc (showString "with") , prt 0 opens]) + MWithE ids id opens -> prPrec i 0 (concatD [prt 0 ids , doc (showString "**") , prt 0 id , doc (showString "with") , prt 0 opens]) MReuse id -> prPrec i 0 (concatD [doc (showString "reuse") , prt 0 id]) MUnion includeds -> prPrec i 0 (concatD [doc (showString "union") , prt 0 includeds]) @@ -171,7 +172,7 @@ instance Print Extend where instance Print Opens where prt i e = case e of NoOpens -> prPrec i 0 (concatD []) - Opens opens -> prPrec i 0 (concatD [doc (showString "open") , prt 0 opens , doc (showString "in")]) + OpenIn opens -> prPrec i 0 (concatD [doc (showString "open") , prt 0 opens , doc (showString "in")]) instance Print Open where @@ -282,7 +283,7 @@ instance Print DataConstr where instance Print ParDef where prt i e = case e of - ParDef id parconstrs -> prPrec i 0 (concatD [prt 0 id , doc (showString "=") , prt 0 parconstrs]) + ParDefDir id parconstrs -> prPrec i 0 (concatD [prt 0 id , doc (showString "=") , prt 0 parconstrs]) ParDefIndir id0 id -> prPrec i 0 (concatD [prt 0 id0 , doc (showString "=") , doc (showString "(") , doc (showString "in") , prt 0 id , doc (showString ")")]) ParDefAbs id -> prPrec i 0 (concatD [prt 0 id]) diff --git a/src/GF/Source/SourceToGrammar.hs b/src/GF/Source/SourceToGrammar.hs index 963d4a60f..bdd1b54d3 100644 --- a/src/GF/Source/SourceToGrammar.hs +++ b/src/GF/Source/SourceToGrammar.hs @@ -96,9 +96,14 @@ transModDef x = case x of GM.ModMod (GM.Module (GM.MTUnion mtyp' imps') mstat' [] [] [] NT)) MWith m opens -> do - m' <- transIdent m - opens' <- mapM transOpen opens - return (id', GM.ModWith mtyp' mstat' m' opens') + m' <- transIdent m + opens' <- mapM transOpen opens + return (id', GM.ModWith mtyp' mstat' m' [] opens') + MWithE extends m opens -> do + extends' <- mapM transIdent extends + m' <- transIdent m + opens' <- mapM transOpen opens + return (id', GM.ModWith mtyp' mstat' m' extends' opens') where mkModRes id mtyp body = do id' <- transIdent id @@ -159,7 +164,7 @@ transExtend x = case x of transOpens :: Opens -> Err [GM.OpenSpec Ident] transOpens x = case x of NoOpens -> return [] - Opens opens -> mapM transOpen opens + OpenIn opens -> mapM transOpen opens transOpen :: Open -> Err (GM.OpenSpec Ident) transOpen x = case x of @@ -257,7 +262,7 @@ transResDef x = case x of transParDef :: ParDef -> Err (Ident, [G.Param]) transParDef x = case x of - ParDef id params -> liftM2 (,) (transIdent id) (mapM transParConstr params) + ParDefDir id params -> liftM2 (,) (transIdent id) (mapM transParConstr params) ParDefAbs id -> liftM2 (,) (transIdent id) (return []) _ -> Bad $ "illegal definition in resource:" ++++ printTree x @@ -549,12 +554,12 @@ transOldGrammar opts name0 x = case x of DefPrintOld printdefs -> (a,r,d:c,ps) DefPackage m ds -> (a,r,c,(m,ds):ps) _ -> (a,r,c,ps) - mkAbs a = MModule q (MTAbstract absName) (MBody ne (Opens []) (topDefs a)) - mkRes ps r = MModule q (MTResource resName) (MBody ne (Opens ops) (topDefs r)) + mkAbs a = MModule q (MTAbstract absName) (MBody ne (OpenIn []) (topDefs a)) + mkRes ps r = MModule q (MTResource resName) (MBody ne (OpenIn ops) (topDefs r)) where ops = map OName ps mkCnc ps r = MModule q (MTConcrete cncName absName) - (MBody ne (Opens (map OName (resName:ps))) (topDefs r)) - mkPack (m, ds) = MModule q (MTResource m) (MBody ne (Opens []) (topDefs ds)) + (MBody ne (OpenIn (map OName (resName:ps))) (topDefs r)) + mkPack (m, ds) = MModule q (MTResource m) (MBody ne (OpenIn []) (topDefs ds)) topDefs t = t ne = NoExt q = CMCompl