GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-26 11:18:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

added linref's and fixed some minor things in Scandinavian

Browse Source
This commit is contained in:
aarne
2013-11-03 10:27:20 +00:00
parent 0cb3245e26
commit a0380013ba
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/norwegian/StructuralNor.gf
View File

@@ -99,7 +99,7 @@ concrete StructuralNor of Structural = CatNor **
{c2 = mkComplement [] ; lock_VV = <>} ; {c2 = mkComplement [] ; lock_VV = <>} ;
we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Utr Pl P1 ; we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Utr Pl P1 ;
whatSg_IP = {s = \\_ => "hva" ; g = Neutr ; n = Sg} ; ---- infl whatSg_IP = {s = \\_ => "hva" ; g = Neutr ; n = Sg} ; ---- infl
whatPl_IP = {s = \\_ => "hva" ; g = Neutr ; n = Pl} ; ---- infl whatPl_IP = {s = \\_ => "hvilke" ; g = Neutr ; n = Pl} ; ---- infl
when_IAdv = ss "når" ; when_IAdv = ss "når" ;
when_Subj = ss "når" ; when_Subj = ss "når" ;
where_IAdv = ss "hvor" ; where_IAdv = ss "hvor" ;

25
lib/src/scandinavian/CatScand.gf
View File

@@ -107,4 +107,29 @@ incomplete concrete CatScand of Cat =
lincat lincat
Temp = {s : Str ; t : STense ; a : Anteriority} ; Temp = {s : Str ; t : STense ; a : Anteriority} ;
Tense = {s : Str ; t : STense} ; Tense = {s : Str ; t : STense} ;
oper
agrUSgP3 : Agr = {g = Utr ; n = Sg ; p = P3} ;
linref
SSlash = \ss -> ss.s ! Main ++ ss.c2.s ++ ss.n3 ! agrUSgP3 ;
ClSlash = \cls -> cls.s ! SPres ! Simul ! Pos ! Main ++ cls.c2.s ++ cls.n3 ! agrUSgP3 ;
VP = \vp -> infVP vp agrUSgP3 ;
VPSlash = \vps -> infVP vps agrUSgP3 ++ vps.c2.s ++ vps.n3 ! agrUSgP3 ;
V, VS, VQ, VA = \v -> infVP (predV v) agrUSgP3 ;
V2, V2A, V2Q, V2S = \v -> infVP (predV v) agrUSgP3 ++ v.c2.s ;
V3 = \v -> infVP (predV v) agrUSgP3 ++ v.c2.s ++ v.c3.s ;
VV = \v -> infVP (predV v) agrUSgP3 ;
V2V = \v -> infVP (predV v) agrUSgP3 ++ v.c2.s ;
{-
A = \a -> a.s ! AAdj Posit Nom ;
A2 = \a -> a.s ! AAdj Posit Nom ++ a.c2 ;
N = \n -> n.s ! Sg ! Nom ;
N2 = \n -> n.s ! Sg ! Nom ++ n.c2 ;
N3 = \n -> n.s ! Sg ! Nom ++ n.c2 ++ n.c3 ;
-}
} }

1
lib/src/scandinavian/PhraseScand.gf
View File

@@ -18,6 +18,7 @@ incomplete concrete PhraseScand of Phrase =
UttCN n = {s = n.s ! Sg ! DIndef ! Nom} ; UttCN n = {s = n.s ! Sg ! DIndef ! Nom} ;
UttAP n = {s = n.s ! Strong (GSg Utr)} ; UttAP n = {s = n.s ! Strong (GSg Utr)} ;
UttCard n = {s = n.s ! neutrum} ; UttCard n = {s = n.s ! neutrum} ;
UttInterj i = i ;
NoPConj = {s = []} ; NoPConj = {s = []} ;
PConjConj conj = {s = conj.s2} ; PConjConj conj = {s = conj.s2} ;

2
lib/src/swedish/StructuralSwe.gf
View File

@@ -104,7 +104,7 @@ concrete StructuralSwe of Structural = CatSwe **
{c2 = mkComplement [] ; lock_VV = <>} ; {c2 = mkComplement [] ; lock_VV = <>} ;
we_Pron = MorphoSwe.mkNP "vi" "oss" "vår" "vårt" "våra" Utr Pl P1 ; we_Pron = MorphoSwe.mkNP "vi" "oss" "vår" "vårt" "våra" Utr Pl P1 ;
whatSg_IP = {s = \\_ => "vad" ; g = Neutr ; n = Sg} ; ---- infl, g whatSg_IP = {s = \\_ => "vad" ; g = Neutr ; n = Sg} ; ---- infl, g
whatPl_IP = {s = \\_ => "vad" ; g = Neutr ; n = Pl} ; ---- infl, g whatPl_IP = {s = \\_ => "vilka" ; g = Neutr ; n = Pl} ; ---- infl, g
when_IAdv = ss "när" ; when_IAdv = ss "när" ;
when_Subj = ss "när" ; when_Subj = ss "när" ;
that_Subj = ss "att" ; that_Subj = ss "att" ;