From 0c14c844ca4436d0abc797c5a7deda767edc650f Mon Sep 17 00:00:00 2001 From: Ehrlemark Date: Wed, 20 Feb 2019 12:45:12 +0100 Subject: [PATCH] French mixed up arguments (#180) * Corrected mixed up order of arguments to mkAdj' * Revert "Corrected mixed up order of arguments to mkAdj'" This reverts commit eea4f791e48af300e8578ef5b0b648611879508a. * Corrected mixed up order of arguments to mkAdj'. --- src/french/ParadigmsFre.gf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/french/ParadigmsFre.gf b/src/french/ParadigmsFre.gf index 8cd60c588..c3cc68887 100644 --- a/src/french/ParadigmsFre.gf +++ b/src/french/ParadigmsFre.gf @@ -393,8 +393,8 @@ oper mkPN : N -> PN = \x -> lin PN {s = x.s ! Sg ; g = x.g} ; } ; - mk4A a b c d = mk5A a a b c d ; - mk5A a b c d e = compADeg {s = \\_ => (mkAdj' a b c d e).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; + mk4A masc fem mascpl aa = mk5A masc masc fem mascpl aa ; + mk5A masc masc fem mascpl aa = compADeg {s = \\_ => (mkAdj' masc masc mascpl fem aa).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; regA a = compADeg {s = \\_ => (mkAdjReg a).s ; isPre = False ; copTyp = serCopula ; lock_A = <>} ; prefA a = {s = a.s ; isPre = True ; copTyp = a.copTyp ; lock_A = <>} ; adjCopula a cop = a ** {copTyp = cop} ;