GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

patches to Now and Dan verb forms ; opers and lindefs in JS

Browse Source
This commit is contained in:
aarne
2007-10-10 17:35:50 +00:00
parent 07796eb3ee
commit a303afdba3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/resource-1.0/danish/IrregDan.gf
View File

@@ -32,7 +32,7 @@ concrete IrregDan of IrregDanAbs = CatDan ** open Prelude, ParadigmsDan in {
give_V = irregV "give" "gav" "givet" ; give_V = irregV "give" "gav" "givet" ;
gnide_V = irregV "gnide" "gned" "gnidd" ;-- gnide_V = irregV "gnide" "gned" "gnidd" ;--
gøre_V = irregV "gøre" "gjorde" "gjort" ; gøre_V = irregV "gøre" "gjorde" "gjort" ;
have_V = mkV "have" "har" "havde" "haft" nonExist "hav" ; have_V = mkV "have" "har" "havde" "haft" "havd" "hav" ;
hente_V = irregV "hente" "hentet" "hendt" ;-- hente_V = irregV "hente" "hentet" "hendt" ;--
-- hete_V = irregV "hete" (variants {"het" ;-- "hette"}) "hett" ;-- -- hete_V = irregV "hete" (variants {"het" ;-- "hette"}) "hett" ;--
-- hjelpe_V = irregV "hjelpe" "hjalp" "hjulpet" ;-- -- hjelpe_V = irregV "hjelpe" "hjalp" "hjulpet" ;--
@@ -69,4 +69,4 @@ concrete IrregDan of IrregDanAbs = CatDan ** open Prelude, ParadigmsDan in {
} }
-- readFile "vrbs.tmp" >>= mapM_ (putStrLn . (\ (a:_:b:c:_) -> " " ++ a ++ "_V = irregV \"" ++ a ++ "\" \"" ++ b ++ "\" \"" ++ c ++ "\" ;") . words) . lines -- readFile "vrbs.tmp" >>= mapM_ (putStrLn . (\ (a:_:b:c:_) -> " " ++ a ++ "_V = irregV \"" ++ a ++ "\" \"" ++ b ++ "\" \"" ++ c ++ "\" ;") . words) . lines

4
lib/resource-1.0/danish/StructuralDan.gf
View File

@@ -20,7 +20,7 @@ concrete StructuralDan of Structural = CatDan **
but_PConj = ss "men" ; but_PConj = ss "men" ;
by8means_Prep = ss "med" ; by8means_Prep = ss "med" ;
can8know_VV, can_VV = can8know_VV, can_VV =
mkV "kunne" "kan" nonExist "kunne" "kunnet" nonExist ** mkV "kunne" "kan" "kan" "kunne" "kunnet" "kan" **
{c2 = [] ; lock_VV = <>} ; {c2 = [] ; lock_VV = <>} ;
during_Prep = ss "under" ; during_Prep = ss "under" ;
either7or_DConj = sd2 "enten" "eller" ** {n = Sg} ; either7or_DConj = sd2 "enten" "eller" ** {n = Sg} ;
@@ -97,7 +97,7 @@ concrete StructuralDan of Structural = CatDan **
under_Prep = ss "under" ; under_Prep = ss "under" ;
very_AdA = ss "meget" ; very_AdA = ss "meget" ;
want_VV = want_VV =
mkV "ville" "vil" nonExist "ville" "villet" "villed" ** mkV "ville" "vil" "vil" "ville" "villet" "villed" **
{c2 = [] ; lock_VV = <>} ; {c2 = [] ; lock_VV = <>} ;
we_Pron = MorphoDan.mkNP "vi" "os" "vores" "vores" "vores" Plg P1 ; we_Pron = MorphoDan.mkNP "vi" "os" "vores" "vores" "vores" Plg P1 ;
whatSg_IP = {s = \\_ => "hvad" ; gn = SgUtr} ; ---- infl whatSg_IP = {s = \\_ => "hvad" ; gn = SgUtr} ; ---- infl

6
lib/resource-1.0/norwegian/StructuralNor.gf
View File

@@ -20,7 +20,7 @@ concrete StructuralNor of Structural = CatNor **
but_PConj = ss "men" ; but_PConj = ss "men" ;
by8means_Prep = ss "med" ; by8means_Prep = ss "med" ;
can8know_VV, can_VV = can8know_VV, can_VV =
mkV "kunne" "kan" nonExist "kunne" "kunnet" nonExist ** mkV "kunne" "kan" "kunn" "kunne" "kunnet" "kunnen" **
{c2 = [] ; lock_VV = <>} ; {c2 = [] ; lock_VV = <>} ;
during_Prep = ss "under" ; during_Prep = ss "under" ;
either7or_DConj = sd2 "enten" "eller" ** {n = Sg} ; either7or_DConj = sd2 "enten" "eller" ** {n = Sg} ;
@@ -50,7 +50,7 @@ concrete StructuralNor of Structural = CatNor **
most_Predet = {s = gennumForms ["den meste"] ["det meste"] ["de fleste"]} ; most_Predet = {s = gennumForms ["den meste"] ["det meste"] ["de fleste"]} ;
much_Det = {s = \\_,_ => "mye" ; n = Pl ; det = DDef Indef} ; much_Det = {s = \\_,_ => "mye" ; n = Pl ; det = DDef Indef} ;
must_VV = must_VV =
mkV "måtte" "må" "få" "måtte" "måttet" "mått" ** {c2 = [] ; lock_VV = <>} ; mkV "måtte" "må" "må" "måtte" "måttet" "mått" ** {c2 = [] ; lock_VV = <>} ;
no_Phr = ss ["Nei"] ; no_Phr = ss ["Nei"] ;
on_Prep = ss "på" ; on_Prep = ss "på" ;
one_Quant = {s = \\_ => genderForms ["en"] ["et"] ; n = Sg ; det = DIndef} ; --- ei one_Quant = {s = \\_ => genderForms ["en"] ["et"] ; n = Sg ; det = DIndef} ; --- ei
@@ -97,7 +97,7 @@ concrete StructuralNor of Structural = CatNor **
under_Prep = ss "under" ; under_Prep = ss "under" ;
very_AdA = ss "mye" ; very_AdA = ss "mye" ;
want_VV = want_VV =
mkV "ville" "vil" nonExist "ville" "villet" "villed" ** mkV "ville" "vil" "vill" "ville" "villet" "villed" **
{c2 = [] ; lock_VV = <>} ; {c2 = [] ; lock_VV = <>} ;
we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Plg P1 ; we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Plg P1 ;
whatSg_IP = {s = \\_ => "hva" ; gn = SgUtr} ; ---- infl whatSg_IP = {s = \\_ => "hva" ; gn = SgUtr} ; ---- infl

2
src/GF/Devel/GFCCtoJS.hs
View File

@@ -42,7 +42,7 @@ concrete2js (C.CId a) (C.CId c, cnc) =
++ concatMap (cncdef2js l) ds ++ concatMap (cncdef2js l) ds
where where
l = JS.Ident c l = JS.Ident c
ds = Map.assocs $ D.lins cnc ds = concatMap Map.assocs [D.lins cnc, D.opers cnc, D.lindefs cnc]
cncdef2js :: JS.Ident -> (C.CId,C.Term) -> [JS.Element] cncdef2js :: JS.Ident -> (C.CId,C.Term) -> [JS.Element]
cncdef2js l (C.CId f, t) = cncdef2js l (C.CId f, t) =