msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

worked around a problem of evaluating BIND in pre in DiffFre.relPron

Browse Source
This commit is contained in:
aarne
2014-03-17 18:09:23 +00:00
parent 6d8aff65c8
commit 5bf298386b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/src/french/DiffFre.gf
View File

@@ -30,7 +30,7 @@ instance DiffFre of DiffRomance - [
artDef : Gender -> Number -> Case -> Str = \g,n,c ->
case <g,n,c> of {
<Masc,Sg, CPrep P_de> => pre {"du" ; ("de l'" ++ Predef.BIND) / voyelle} ;
<Masc,Sg, CPrep P_a> => pre {"au" ; ["à l'"] / voyelle} ;
<Masc,Sg, CPrep P_a> => pre {"au" ; ("à l'" ++ Predef.BIND) / voyelle} ;
<Masc,Sg, _> => elisLe ;
<Fem, Sg, _> => prepCase c ++ elisLa ;
<_, Pl, CPrep P_de> => "des" ;
@@ -168,7 +168,19 @@ instance DiffFre of DiffRomance - [
relPron : Bool => AAgr => Case => Str = \\b,a,c =>
let
lequel = artDef a.g a.n c + quelPron ! a
lequel = case <a.g,a.n,c> of {
<Masc,Sg, CPrep P_de> => "duquel" ;
<Masc,Sg, CPrep P_a> => "auquel" ;
<Masc,Sg, _> => prepCase c ++ "lequel" ;
<Fem, Sg, _> => prepCase c ++ "laquelle" ;
<Fem, Pl, CPrep P_de> => "desquelles" ;
<_, Pl, CPrep P_de> => "desquels" ;
<Fem, Pl, CPrep P_a> => "auxquelles" ;
<_, Pl, CPrep P_a> => "auxquels" ;
<Fem, Pl, _ > => "lesquelles" ;
<_, Pl, _ > => "lesquels"
} ;
---- artDef a.g a.n c ++ quelPron ! a ---- doesn't compile properly AR 17/3/2014
in
case b of {
False => case c of {

2
lib/src/french/PhonoFre.gf
View File

@@ -20,7 +20,7 @@ oper
elisLa = pre {"la" ; ("l'" ++ Predef.BIND) / voyelle} ;
elisLe = elision "l" ;
elisNe = elision "n" ;
elisQue = elision "qu" ;
elisQue = elision "qu" ;
-- The subjunction "si" has a special kind of elision. The rule is
-- only approximatively correct, for "si" is not really elided before