From ae193e6fb67a359c072fa4495f9d6c1819465400 Mon Sep 17 00:00:00 2001 From: john Date: Sun, 6 Jul 2014 17:19:10 +0000 Subject: [PATCH] Maltese RG: simple change which makes things compilable again --- lib/src/maltese/DictMlt.gf | 5 +++-- lib/src/maltese/DictMltAbs.gf | 5 +++-- lib/src/maltese/ResMlt.gf | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/src/maltese/DictMlt.gf b/lib/src/maltese/DictMlt.gf index 8a2e1f603..0fb4a0fb0 100644 --- a/lib/src/maltese/DictMlt.gf +++ b/lib/src/maltese/DictMlt.gf @@ -783,12 +783,12 @@ concrete DictMlt of DictMltAbs = CatMlt ** open ParadigmsMlt in { balla'_BLGH_2_7436_V = mkV_II "balla'" (mkRoot "b-l-għ") ; tballa'_BLGH_5_7437_V = mkV_V "tballa'" (mkRoot "b-l-għ") ; nbela'_BLGH_7_7438_V = mkV_VII "bela'" "nbela'" (mkRoot "b-l-għ") ; - blehhen_BLHN_1_7439_V = mkV strong form1 (mkRoot "bl-ħ-n") (mkVowels "e" "e") + blehhen_BLHN_2_7439_V = mkV strong form1 (mkRoot "bl-ħ-n") (mkVowels "e" "e") "bleħħint" "bleħħint" "bleħħen" "bleħħnet" "bleħħinna" "bleħħintu" "bleħħnu" "nbleħħen" "tbleħħen" "jibleħħen" "tbleħħen" "nbleħħnu" "tbleħħnu" "jibleħħnu" "bleħħen" "bleħħnu" ; - tblehhen_BLHN_2_7440_V = mkV strong form2 (mkRoot "bl-ħ-n") (mkVowels "e" "e") + tblehhen_BLHN_5_7440_V = mkV strong form2 (mkRoot "bl-ħ-n") (mkVowels "e" "e") "tbleħħint" "tbleħħint" "tbleħħen" "tbleħħnet" "tbleħħinna" "tbleħħintu" "tbleħħnu" "nitbleħħen" "titbleħħen" "jitbleħħen" "titbleħħen" "nitbleħħnu" "titbleħħnu" "jitbleħħnu" "tbleħħen" "tbleħħnu" @@ -4293,6 +4293,7 @@ concrete DictMlt of DictMltAbs = CatMlt ** open ParadigmsMlt in { itteka_TKW_1_10825_V = mkV "itteka" (mkRoot "t-k-w") ; ntemm_TMM_7_10826_V = mkV_VII "temm" "ntemm" (mkRoot "t-m-m") ; nghadda_GHDJ_7_10828_V = mkV_VII "għadda" "ngħadda" (mkRoot "għ-d-j") ; + nqies_QJS_7_10829_V = mkV_VII "qies" "nqies" (mkRoot "q-j-s") ; -- Loan verbs lin diff --git a/lib/src/maltese/DictMltAbs.gf b/lib/src/maltese/DictMltAbs.gf index 1e1b8bd46..19ad4cf80 100644 --- a/lib/src/maltese/DictMltAbs.gf +++ b/lib/src/maltese/DictMltAbs.gf @@ -759,8 +759,8 @@ abstract DictMltAbs = Cat ** { balla'_BLGH_2_7436_V : V ; tballa'_BLGH_5_7437_V : V ; nbela'_BLGH_7_7438_V : V ; - blehhen_BLHN_1_7439_V : V ; - tblehhen_BLHN_2_7440_V : V ; + blehhen_BLHN_2_7439_V : V ; + tblehhen_BLHN_5_7440_V : V ; bell_BLL_1_7441_V : V ; bellel_BLL_2_7442_V : V ; tbell_BLL_5_7443_V : V ; @@ -4145,6 +4145,7 @@ abstract DictMltAbs = Cat ** { itteka_TKW_1_10825_V : V ; ntemm_TMM_7_10826_V : V ; nghadda_GHDJ_7_10828_V : V ; + nqies_QJS_7_10829_V : V ; -- Loan verbs fun diff --git a/lib/src/maltese/ResMlt.gf b/lib/src/maltese/ResMlt.gf index 89fb01056..8fc49a55d 100644 --- a/lib/src/maltese/ResMlt.gf +++ b/lib/src/maltese/ResMlt.gf @@ -796,12 +796,12 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in { } ; VerbPhrase : Type = { - v : Verb ; - -- v : { - -- s : VForm => VerbStems ; - -- presPart : Maybe Participle ; - -- pastPart : Maybe Participle ; - -- } ; + -- v : Verb ; + v : { + s : VForm => VerbStems ; + presPart : Maybe Participle ; + pastPart : Maybe Participle ; + } ; s2 : Agr => Str ; -- complement dir : Maybe Agr ; -- direct object clitic ind : Maybe Agr ; -- indirect object clitic