GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-21 09:02:50 -06:00
Code Issues Packages Projects Releases Wiki 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 -> artDef : Gender -> Number -> Case -> Str = \g,n,c ->
case <g,n,c> of { case <g,n,c> of {
<Masc,Sg, CPrep P_de> => pre {"du" ; ("de l'" ++ Predef.BIND) / voyelle} ; <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 ; <Masc,Sg, _> => elisLe ;
<Fem, Sg, _> => prepCase c ++ elisLa ; <Fem, Sg, _> => prepCase c ++ elisLa ;
<_, Pl, CPrep P_de> => "des" ; <_, Pl, CPrep P_de> => "des" ;
@@ -168,7 +168,19 @@ instance DiffFre of DiffRomance - [
relPron : Bool => AAgr => Case => Str = \\b,a,c => relPron : Bool => AAgr => Case => Str = \\b,a,c =>
let 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 in
case b of { case b of {
False => case c of { False => case c of {