msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

use the real nonExist in the Maltese grammar

Browse Source
This commit is contained in:
kr.angelov
2013-09-27 15:19:17 +00:00
parent efa4bc4d62
commit 9784b72add
3 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/src/maltese/MorphoMlt.gf
View File

@@ -660,8 +660,8 @@ resource MorphoMlt = ResMlt ** open Prelude in {
VPerf agr => perf ! agr ; VPerf agr => perf ! agr ;
VImpf agr => impf ! agr ; VImpf agr => impf ! agr ;
VImp num => imp ! num ; VImp num => imp ! num ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
conjFormII_quad : VerbInfo -> (VForm => Str) = \i -> conjFormII_quad : VerbInfo -> (VForm => Str) = \i ->
@@ -747,8 +747,8 @@ resource MorphoMlt = ResMlt ** open Prelude in {
VPerf agr => perf ! agr ; VPerf agr => perf ! agr ;
VImpf agr => impf ! agr ; VImpf agr => impf ! agr ;
VImp num => imp ! num ; VImp num => imp ! num ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
{- ~~~ Form III verbs ~~~ -} {- ~~~ Form III verbs ~~~ -}
@@ -789,8 +789,8 @@ resource MorphoMlt = ResMlt ** open Prelude in {
VPerf agr => perf ! agr ; VPerf agr => perf ! agr ;
VImpf agr => impf ! agr ; VImpf agr => impf ! agr ;
VImp num => imp ! num ; VImp num => imp ! num ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
{- ~~~ Form VII and VIII verbs ~~~ -} {- ~~~ Form VII and VIII verbs ~~~ -}
@@ -860,8 +860,8 @@ resource MorphoMlt = ResMlt ** open Prelude in {
VPerf agr => perf ! agr ; VPerf agr => perf ! agr ;
VImpf agr => impf ! agr ; VImpf agr => impf ! agr ;
VImp num => imp ! num ; VImp num => imp ! num ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
{- ~~~ Form IX verbs ~~~ -} {- ~~~ Form IX verbs ~~~ -}
@@ -896,8 +896,8 @@ resource MorphoMlt = ResMlt ** open Prelude in {
VPerf agr => perf ! agr ; VPerf agr => perf ! agr ;
VImpf agr => impf ! agr ; VImpf agr => impf ! agr ;
VImp num => imp ! num ; VImp num => imp ! num ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
{- ~~~ Form X verbs ~~~ -} {- ~~~ Form X verbs ~~~ -}
@@ -990,8 +990,8 @@ resource MorphoMlt = ResMlt ** open Prelude in {
VPerf agr => perf ! agr ; VPerf agr => perf ! agr ;
VImpf agr => impf ! agr ; VImpf agr => impf ! agr ;
VImp num => imp ! num ; VImp num => imp ! num ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
} }

52
lib/src/maltese/ParadigmsMlt.gf
View File

@@ -580,8 +580,8 @@ resource ParadigmsMlt = open
VImpf (AgP3Pl) => impfP3Pl ; VImpf (AgP3Pl) => impfP3Pl ;
VImp (Pl) => impSg ; VImp (Pl) => impSg ;
VImp (Sg) => impPl ; VImp (Sg) => impPl ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo class form root vseq impSg ; info : VerbInfo = mkVerbInfo class form root vseq impSg ;
in lin V { in lin V {
@@ -703,8 +703,8 @@ resource ParadigmsMlt = open
VImpf (AgP2 Pl) => pfx "ti" (pfx_T (dropPfx 1 (get (VImpf (AgP2 Pl))))) ; VImpf (AgP2 Pl) => pfx "ti" (pfx_T (dropPfx 1 (get (VImpf (AgP2 Pl))))) ;
VImpf (AgP3Pl) => pfx "ji" (pfx_T (dropPfx 1 (get (VImpf (AgP3Pl))))) ; VImpf (AgP3Pl) => pfx "ji" (pfx_T (dropPfx 1 (get (VImpf (AgP3Pl))))) ;
VImp num => pfx_T (get (VImp num)) ; VImp num => pfx_T (get (VImp num)) ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
in lin V { in lin V {
s = stemVariantsTbl (tbl) ; s = stemVariantsTbl (tbl) ;
@@ -732,8 +732,8 @@ resource ParadigmsMlt = open
VImpf (AgP2 Pl) => pfx "ti" (pfx_T (dropPfx 1 (get (VImpf (AgP2 Pl))))) ; VImpf (AgP2 Pl) => pfx "ti" (pfx_T (dropPfx 1 (get (VImpf (AgP2 Pl))))) ;
VImpf (AgP3Pl) => pfx "ji" (pfx_T (dropPfx 1 (get (VImpf (AgP3Pl))))) ; VImpf (AgP3Pl) => pfx "ji" (pfx_T (dropPfx 1 (get (VImpf (AgP3Pl))))) ;
VImp num => pfx_T (get (VImp num)) ; VImp num => pfx_T (get (VImp num)) ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
in lin V { in lin V {
s = stemVariantsTbl (tbl) ; s = stemVariantsTbl (tbl) ;
@@ -841,8 +841,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjStrongPerf root vseq ) ! agr ; VPerf agr => ( conjStrongPerf root vseq ) ! agr ;
VImpf agr => ( conjStrongImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjStrongImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Strong Regular) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Strong Regular) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -885,8 +885,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjLiquidMedialPerf root vseq ) ! agr ; VPerf agr => ( conjLiquidMedialPerf root vseq ) ! agr ;
VImpf agr => ( conjLiquidMedialImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjLiquidMedialImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Strong LiquidMedial) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Strong LiquidMedial) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -924,8 +924,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjGeminatedPerf root vseq ) ! agr ; VPerf agr => ( conjGeminatedPerf root vseq ) ! agr ;
VImpf agr => ( conjGeminatedImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjGeminatedImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Strong Geminated) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Strong Geminated) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -963,8 +963,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjAssimilativePerf root vseq ) ! agr ; VPerf agr => ( conjAssimilativePerf root vseq ) ! agr ;
VImpf agr => ( conjAssimilativeImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjAssimilativeImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Weak Assimilative) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Weak Assimilative) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -1002,8 +1002,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjHollowPerf root vseq ) ! agr ; VPerf agr => ( conjHollowPerf root vseq ) ! agr ;
VImpf agr => ( conjHollowImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjHollowImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Weak Hollow) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Weak Hollow) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -1045,8 +1045,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjLackingPerf root vseq ) ! agr ; VPerf agr => ( conjLackingPerf root vseq ) ! agr ;
VImpf agr => ( conjLackingImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjLackingImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Weak Lacking) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Weak Lacking) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -1084,8 +1084,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjDefectivePerf root vseq ) ! agr ; VPerf agr => ( conjDefectivePerf root vseq ) ! agr ;
VImpf agr => ( conjDefectiveImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjDefectiveImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Weak Defective) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Weak Defective) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -1123,8 +1123,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjQuadPerf root vseq ) ! agr ; VPerf agr => ( conjQuadPerf root vseq ) ! agr ;
VImpf agr => ( conjQuadImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjQuadImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Quad QStrong) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Quad QStrong) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -1165,8 +1165,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjQuadWeakPerf root vseq (imp ! Sg) ) ! agr ; VPerf agr => ( conjQuadWeakPerf root vseq (imp ! Sg) ) ! agr ;
VImpf agr => ( conjQuadWeakImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjQuadWeakImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Quad QWeak) (FormI) root vseq (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Quad QWeak) (FormI) root vseq (imp ! Sg) ;
in lin V { in lin V {
@@ -1192,8 +1192,8 @@ resource ParadigmsMlt = open
VPerf agr => ( conjLoanPerf mamma ) ! agr ; VPerf agr => ( conjLoanPerf mamma ) ! agr ;
VImpf agr => ( conjLoanImpf (imp ! Sg) (imp ! Pl) ) ! agr ; VImpf agr => ( conjLoanImpf (imp ! Sg) (imp ! Pl) ) ! agr ;
VImp n => imp ! n ; VImp n => imp ! n ;
VPresPart _ => NONEXIST ; VPresPart _ => nonExist ;
VPastPart _ => NONEXIST VPastPart _ => nonExist
} ; } ;
info : VerbInfo = mkVerbInfo (Loan) (FormI) (imp ! Sg) ; info : VerbInfo = mkVerbInfo (Loan) (FormI) (imp ! Sg) ;
in lin V { in lin V {

11
lib/src/maltese/ResMlt.gf
View File

@@ -867,8 +867,8 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in {
<VImpf (AgP3Pl), Neg> => "jkunux" ; <VImpf (AgP3Pl), Neg> => "jkunux" ;
<VImp (Sg), Neg> => "kunx" ; <VImp (Sg), Neg> => "kunx" ;
<VImp (Pl), Neg> => "kunux" ; <VImp (Pl), Neg> => "kunux" ;
<VPresPart gn, _> => NONEXIST ; <VPresPart gn, _> => nonExist ;
<VPastPart gn, _> => NONEXIST <VPastPart gn, _> => nonExist
} }
} ; } ;
@@ -909,8 +909,8 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in {
VImpf (AgP3Pl) => mkVerbStems "huma" "m'humie" ; VImpf (AgP3Pl) => mkVerbStems "huma" "m'humie" ;
VImp (Sg) => mkVerbStems "kun" ; VImp (Sg) => mkVerbStems "kun" ;
VImp (Pl) => mkVerbStems "kunu" ; VImp (Pl) => mkVerbStems "kunu" ;
VPresPart gn => mkVerbStems NONEXIST ; VPresPart gn => mkVerbStems nonExist ;
VPastPart gn => mkVerbStems NONEXIST VPastPart gn => mkVerbStems nonExist
} ; } ;
i = mkVerbInfo Irregular FormI ; i = mkVerbInfo Irregular FormI ;
hasPresPart = False ; hasPresPart = False ;
@@ -1151,9 +1151,6 @@ resource ResMlt = ParamX ** open Prelude, Predef, Maybe in {
{- ~~~ Useful helper functions ~~~ -} {- ~~~ 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 -- New names for the drop/take operations
takePfx = Predef.take ; takePfx = Predef.take ;
dropPfx = Predef.drop ; dropPfx = Predef.drop ;