diff --git a/lib/src/maltese/MorphoMlt.gf b/lib/src/maltese/MorphoMlt.gf index d59ebfc63..aa0a704e9 100644 --- a/lib/src/maltese/MorphoMlt.gf +++ b/lib/src/maltese/MorphoMlt.gf @@ -660,8 +660,8 @@ resource MorphoMlt = ResMlt ** open Prelude in { VPerf agr => perf ! agr ; VImpf agr => impf ! agr ; VImp num => imp ! num ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; conjFormII_quad : VerbInfo -> (VForm => Str) = \i -> @@ -747,8 +747,8 @@ resource MorphoMlt = ResMlt ** open Prelude in { VPerf agr => perf ! agr ; VImpf agr => impf ! agr ; VImp num => imp ! num ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; {- ~~~ Form III verbs ~~~ -} @@ -789,8 +789,8 @@ resource MorphoMlt = ResMlt ** open Prelude in { VPerf agr => perf ! agr ; VImpf agr => impf ! agr ; VImp num => imp ! num ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; {- ~~~ Form VII and VIII verbs ~~~ -} @@ -860,8 +860,8 @@ resource MorphoMlt = ResMlt ** open Prelude in { VPerf agr => perf ! agr ; VImpf agr => impf ! agr ; VImp num => imp ! num ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; {- ~~~ Form IX verbs ~~~ -} @@ -896,8 +896,8 @@ resource MorphoMlt = ResMlt ** open Prelude in { VPerf agr => perf ! agr ; VImpf agr => impf ! agr ; VImp num => imp ! num ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; {- ~~~ Form X verbs ~~~ -} @@ -990,8 +990,8 @@ resource MorphoMlt = ResMlt ** open Prelude in { VPerf agr => perf ! agr ; VImpf agr => impf ! agr ; VImp num => imp ! num ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; } diff --git a/lib/src/maltese/ParadigmsMlt.gf b/lib/src/maltese/ParadigmsMlt.gf index e85d37852..ea12c8999 100644 --- a/lib/src/maltese/ParadigmsMlt.gf +++ b/lib/src/maltese/ParadigmsMlt.gf @@ -580,8 +580,8 @@ resource ParadigmsMlt = open VImpf (AgP3Pl) => impfP3Pl ; VImp (Pl) => impSg ; VImp (Sg) => impPl ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo class form root vseq impSg ; in lin V { @@ -703,8 +703,8 @@ resource ParadigmsMlt = open VImpf (AgP2 Pl) => pfx "ti" (pfx_T (dropPfx 1 (get (VImpf (AgP2 Pl))))) ; VImpf (AgP3Pl) => pfx "ji" (pfx_T (dropPfx 1 (get (VImpf (AgP3Pl))))) ; VImp num => pfx_T (get (VImp num)) ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; in lin V { s = stemVariantsTbl (tbl) ; @@ -732,8 +732,8 @@ resource ParadigmsMlt = open VImpf (AgP2 Pl) => pfx "ti" (pfx_T (dropPfx 1 (get (VImpf (AgP2 Pl))))) ; VImpf (AgP3Pl) => pfx "ji" (pfx_T (dropPfx 1 (get (VImpf (AgP3Pl))))) ; VImp num => pfx_T (get (VImp num)) ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; in lin V { s = stemVariantsTbl (tbl) ; @@ -841,8 +841,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjStrongPerf root vseq ) ! agr ; VImpf agr => ( conjStrongImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Strong Regular) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -885,8 +885,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjLiquidMedialPerf root vseq ) ! agr ; VImpf agr => ( conjLiquidMedialImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Strong LiquidMedial) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -924,8 +924,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjGeminatedPerf root vseq ) ! agr ; VImpf agr => ( conjGeminatedImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Strong Geminated) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -963,8 +963,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjAssimilativePerf root vseq ) ! agr ; VImpf agr => ( conjAssimilativeImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Weak Assimilative) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -1002,8 +1002,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjHollowPerf root vseq ) ! agr ; VImpf agr => ( conjHollowImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Weak Hollow) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -1045,8 +1045,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjLackingPerf root vseq ) ! agr ; VImpf agr => ( conjLackingImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Weak Lacking) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -1084,8 +1084,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjDefectivePerf root vseq ) ! agr ; VImpf agr => ( conjDefectiveImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Weak Defective) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -1123,8 +1123,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjQuadPerf root vseq ) ! agr ; VImpf agr => ( conjQuadImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Quad QStrong) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -1165,8 +1165,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjQuadWeakPerf root vseq (imp ! Sg) ) ! agr ; VImpf agr => ( conjQuadWeakImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Quad QWeak) (FormI) root vseq (imp ! Sg) ; in lin V { @@ -1192,8 +1192,8 @@ resource ParadigmsMlt = open VPerf agr => ( conjLoanPerf mamma ) ! agr ; VImpf agr => ( conjLoanImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImp n => imp ! n ; - VPresPart _ => NONEXIST ; - VPastPart _ => NONEXIST + VPresPart _ => nonExist ; + VPastPart _ => nonExist } ; info : VerbInfo = mkVerbInfo (Loan) (FormI) (imp ! Sg) ; in lin V { diff --git a/lib/src/maltese/ResMlt.gf b/lib/src/maltese/ResMlt.gf index aa3f3cf97..cbb0124b7 100644 --- a/lib/src/maltese/ResMlt.gf +++ b/lib/src/maltese/ResMlt.gf @@ -867,8 +867,8 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in { => "jkunux" ; => "kunx" ; => "kunux" ; - => NONEXIST ; - => NONEXIST + => nonExist ; + => nonExist } } ; @@ -909,8 +909,8 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in { VImpf (AgP3Pl) => mkVerbStems "huma" "m'humie" ; VImp (Sg) => mkVerbStems "kun" ; VImp (Pl) => mkVerbStems "kunu" ; - VPresPart gn => mkVerbStems NONEXIST ; - VPastPart gn => mkVerbStems NONEXIST + VPresPart gn => mkVerbStems nonExist ; + VPastPart gn => mkVerbStems nonExist } ; i = mkVerbInfo Irregular FormI ; hasPresPart = False ; @@ -1151,9 +1151,6 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in { {- ~~~ Useful helper functions ~~~ -} - NONEXIST : Str = "#NONEXIST#" ; - -- NONEXIST : Str = Prelude.nonExist ; -- Still doesn't work in Haskell runtime 2013-08-26 - -- New names for the drop/take operations takePfx = Predef.take ; dropPfx = Predef.drop ;