fixed Danish auxialiary and particle verb word order in Scandinavian

This commit is contained in:
aarne
2006-05-26 14:03:45 +00:00
parent db8d378b1f
commit 6a0fc4e053
13 changed files with 156 additions and 81 deletions

View File

@@ -18,6 +18,15 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in {
detDef : Species = Def ;
Verb : Type = {
s : VForm => Str ;
part : Str ;
vtype : VType
} ;
hasAuxBe _ = False ;
-- Strings.
conjThat = "att" ;
@@ -33,11 +42,16 @@ instance DiffSwe of DiffScand = open CommonScand, Prelude in {
} ;
verbHave =
mkVerb "ha" "har" "ha" "hade" "haft" "havd" "havt" "havda" ;
mkVerb "ha" "har" "ha" "hade" "haft" "havd" "havt" "havda" ** noPart ;
verbBe =
mkVerb "vara" "är" "var" "var" "varit" "varen" "varet" "varna" ;
mkVerb "vara" "är" "var" "var" "varit" "varen" "varet" "varna"
** noPart ;
verbBecome =
mkVerb "bli" "blir" "bli" "blev" "blivit" "bliven" "blivet" "blivna" ;
mkVerb "bli" "blir" "bli" "blev" "blivit" "bliven" "blivet" "blivna"
** noPart ;
-- auxiliary
noPart = {part = []} ;
auxFut = "ska" ; -- "skall" in ExtSwe
auxCond = "skulle" ;

View File

@@ -423,7 +423,7 @@ oper
funna = funn ! Strong Plg ! Nom
in
mkVerb finna finner finn fann funnit funnen funnet funna **
{vtype=VAct ; lock_V = <>} ;
{part = [] ; vtype=VAct ; lock_V = <>} ;
regV leker = case leker of {
lek + "a" => conj1 leker ; --- bw compat
@@ -480,9 +480,9 @@ oper
mkV sälja (säljer.s ! VF (VPres Act)) (säljer.s ! (VF (VImper Act))) sålde sålt såld
** {s1 = [] ; lock_V = <>} ;
partV v p = {s = \\f => v.s ! f ++ p ; vtype = v.vtype ; lock_V = <>} ;
depV v = {s = v.s ; vtype = VPass ; lock_V = <>} ;
reflV v = {s = v.s ; vtype = VRefl ; lock_V = <>} ;
partV v p = {s = v.s ; part = p ; vtype = v.vtype ; lock_V = <>} ;
depV v = {s = v.s ; part = v.part ; vtype = VPass ; lock_V = <>} ;
reflV v = {s = v.s ; part = v.part ; vtype = VRefl ; lock_V = <>} ;
mkV2 v p = v ** {c2 = p ; lock_V2 = <>} ;
dirV2 v = mkV2 v [] ;