diff --git a/lib/resource-1.4/english/VerbEng.gf b/lib/resource-1.4/english/VerbEng.gf index 706a29246..b78f6e258 100644 --- a/lib/resource-1.4/english/VerbEng.gf +++ b/lib/resource-1.4/english/VerbEng.gf @@ -27,7 +27,7 @@ concrete VerbEng of Verb = CatEng ** open ResEng in { insertObj (\\a => infVP vv.isAux vp a) (predVV vv) ** {c2 = vp.c2} ; SlashV2VNP vv np vp = - insertObjPre (\\_ => v.c2 ++ np.s ! Acc) + insertObjPre (\\_ => vv.c2 ++ np.s ! Acc) (insertObjc (\\a => infVP vv.isAux vp a) (predVc vv)) ** {c2 = vp.c2} ; diff --git a/lib/resource-1.4/scandinavian/ExtraScand.gf b/lib/resource-1.4/scandinavian/ExtraScand.gf index e60cc0105..15bd59c56 100644 --- a/lib/resource-1.4/scandinavian/ExtraScand.gf +++ b/lib/resource-1.4/scandinavian/ExtraScand.gf @@ -41,7 +41,7 @@ incomplete concrete ExtraScand of ExtraScandAbs = CatScand ** MkVPI vp = { s = \\v,a => infVP vp a ---- no sup } ; - ConjVPI = conjunctTable2 VPIForm Agr ; + ConjVPI = conjunctDistrTable2 VPIForm Agr ; ComplVPIVV vv vpi = insertObj (\\a => vv.c2 ++ vpi.s ! VPIInf ! a) (predV vv) ; } diff --git a/lib/resource-1.4/spanish/DiffSpa.gf b/lib/resource-1.4/spanish/DiffSpa.gf index e6c8d97f7..82803c995 100644 --- a/lib/resource-1.4/spanish/DiffSpa.gf +++ b/lib/resource-1.4/spanish/DiffSpa.gf @@ -59,7 +59,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud vpAgrClit : Agr -> VPAgr = \a -> vpAgrNone ; - pronArg = \n,p,acc,dat -> + pronArg = \n,p,acc,dat -> let paccp = case acc of { CRefl => ; @@ -69,11 +69,15 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud pdatp = case dat of { CPron ag an ap => ; _ => <[],P2,False> - } - in case < : Person * Person> of { - => <"se" ++ paccp.p1, [],True> ; - _ => - } ; + } ; + defaultPronArg = + in + case < : Person * Person> of { + => <"se" ++ paccp.p1, [], True> ; + _ => defaultPronArg + } ; + ---- 8/6/2008 efficiency problem in pgf generation: replace the case expr with + ---- defaultPronArg ; mkImperative b p vp = { s = \\pol,aag => diff --git a/src-3.0/GF/Command/Commands.hs b/src-3.0/GF/Command/Commands.hs index def2c6f70..6aa19dfba 100644 --- a/src-3.0/GF/Command/Commands.hs +++ b/src-3.0/GF/Command/Commands.hs @@ -79,18 +79,6 @@ allCommands pgf = Map.fromAscList [ longname = "empty", synopsis = "Takes away all languages and resets all global flags." }), - ("ph", emptyCommandInfo { - longname = "print_history", - synopsis = "print readline history", - explanation = "Prints the commands issued during the GF session.\n"++ - "The result is readable by the eh command.\n"++ - "example:\n"++ - " ph | wf foo.hist -- save the history into a file" - }), - ("q", emptyCommandInfo { - longname = "quit", - synopsis = "exit GF interpreter" - }), ("gr", emptyCommandInfo { longname = "generate_random", synopsis = "generates a list of random trees, by default one tree", @@ -176,6 +164,18 @@ allCommands pgf = Map.fromAscList [ "source.", exec = \opts _ -> return $ fromString $ prGrammar opts, flags = ["cat","lang","printer"] + }), + ("ph", emptyCommandInfo { + longname = "print_history", + synopsis = "print readline history", + explanation = "Prints the commands issued during the GF session.\n"++ + "The result is readable by the eh command.\n"++ + "example:\n"++ + " ph | wf foo.hist -- save the history into a file" + }), + ("q", emptyCommandInfo { + longname = "quit", + synopsis = "exit GF interpreter" }) ] where