From bf88707c180cdb049fba2353684313236489a10c Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 11 Jan 2005 15:06:12 +0000 Subject: [PATCH] -val optimization --- resource/italian/StructuralIta.gf | 2 +- resource/spanish/StructuralSpa.gf | 2 +- resource/spanish/TestResourceSpa.gf | 2 +- resource/spanish/TypesSpa.gf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resource/italian/StructuralIta.gf b/resource/italian/StructuralIta.gf index 1e21374ed..898106566 100644 --- a/resource/italian/StructuralIta.gf +++ b/resource/italian/StructuralIta.gf @@ -69,7 +69,7 @@ lin OtherwiseAdv = ss "altramente" ; ThereforeAdv = ss "quindi" ; - EverybodyNP = mkNameNounPhrase ["tutti"] Masc ; + EverybodyNP = normalNounPhrase (\\c => prepCase c ++ "tutti") Masc Pl ; SomebodyNP = mkNameNounPhrase ["qualcuno"] Masc ; NobodyNP = mkNameNounPhrase ["nessuno"] Masc ; --- ne EverythingNP = mkNameNounPhrase ["tutto"] Masc ; diff --git a/resource/spanish/StructuralSpa.gf b/resource/spanish/StructuralSpa.gf index b81f9a317..3ff880a04 100644 --- a/resource/spanish/StructuralSpa.gf +++ b/resource/spanish/StructuralSpa.gf @@ -71,7 +71,7 @@ lin OtherwiseAdv = ss "otramente" ; ThereforeAdv = ss ["por eso"] ; - EverybodyNP = mkNameNounPhrase ["todos"] Masc ; + EverybodyNP = normalNounPhrase (\\c => prepCase c ++ "todos") Masc Pl ; SomebodyNP = mkNameNounPhrase ["algún"] Masc ; NobodyNP = mkNameNounPhrase ["nadién"] Masc ; --- ne EverythingNP = mkNameNounPhrase ["todo"] Masc ; diff --git a/resource/spanish/TestResourceSpa.gf b/resource/spanish/TestResourceSpa.gf index e648ab793..09059b5f8 100644 --- a/resource/spanish/TestResourceSpa.gf +++ b/resource/spanish/TestResourceSpa.gf @@ -36,7 +36,7 @@ lin SwitchOn = mkTransVerbDir (verbPres (vender_4 "enciender") AHabere) ; ---- SwitchOff = mkTransVerbDir (verbPres (zurrar_3 "apagar") AHabere) ; Mother = funGen (mkCNom (nomVino "madre") Fem) ; - Uncle = funGen (mkCNom (nomVino "zio") Masc) ; + Uncle = funGen (mkCNom (nomVino "tío") Masc) ; Connection = mkCNom (nomPilar "connexión") Fem ** {s2 = [] ; c = CPrep P_de ; s3 = [] ; c3 = dative} ; diff --git a/resource/spanish/TypesSpa.gf b/resource/spanish/TypesSpa.gf index b7ab1317f..166dfcee3 100644 --- a/resource/spanish/TypesSpa.gf +++ b/resource/spanish/TypesSpa.gf @@ -117,7 +117,7 @@ oper VFin VFut n p => amare.s ! VP (Fut Ind n p) ; VFin VCondit n p => amare.s ! VP (Cond n p) ; VImper np => amare.s ! VP (Imp Sg P2) ; ---- n p ; - VPart g n => amare.s ! VI Part ---- g n ? + VPart g n => amare.s ! VP (Pass n g) } ; aux = a } ;