forked from GitHub/gf-core
added linref's and fixed some minor things in Scandinavian
This commit is contained in:
@@ -99,7 +99,7 @@ concrete StructuralNor of Structural = CatNor **
|
||||
{c2 = mkComplement [] ; lock_VV = <>} ;
|
||||
we_Pron = MorphoNor.mkNP "vi" "oss" "vår" "vårt" "våre" Utr Pl P1 ;
|
||||
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_Subj = ss "når" ;
|
||||
where_IAdv = ss "hvor" ;
|
||||
|
||||
@@ -107,4 +107,29 @@ incomplete concrete CatScand of Cat =
|
||||
lincat
|
||||
Temp = {s : Str ; t : STense ; a : Anteriority} ;
|
||||
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 ;
|
||||
-}
|
||||
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ incomplete concrete PhraseScand of Phrase =
|
||||
UttCN n = {s = n.s ! Sg ! DIndef ! Nom} ;
|
||||
UttAP n = {s = n.s ! Strong (GSg Utr)} ;
|
||||
UttCard n = {s = n.s ! neutrum} ;
|
||||
UttInterj i = i ;
|
||||
|
||||
NoPConj = {s = []} ;
|
||||
PConjConj conj = {s = conj.s2} ;
|
||||
|
||||
@@ -104,7 +104,7 @@ concrete StructuralSwe of Structural = CatSwe **
|
||||
{c2 = mkComplement [] ; lock_VV = <>} ;
|
||||
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
|
||||
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_Subj = ss "när" ;
|
||||
that_Subj = ss "att" ;
|
||||
|
||||
Reference in New Issue
Block a user