From a8d99d95715468b662ccc9fb3240c34424b08a1e Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 10 Feb 2006 15:57:09 +0000 Subject: [PATCH] some adjustments in romance --- lib/resource-1.0/Makefile | 2 +- lib/resource-1.0/french/CatFre.gf | 2 +- lib/resource-1.0/french/IrregFre.gf | 2 +- lib/resource-1.0/italian/MorphoIta.gf | 2 +- lib/resource-1.0/romance/DiffRomance.gf | 2 +- lib/resource-1.0/romance/ExtEngAbs.gf | 15 --------------- lib/resource-1.0/romance/ExtScandAbs.gf | 9 --------- lib/resource-1.0/spanish/DiffSpa.gf | 9 +++------ lib/resource-1.0/spanish/MorphoSpa.gf | 2 +- 9 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 lib/resource-1.0/romance/ExtEngAbs.gf delete mode 100644 lib/resource-1.0/romance/ExtScandAbs.gf diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index ecdd4668c..e4e11087a 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -3,7 +3,7 @@ all: langs test test: echo "gr -cat=S -number=11 -prob | tb" | gf -probs=lang.gfprob langs.gfcm langs: - echo "s ;; pm | wf langs.gfcm" | gf -src */Lang??*.gf english/LangEng.gf + echo "s ;; pm | wf langs.gfcm" | gf -src */Lang??*.gf english/LangEng.gf +RTS -M400M stat: wc */*.gfc diff --git a/lib/resource-1.0/french/CatFre.gf b/lib/resource-1.0/french/CatFre.gf index 2fc986b95..4d793a0e6 100644 --- a/lib/resource-1.0/french/CatFre.gf +++ b/lib/resource-1.0/french/CatFre.gf @@ -1,4 +1,4 @@ ---# -path=.:../romance:../abstract:../common:prelude +--# -path=.:../romance:../common:../abstract:../common:prelude concrete CatFre of Cat = TenseX ** CatRomance with (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/french/IrregFre.gf b/lib/resource-1.0/french/IrregFre.gf index f4d9cb042..748cb4361 100644 --- a/lib/resource-1.0/french/IrregFre.gf +++ b/lib/resource-1.0/french/IrregFre.gf @@ -24,7 +24,7 @@ lin admettre_V2 = v_besch56 "admettre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; advenir_V = v_besch23 "advenir" ** {vtyp = VEsse ; lock_V = <>} ; aller_V = v_besch22 "aller" ** {vtyp = VEsse ; lock_V = <>} ; - apercevoir_V2 = v_besch38 "apercevoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complGen} ; + apercevoir_V2 = v_besch38 "apercevoir" ** {vtyp = VRefl ; lock_V2 = <> ; c2 = complGen} ; apparaître_V = v_besch64 "apparaître" ** {vtyp = VHabere ; lock_V = <>} ; appartenir_V2 = v_besch23 "appartenir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complDat} ; appendre_V2 = v_besch53 "appendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; diff --git a/lib/resource-1.0/italian/MorphoIta.gf b/lib/resource-1.0/italian/MorphoIta.gf index 0a694622c..f3f0ba6fe 100644 --- a/lib/resource-1.0/italian/MorphoIta.gf +++ b/lib/resource-1.0/italian/MorphoIta.gf @@ -138,7 +138,7 @@ oper {s = table { Ton Nom => il ; Ton x => prepCase x ++ Lui ; - Aton Nom => il ; ---- [] ; + Aton Nom => strOpt il ; -- [] or il Aton Acc => le ; Aton (CPrep P_di) => "ne" ; --- hmm Aton (CPrep P_a) => lui ; diff --git a/lib/resource-1.0/romance/DiffRomance.gf b/lib/resource-1.0/romance/DiffRomance.gf index 6ba1c8f6f..6398a04f7 100644 --- a/lib/resource-1.0/romance/DiffRomance.gf +++ b/lib/resource-1.0/romance/DiffRomance.gf @@ -11,7 +11,7 @@ interface DiffRomance = open CommonRomance, Prelude in { --2 Constants whose definitions fundamentally depend on language -- Prepositions that fuse with the article --- (Fre, Spa "de", "a"; Ita also "in", "con"). +-- (Fre, Spa "de", "a"; Ita also "con", "da", "in", "su). param Prep ; diff --git a/lib/resource-1.0/romance/ExtEngAbs.gf b/lib/resource-1.0/romance/ExtEngAbs.gf deleted file mode 100644 index 85c117e47..000000000 --- a/lib/resource-1.0/romance/ExtEngAbs.gf +++ /dev/null @@ -1,15 +0,0 @@ -abstract ExtEngAbs = Cat ** { - - cat - Aux ; -- auxiliary verbs: "can", "must", etc - --- Notice that $Aux$ cannot form $VP$ with infinitive, imperative, etc. - - fun - PredAux : NP -> Aux -> VP -> Cl ; - QuestAux : IP -> Aux -> VP -> QCl ; - - can_Aux : Aux ; - must_Aux : Aux ; - -} diff --git a/lib/resource-1.0/romance/ExtScandAbs.gf b/lib/resource-1.0/romance/ExtScandAbs.gf deleted file mode 100644 index b76a3d4a8..000000000 --- a/lib/resource-1.0/romance/ExtScandAbs.gf +++ /dev/null @@ -1,9 +0,0 @@ -abstract ExtRomanceAbs = Cat ** { - - fun - --- Definite form of simple nouns without article; neither $Num$ nor $Ord$ allowed. - - DefSgN, DefPlN : Predef -> N -> NP ; - -} diff --git a/lib/resource-1.0/spanish/DiffSpa.gf b/lib/resource-1.0/spanish/DiffSpa.gf index 116ac20b0..df2e4bd19 100644 --- a/lib/resource-1.0/spanish/DiffSpa.gf +++ b/lib/resource-1.0/spanish/DiffSpa.gf @@ -46,10 +46,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud auxVerb : VType -> (VF => Str) = \_ -> haber_V.s ; - partAgr : VType -> VPAgr = \vtyp -> case vtyp of { - VHabere => vpAgrNone ; - _ => VPAgrSubj - } ; + partAgr : VType -> VPAgr = \vtyp -> vpAgrNone ; vpAgrClit : Agr -> VPAgr = \a -> vpAgrNone ; @@ -100,9 +97,9 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud auxPassive : Verb = copula ; - copula = verbBeschH (ser_1 []) ; + copula = verbBeschH (ser_1 "ser") ; - haber_V : Verb = verbBeschH (haber_3 []) ; + haber_V : Verb = verbBeschH (haber_3 "haber") ; verbBeschH : Verbum -> Verb = \v -> verbBesch v ** {vtyp = VHabere} ; diff --git a/lib/resource-1.0/spanish/MorphoSpa.gf b/lib/resource-1.0/spanish/MorphoSpa.gf index d893b2e25..41f82308f 100644 --- a/lib/resource-1.0/spanish/MorphoSpa.gf +++ b/lib/resource-1.0/spanish/MorphoSpa.gf @@ -97,7 +97,7 @@ oper {s = table { Ton Nom => il ; Ton x => prepCase x ++ Lui ; - Aton Nom => il ; ---- [] ; + Aton Nom => strOpt il ; ---- [] ; Aton Acc => le ; Aton (CPrep P_a) => lui ; Aton q => prepCase q ++ Lui ; ---- GF bug with c or p!