From 878baeb1829d4f9e5ed327bddc6b4967395b1eec Mon Sep 17 00:00:00 2001 From: Arianna Masciolini Date: Sun, 13 Apr 2025 22:44:15 +0200 Subject: [PATCH] Revert "final state for lecture 5" This reverts commit 84daa586fe22bde88a443f2f2e678a73d6d568e3. --- lectures/lecture-05/AgreementEng.gf | 20 ------------------- lectures/lecture-05/AgreementSwe.gf | 29 ---------------------------- lectures/lecture-05/MorphologySwe.gf | 25 ------------------------ 3 files changed, 74 deletions(-) delete mode 100644 lectures/lecture-05/AgreementEng.gf delete mode 100644 lectures/lecture-05/AgreementSwe.gf diff --git a/lectures/lecture-05/AgreementEng.gf b/lectures/lecture-05/AgreementEng.gf deleted file mode 100644 index 1ed1653..0000000 --- a/lectures/lecture-05/AgreementEng.gf +++ /dev/null @@ -1,20 +0,0 @@ -concrete AgreementEng of Agreement = open MorphologyEng in { - lincat - NP = {s: Str; n: Number} ; - CN = Noun ; - N = Noun ; - A = {s: Str} ; - Det = {s: Str; n : Number} ; - - lin - DetCN d cn = { - s = d.s ++ (cn.s ! d.n) ; - n = d.n } ; - AdjCN a cn = {s = \\n => a.s ++ (cn.s ! n) } ; - UseN n = n ; - - cat_N = regNoun "cat" ; - black_A = {s = "black"} ; - the_Sg = {s = "the"; n = Sg} ; - the_Pl = {s = "the"; n = Pl} ; -} \ No newline at end of file diff --git a/lectures/lecture-05/AgreementSwe.gf b/lectures/lecture-05/AgreementSwe.gf deleted file mode 100644 index ac5ac78..0000000 --- a/lectures/lecture-05/AgreementSwe.gf +++ /dev/null @@ -1,29 +0,0 @@ -concrete AgreementSwe of Agreement = open MorphologySwe in { - lincat - NP = {s: Case => Str; a: NPAgreement} ; - CN = Noun ; - N = Noun ; - A = Adjective ; - Det = {s: Gender => Str; n : Number} ; - - lin - DetCN d cn = { - s = \\c => (d.s ! cn.g) ++ (cn.s ! (NF d.n Def Nom)) ; - a = NPAgr d.n cn.g Def - } ; - AdjCN a cn = { - s = \\f => - let agr = NPAgr (nform2number f) cn.g (nform2definite f) - in (a.s ! agr) ++ (cn.s ! f) ; - g = cn.g } ; - UseN n = n ; - - cat_N = mk4Noun "katt" "katten" "katter" "katterna" ; - black_A = mkAdjective "svart" "svart" "svarta" ; - the_Sg = { - s = table {Com => "den" ; Neut => "det"} ; - n = Sg} ; - the_Pl = { - s = table {Com => "de" ; Neut => "de"} ; - n = Pl} ; -} \ No newline at end of file diff --git a/lectures/lecture-05/MorphologySwe.gf b/lectures/lecture-05/MorphologySwe.gf index 7921507..da81cca 100644 --- a/lectures/lecture-05/MorphologySwe.gf +++ b/lectures/lecture-05/MorphologySwe.gf @@ -7,22 +7,11 @@ param Number = Sg | Pl ; NForm = NF Number Definite Case ; -- NF is a constructor - NPAgreement = NPAgr Number Gender Definite ; oper - nform2number : NForm -> Number = \f -> case f of { - (NF n _ _) => n - } ; - - nform2definite : NForm -> Definite = \f -> case f of { - (NF _ d _) => d - } ; - -- Noun = {s : Number => Definite => Case => Str ; g : Gender} ; Noun = {s : NForm => Str ; g : Gender} ; - Adjective = {s : NPAgreement => Str}; - mkNoun : (sin, sig, sdn, sdg, pin, pig, pdn, pdg : Str) -> Gender -> Noun = \sin, sig, sdn, sdg, pin, pig, pdn, pdg, g -> { s = table { @@ -37,20 +26,6 @@ oper } ; g = g } ; - - mkAdjective : (stor, stort, stora : Str) -> Adjective = - \stor, stort, stora -> { - s = table { - NPAgr Sg Com Ind => stor ; - NPAgr Sg Com Def => stora ; - NPAgr Sg Neut Ind => stort ; - NPAgr Sg Neut Def => stora ; - NPAgr Pl Com Ind => stora ; - NPAgr Pl Com Def => stora ; - NPAgr Pl Neut Ind => stora ; - NPAgr Pl Neut Def => stora - } - } ; addS : Str -> Str = \s -> case s of { _ + ("s" | "x" | "z") => s ;