mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-24 02:12:50 -06:00
some adjustments in romance
This commit is contained in:
@@ -3,7 +3,7 @@ all: langs test
|
|||||||
test:
|
test:
|
||||||
echo "gr -cat=S -number=11 -prob | tb" | gf -probs=lang.gfprob langs.gfcm
|
echo "gr -cat=S -number=11 -prob | tb" | gf -probs=lang.gfprob langs.gfcm
|
||||||
langs:
|
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:
|
stat:
|
||||||
wc */*.gfc
|
wc */*.gfc
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
--# -path=.:../romance:../abstract:../common:prelude
|
--# -path=.:../romance:../common:../abstract:../common:prelude
|
||||||
|
|
||||||
concrete CatFre of Cat = TenseX ** CatRomance with
|
concrete CatFre of Cat = TenseX ** CatRomance with
|
||||||
(ResRomance = ResFre) ;
|
(ResRomance = ResFre) ;
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ lin
|
|||||||
admettre_V2 = v_besch56 "admettre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
|
admettre_V2 = v_besch56 "admettre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
|
||||||
advenir_V = v_besch23 "advenir" ** {vtyp = VEsse ; lock_V = <>} ;
|
advenir_V = v_besch23 "advenir" ** {vtyp = VEsse ; lock_V = <>} ;
|
||||||
aller_V = v_besch22 "aller" ** {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 = <>} ;
|
apparaître_V = v_besch64 "apparaître" ** {vtyp = VHabere ; lock_V = <>} ;
|
||||||
appartenir_V2 = v_besch23 "appartenir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complDat} ;
|
appartenir_V2 = v_besch23 "appartenir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complDat} ;
|
||||||
appendre_V2 = v_besch53 "appendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
|
appendre_V2 = v_besch53 "appendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ oper
|
|||||||
{s = table {
|
{s = table {
|
||||||
Ton Nom => il ;
|
Ton Nom => il ;
|
||||||
Ton x => prepCase x ++ Lui ;
|
Ton x => prepCase x ++ Lui ;
|
||||||
Aton Nom => il ; ---- [] ;
|
Aton Nom => strOpt il ; -- [] or il
|
||||||
Aton Acc => le ;
|
Aton Acc => le ;
|
||||||
Aton (CPrep P_di) => "ne" ; --- hmm
|
Aton (CPrep P_di) => "ne" ; --- hmm
|
||||||
Aton (CPrep P_a) => lui ;
|
Aton (CPrep P_a) => lui ;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
|
|||||||
--2 Constants whose definitions fundamentally depend on language
|
--2 Constants whose definitions fundamentally depend on language
|
||||||
|
|
||||||
-- Prepositions that fuse with the article
|
-- 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 ;
|
param Prep ;
|
||||||
|
|
||||||
|
|||||||
@@ -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 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -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 ;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -46,10 +46,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
|
|||||||
|
|
||||||
auxVerb : VType -> (VF => Str) = \_ -> haber_V.s ;
|
auxVerb : VType -> (VF => Str) = \_ -> haber_V.s ;
|
||||||
|
|
||||||
partAgr : VType -> VPAgr = \vtyp -> case vtyp of {
|
partAgr : VType -> VPAgr = \vtyp -> vpAgrNone ;
|
||||||
VHabere => vpAgrNone ;
|
|
||||||
_ => VPAgrSubj
|
|
||||||
} ;
|
|
||||||
|
|
||||||
vpAgrClit : Agr -> VPAgr = \a ->
|
vpAgrClit : Agr -> VPAgr = \a ->
|
||||||
vpAgrNone ;
|
vpAgrNone ;
|
||||||
@@ -100,9 +97,9 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
|
|||||||
|
|
||||||
auxPassive : Verb = copula ;
|
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} ;
|
verbBeschH : Verbum -> Verb = \v -> verbBesch v ** {vtyp = VHabere} ;
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ oper
|
|||||||
{s = table {
|
{s = table {
|
||||||
Ton Nom => il ;
|
Ton Nom => il ;
|
||||||
Ton x => prepCase x ++ Lui ;
|
Ton x => prepCase x ++ Lui ;
|
||||||
Aton Nom => il ; ---- [] ;
|
Aton Nom => strOpt il ; ---- [] ;
|
||||||
Aton Acc => le ;
|
Aton Acc => le ;
|
||||||
Aton (CPrep P_a) => lui ;
|
Aton (CPrep P_a) => lui ;
|
||||||
Aton q => prepCase q ++ Lui ; ---- GF bug with c or p!
|
Aton q => prepCase q ++ Lui ; ---- GF bug with c or p!
|
||||||
|
|||||||
Reference in New Issue
Block a user