GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 19:22:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed numeral agreement and some French verbs

Browse Source
This commit is contained in:
aarne
2005-03-14 09:46:22 +00:00
parent 049e8deca9
commit 4ee07b156e
18 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource/french/BasicFre.gf
View File

@@ -37,7 +37,7 @@ lin
brother_N2 = deN2 (regN "frère" masculine) ;
brown_ADeg = regADeg "brun" ;
butter_N = regN "beurre" masculine ;
buy_V2 = dirV2 (regV "acheter") ;
buy_V2 = dirV2 (reg3V "acheter" "achète" "achètera") ;
camera_N = compN (regN "appareil" masculine) ["de photo"] ;
cap_N = regN "casquette" feminine ;
car_N = regN "voiture" feminine ;
@@ -93,7 +93,7 @@ lin
have_V2 = avoir_V2 ;
hear_V2 = entendre_V2 ;
hill_N = regN "colline" feminine ;
hope_VS = mkVS (regV "espérer") ;
hope_VS = mkVS (reg3V "espérer" "espère" "espérera") ;
horse_N = regN "cheval" masculine ;
hot_ADeg = regADeg "chaud" ;
house_N = regN "maison" feminine ;

17
lib/resource/french/MorphoFre.gf
View File

@@ -603,8 +603,8 @@ oper
_ => case verb_é of {
True => conj1céder parler ;
_ => case verb_e of {
True => conj1peser parler ;
_ => case Predef.dp 3 parler of {
---- True => conj1peser parler ;
False | _ => case Predef.dp 3 parler of {
"cer" => conj1placer parler ;
"ger" => conj1manger parler ;
"yer" => conj1payer parler ;
@@ -617,6 +617,13 @@ oper
}
} ;
-- The following can be more reliable.
mkVerb3Reg : Str -> Str -> Str -> Verbe = \jeter,jette,jettera ->
auxConj1
(Predef.tk 2 jeter)
(Predef.tk 1 jette)
(Predef.tk 1 jettera) ;
--3 The second conjugation
--
@@ -1343,4 +1350,10 @@ oper
param DForm = unit | teen | jten | ten | tenplus ;
param Place = indep | attr ;
oper
digitPl :
{inh : DForm ; inh1 : Number ; s : DForm => Str} ->
{inh : DForm ; inh1 : Number ; s : Gender => DForm => Str ; n : Number} = \d ->
{inh = d.inh ; inh1 = d.inh1 ; s = \\_ => d.s ; n = Pl} ;
}

87
lib/resource/french/NumeralsFre.gf
View File

@@ -1,56 +1,81 @@
concrete NumeralsFre of Numerals = open TypesFre, MorphoFre in {
lincat Numeral = {s : Str} ;
lincat Digit = {inh : DForm ; inh1 : Number ; s : DForm => Str} ;
lincat Sub10 = {inh : Number ; s : {p1 : DForm ; p2 : Place} => Str} ;
lincat Sub100 = {s : Place => Str} ;
lincat Sub1000 = {s : Place => Str} ;
lincat Sub1000000 = {s : Str} ;
lincat Numeral = {s : Gender => Str ; n : Number} ;
lincat Digit = {inh : DForm ; inh1 : Number ; s : Gender => DForm => Str ; n : Number} ;
lincat Sub10 = {inh : Number ; s : Gender => {p1 : DForm ; p2 : Place} => Str ; n : Number} ;
lincat Sub100 = {s : Gender => Place => Str ; n : Number} ;
lincat Sub1000 = {s : Gender => Place => Str ; n : Number} ;
lincat Sub1000000 = {s : Gender => Str ; n : Number} ;
lin num x0 = x0 ;
lin num x0 =
{s = x0.s} ;
lin n2 =
{inh = unit ; inh1 = Sg ; s = table {unit => "deux" ; teen => "douze" ; jten => "vingt" ; ten => "vingt" ; tenplus => "vingt"}} ;
digitPl {inh = unit ; inh1 = Sg ; s = table {unit => "deux" ; teen => "douze" ; jten => "vingt" ; ten => "vingt" ; tenplus => "vingt"}} ;
lin n3 =
{inh = unit ; inh1 = Sg ; s = table {unit => "trois" ; teen => "treize" ; jten => "trente" ; ten => "trente" ; tenplus => "trente"}} ;
digitPl {inh = unit ; inh1 = Sg ; s = table {unit => "trois" ; teen => "treize" ; jten => "trente" ; ten => "trente" ; tenplus => "trente"}} ;
lin n4 =
{inh = unit ; inh1 = Sg ; s = table {unit => "quatre" ; teen => "quatorze" ; jten => "quarante" ; ten => "quarante" ; tenplus => "quarante"}} ;
digitPl {inh = unit ; inh1 = Sg ; s = table {unit => "quatre" ; teen => "quatorze" ; jten => "quarante" ; ten => "quarante" ; tenplus => "quarante"}} ;
lin n5 =
{inh = unit ; inh1 = Sg ; s = table {unit => "cinq" ; teen => "quinze" ; jten => "cinquante" ; ten => "cinquante" ; tenplus => "cinquante"}} ;
digitPl {inh = unit ; inh1 = Sg ; s = table {unit => "cinq" ; teen => "quinze" ; jten => "cinquante" ; ten => "cinquante" ; tenplus => "cinquante"}} ;
lin n6 =
{inh = unit ; inh1 = Sg ; s = table {unit => "six" ; teen => "seize" ; jten => "soixante" ; ten => "soixante" ; tenplus => "soixante"}} ;
digitPl {inh = unit ; inh1 = Sg ; s = table {unit => "six" ; teen => "seize" ; jten => "soixante" ; ten => "soixante" ; tenplus => "soixante"}} ;
lin n7 =
{inh = teen ; inh1 = Sg ; s = table {unit => "sept" ; teen => "dix" ++ "-" ++ "sept" ; jten => "soixante" ++ "-" ++ "dix" ; ten => "soixante" ++ "-" ++ "dix" ; tenplus => "soixante"}} ;
digitPl {inh = teen ; inh1 = Sg ; s = table {unit => "sept" ; teen => "dix" ++ "-" ++ "sept" ; jten => "soixante" ++ "-" ++ "dix" ; ten => "soixante" ++ "-" ++ "dix" ; tenplus => "soixante"}} ;
lin n8 =
{inh = unit ; inh1 = Pl ; s = table {unit => "huit" ; teen => "dix" ++ "-" ++ "huit" ; jten => "quatre" ++ "-" ++ "vingts" ; ten => "quatre" ++ "-" ++ "vingt" ; tenplus => "quatre" ++ "-" ++ "vingt"}} ;
digitPl {inh = unit ; inh1 = Pl ; s = table {unit => "huit" ; teen => "dix" ++ "-" ++ "huit" ; jten => "quatre" ++ "-" ++ "vingts" ; ten => "quatre" ++ "-" ++ "vingt" ; tenplus => "quatre" ++ "-" ++ "vingt"}} ;
lin n9 =
{inh = teen ; inh1 = Pl ; s = table {unit => "neuf" ; teen => "dix" ++ "-" ++ "neuf" ; jten => "quatre" ++ "-" ++ "vingt" ++ "-" ++ "dix" ; ten => "quatre" ++ "-" ++ "vingt" ++ "-" ++ "dix" ; tenplus => "quatre" ++ "-" ++ "vingt"}} ;
digitPl {inh = teen ; inh1 = Pl ; s = table {unit => "neuf" ; teen => "dix" ++ "-" ++ "neuf" ; jten => "quatre" ++ "-" ++ "vingt" ++ "-" ++ "dix" ; ten => "quatre" ++ "-" ++ "vingt" ++ "-" ++ "dix" ; tenplus => "quatre" ++ "-" ++ "vingt"}} ;
lin pot01 =
{inh = Sg ; s = table {{p1 = unit ; p2 = indep} => "un" ; {p1 = unit ; p2 = attr} => [] ; {p1 = teen ; p2 = indep} => "onze" ; {p1 = teen ; p2 = attr} => [] ; {p1 = jten ; p2 = indep} => "dix" ; {p1 = jten ; p2 = attr} => [] ; {p1 = ten ; p2 = indep} => "dix" ; {p1 = ten ; p2 = attr} => [] ; {p1 = tenplus ; p2 = indep} => "dix" ; {p1 = tenplus ; p2 = attr} => []}} ;
{inh = Sg ; s = \\g => table {{p1 = unit ; p2 = indep} => case g of {Masc =>
"un" ; Fem => "une"} ; {p1 = unit ; p2 = attr} => [] ; {p1 = teen ;
p2 = indep} => "onze" ; {p1 = teen ; p2 = attr} => [] ; {p1 = jten ;
p2 = indep} => "dix" ; {p1 = jten ; p2 = attr} => [] ; {p1 = ten ;
p2 = indep} => "dix" ; {p1 = ten ; p2 = attr} => [] ; {p1 = tenplus
; p2 = indep} => "dix" ; {p1 = tenplus ; p2 = attr} => []} ; n = Sg} ;
lin pot0 d =
{inh = Pl ; s = table {{p1 = unit ; p2 = indep} => d.s ! unit ; {p1 = unit ; p2 = attr} => d.s ! unit ; {p1 = teen ; p2 = indep} => d.s ! teen ; {p1 = teen ; p2 = attr} => d.s ! teen ; {p1 = jten ; p2 = indep} => d.s ! jten ; {p1 = jten ; p2 = attr} => d.s ! jten ; {p1 = ten ; p2 = indep} => d.s ! ten ; {p1 = ten ; p2 = attr} => d.s ! ten ; {p1 = tenplus ; p2 = indep} => d.s ! tenplus ; {p1 = tenplus ; p2 = attr} => d.s ! tenplus}} ;
{inh = Pl ; s = \\g => table {{p1 = unit ; p2 = indep} => d.s ! g ! unit
; {p1 = unit ; p2 = attr} => d.s ! g ! unit ; {p1 = teen ; p2 = indep}
=> d.s ! g ! teen ; {p1 = teen ; p2 = attr} => d.s ! g ! teen ; {p1 = jten ;
p2 = indep} => d.s ! g ! jten ; {p1 = jten ; p2 = attr} => d.s ! g ! jten ;
{p1 = ten ; p2 = indep} => d.s ! g ! ten ; {p1 = ten ; p2 = attr} => d.s
! g ! ten ; {p1 = tenplus ; p2 = indep} => d.s ! g ! tenplus ; {p1 = tenplus
; p2 = attr} => d.s ! g ! tenplus} ; n = Pl} ;
lin pot110 =
{s = table {indep => "dix" ; attr => "dix"}} ;
{s = \\_ => table {indep => "dix" ; attr => "dix"} ; n = Pl} ;
lin pot111 =
{s = table {indep => "onze" ; attr => "onze"}} ;
{s = \\_ => table {indep => "onze" ; attr => "onze"} ; n = Pl} ;
lin pot1to19 d =
{s = table {indep => d.s ! teen ; attr => d.s ! teen}} ;
{s = \\g => table {indep => d.s ! g ! teen ; attr => d.s ! g ! teen} ; n = Pl} ;
lin pot0as1 n =
{s = table {indep => n.s ! {p1 = unit ; p2 = indep} ; attr => n.s ! {p1 = unit ; p2 = attr}}} ;
{s = \\g => table {indep => n.s ! g ! {p1 = unit ; p2 = indep} ;
attr => n.s ! g ! {p1 = unit ; p2 = attr}} ; n = n.n} ;
lin pot1 d =
{s = table {indep => d.s ! jten ; attr => d.s ! ten}} ;
{s = \\g => table {indep => d.s ! g ! jten ; attr => d.s ! g ! ten}
; n = Pl} ;
lin pot1plus d e =
{s = table {indep => (d.s ! tenplus) ++ (table {{p1 = Sg ; p2 = Sg} => "et" ; {p1 = Sg ; p2 = pl} => "-" ; {p1 = Pl ; p2 = Sg} => "-" ; {p1 = Pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ e.s ! {p1 = d.inh ; p2 = indep} ; attr => (d.s ! tenplus) ++ (table {{p1 = Sg ; p2 = Sg} => "et" ; {p1 = Sg ; p2 = pl} => "-" ; {p1 = Pl ; p2 = Sg} => "-" ; {p1 = Pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ e.s ! {p1 = d.inh ; p2 = indep}}} ;
lin pot1as2 n =
{s = table {indep => n.s ! indep ; attr => n.s ! attr}} ;
{s = \\g => table {indep => (d.s ! g ! tenplus) ++ (table {{p1 = Sg
; p2 = Sg} => "et" ; {p1 = Sg ; p2 = pl} => "-" ; {p1 = Pl ; p2 =
Sg} => "-" ; {p1 = Pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 =
e.inh}) ++ e.s ! g ! {p1 = d.inh ; p2 = indep} ; attr => (d.s ! g !
tenplus) ++ (table {{p1 = Sg ; p2 = Sg} => "et" ; {p1 = Sg ; p2 =
pl} => "-" ; {p1 = Pl ; p2 = Sg} => "-" ; {p1 = Pl ; p2 = pl} =>
"-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ e.s ! g ! {p1 = d.inh ; p2 =
indep}} ; n = Pl} ;
lin pot1as2 n = n ;
---- {s = \\g,d => n.s ! indep ; attr => n.s ! attr}} ;
lin pot2 d =
{s = table {indep => (d.s ! {p1 = unit ; p2 = attr}) ++ table {Sg => "cent" ; Pl => "cents"} ! (d.inh) ; attr => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent"}} ;
{s = \\g => table {indep => (d.s ! Masc ! {p1 = unit ; p2 = attr})
++ table {Sg => "cent" ; Pl => "cents"} ! (d.inh) ; attr => (d.s !
Masc ! {p1 = unit ; p2 = attr}) ++ "cent"} ; n = Pl} ;
lin pot2plus d e =
{s = table {indep => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! indep ; attr => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! indep}} ;
{s = \\g => table {indep => (d.s ! Masc ! {p1 = unit ; p2 = attr})
++ "cent" ++ e.s ! g ! indep ; attr => (d.s ! Masc ! {p1 = unit ; p2
= attr}) ++ "cent" ++ e.s ! g ! indep} ; n = Pl} ;
lin pot2as3 n =
{s = n.s ! indep} ;
{s = \\g => n.s ! g ! indep ; n = n.n} ;
lin pot3 n =
{s = (n.s ! attr) ++ "mille"} ;
{s = \\_ => (n.s ! Masc ! attr) ++ "mille" ; n = Pl} ;
lin pot3plus n m =
{s = (n.s ! attr) ++ "mille" ++ m.s ! indep} ;
{s = \\g => (n.s ! Masc ! attr) ++ "mille" ++ m.s ! g ! indep ; n =
Pl} ;
}

8
lib/resource/french/ParadigmsFre.gf
View File

@@ -205,6 +205,13 @@ oper
regV : Str -> V ;
-- Sometimes, however, it is not predictable which variant of the "er"
-- conjugation is to be selected. Then it is better to use the function
-- that gives the third person singular present indicative and future
-- (("il") "jette", "jettera") as second argument.
reg3V : (jeter,jette,jettera : Str) -> V ;
-- The function $regV$ gives all verbs the compound auxiliary "avoir".
-- To change it to "être", use the following function.
@@ -307,6 +314,7 @@ oper
mkAdA x = ss x ** {lock_AdA = <>} ;
regV x = let v = (mkVerbReg x) in verbPres v AHabere ** {aux = AHabere ; lock_V = <>} ;
reg3V x y z = let v = (mkVerb3Reg x y z) in verbPres v AHabere ** {aux = AHabere ; lock_V = <>} ;
etreV v = {s = v.s ; aux = AEsse ; lock_V = <>} ;
mkV2 v p = {s = v.s ; aux = v.aux ; s2 = p.p2 ; c = p.p1 ; lock_V2 = <>} ;

2
lib/resource/french/StructuralFre.gf
View File

@@ -6,7 +6,7 @@ concrete StructuralFre of Structural =
lin
UseNumeral n = {s = \\_ => n.s} ; ---- gender
UseNumeral n = {s = \\g => n.s !g ; n = n.n} ;
above_Prep = {s = ["au dessus"] ; c = genitive} ;
after_Prep = justPrep "après" ;

12
lib/resource/french/SwadeshLexFre.gf
View File

@@ -162,7 +162,7 @@ concrete SwadeshLexFre of SwadeshLex = CategoriesFre
salt_N = regN "sel" masculine ;
sand_N = regN "sable" masculine ;
sea_N = sea_N ;
seed_N = regN "graine" masculine ;
seed_N = regN "graine" feminine ;
skin_N = regN "peau" masculine ;
sky_N = mkN "ciel" "cieux" masculine ;
smoke_N = regN "fumée" feminine ;
@@ -203,7 +203,7 @@ concrete SwadeshLexFre of SwadeshLex = CategoriesFre
float_V = regV "flotter" ;
flow_V = regV "couler" ;
fly_V = regV "voler" ;
freeze_V = regV "geler" ; ---- check conjugation
freeze_V = reg3V "geler" "gèle" "gèlera" ;
give_V = regV "donner" ;
hear_V = UseV2 entendre_V2 ;
hit_V = regV "frapper" ;
@@ -221,16 +221,16 @@ concrete SwadeshLexFre of SwadeshLex = CategoriesFre
say_V = UseV2 dire_V2 ;
scratch_V = regV "gratter" ;
see_V = UseV2 voir_V2 ;
sew_V = regV "semer"; ---- conjug
sew_V = reg3V "semer" "sème" "sèmera" ;
sing_V = regV "chanter" ;
sit_V = UseV2 asseoir_V2 ; --- refl
sleep_V = UseV2 dormir_V2 ;
smell_V = UseV2 sentir_V2 ;
spit_V = regV "cracher" ;
split_V = UseV2 fendre_V2 ;
squeeze_V = regV "squeeze" ;
stab_V = regV "serrer" ;
stand_V = regV "lever" ; ---- refl ----
squeeze_V = regV "serrer" ;
stab_V = regV "poignarder" ;
stand_V = reg3V "lever" "lève" "lèvera" ; ---- refl ----
suck_V = regV "sucer" ;
swell_V = regV "gonfler" ;
swim_V = regV "nager" ;