mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-23 09:52:55 -06:00
renamed mkNP to makeNP in Paradigms; added overloaded Paradigms to all 10
This commit is contained in:
@@ -22,12 +22,12 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre **
|
||||
i8fem_Pron = mkPronoun
|
||||
(elision "j") (elision "m") (elision "m") "moi" "mon" (elisPoss "m") "mes"
|
||||
Fem Sg P1 ;
|
||||
these8fem_NP = mkNP ["celles-ci"] Fem Pl ;
|
||||
these8fem_NP = makeNP ["celles-ci"] Fem Pl ;
|
||||
they8fem_Pron = mkPronoun
|
||||
"elles" "les" "leur" "eux" "leur" "leur" "leurs"
|
||||
Fem Pl P3 ;
|
||||
this8fem_NP = pn2np (mkPN ["celle-ci"] Fem) ;
|
||||
those8fem_NP = mkNP ["celles-là"] Fem Pl ;
|
||||
those8fem_NP = makeNP ["celles-là"] Fem Pl ;
|
||||
we8fem_Pron = mkPronoun "nous" "nous" "nous" "nous" "notre" "notre" "nos"
|
||||
Fem Pl P1 ;
|
||||
whoPl8fem_IP =
|
||||
|
||||
@@ -405,8 +405,8 @@ oper
|
||||
|
||||
--------------------------- obsolete
|
||||
|
||||
mkNP : Str -> Gender -> Number -> NP ;
|
||||
mkNP x g n = {s = (pn2np {s=x;g= g}).s; a = agrP3 g n ; hasClit = False} ** {lock_NP = <>} ;
|
||||
makeNP : Str -> Gender -> Number -> NP ;
|
||||
makeNP x g n = {s = (pn2np {s=x;g= g}).s; a = agrP3 g n ; hasClit = False} ** {lock_NP = <>} ;
|
||||
regPN : Str -> PN ;
|
||||
mk2PN : Str -> Gender -> PN = \x,g -> {s = x ; g = g} ** {lock_PN = <>} ;
|
||||
|
||||
|
||||
@@ -90,12 +90,12 @@ lin
|
||||
Pl => \\_,_ => "ces"
|
||||
}
|
||||
} ;
|
||||
that_NP = mkNP ["cela"] Masc Sg ;
|
||||
that_NP = makeNP ["cela"] Masc Sg ;
|
||||
there7from_Adv = ss ["de là"] ;
|
||||
there7to_Adv = ss "là" ; --- y
|
||||
there_Adv = ss "là" ;
|
||||
therefore_PConj = ss "donc" ;
|
||||
these_NP = mkNP ["ceux-ci"] Masc Pl ;
|
||||
these_NP = makeNP ["ceux-ci"] Masc Pl ;
|
||||
they_Pron = mkPronoun
|
||||
"ils" "les" "leur" "eux" "leur" "leur" "leurs"
|
||||
Masc Pl P3 ;
|
||||
@@ -108,7 +108,7 @@ lin
|
||||
}
|
||||
} ;
|
||||
this_NP = pn2np (mkPN ["ceci"] Masc) ;
|
||||
those_NP = mkNP ["ceux-là"] Masc Pl ;
|
||||
those_NP = makeNP ["ceux-là"] Masc Pl ;
|
||||
through_Prep = mkPreposition "par" ;
|
||||
too_AdA = ss "trop" ;
|
||||
to_Prep = complDat ;
|
||||
|
||||
Reference in New Issue
Block a user