mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-19 08:02:51 -06:00
fixed Danish auxialiary and particle verb word order in Scandinavian
This commit is contained in:
@@ -17,7 +17,15 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in {
|
||||
_ => Plg
|
||||
} ;
|
||||
|
||||
detDef : Species = Def ;
|
||||
detDef : Species = Indef ;
|
||||
|
||||
Verb : Type = {
|
||||
s : VForm => Str ;
|
||||
part : Str ;
|
||||
vtype : VType
|
||||
} ;
|
||||
|
||||
hasAuxBe _ = False ;
|
||||
|
||||
-- Strings.
|
||||
|
||||
@@ -35,11 +43,17 @@ instance DiffNor of DiffScand = open CommonScand, Prelude in {
|
||||
} ;
|
||||
|
||||
verbHave =
|
||||
mkVerb "ha" "har" "ha" "hadde" "hatt" nonExist nonExist nonExist ;
|
||||
mkVerb "ha" "har" "ha" "hadde" "hatt" nonExist nonExist nonExist
|
||||
** noPart ;
|
||||
verbBe =
|
||||
mkVerb "være" "er" "var" "var" "vært" "væren" "været" "værne" ;
|
||||
mkVerb "være" "er" "var" "var" "vært" "væren" "været" "værne"
|
||||
** noPart ;
|
||||
verbBecome =
|
||||
mkVerb "bli" "blir" "bli" "ble" "blitt" "bliven" "blivet" "blivne" ;
|
||||
mkVerb "bli" "blir" "bli" "ble" "blitt" "bliven" "blivet" "blivne"
|
||||
** noPart ;
|
||||
|
||||
-- auxiliary
|
||||
noPart = {part = []} ;
|
||||
|
||||
auxFut = "vil" ; -- "skal" in ExtNor
|
||||
auxCond = "ville" ;
|
||||
|
||||
@@ -356,14 +356,15 @@ oper
|
||||
|
||||
mkPreposition p = p ;
|
||||
|
||||
mkV a b c d e f = mkVerb6 a b c d e f ** {s1 = [] ; vtype = VAct ; lock_V = <>} ;
|
||||
mkV a b c d e f = mkVerb6 a b c d e f **
|
||||
{part = [] ; vtype = VAct ; lock_V = <>} ;
|
||||
|
||||
regV a = case last a of {
|
||||
"e" => vHusk (init a) ;
|
||||
_ => vBo a
|
||||
} ** {s1 = [] ; vtype = VAct ; lock_V = <>} ;
|
||||
} ** {part = [] ; vtype = VAct ; lock_V = <>} ;
|
||||
|
||||
mk2V a b = regVerb a b ** {s1 = [] ; vtype = VAct ; lock_V = <>} ;
|
||||
mk2V a b = regVerb a b ** {part = [] ; vtype = VAct ; lock_V = <>} ;
|
||||
|
||||
irregV =
|
||||
\drikke,drakk,drukket ->
|
||||
@@ -380,9 +381,9 @@ oper
|
||||
mkV drikke drikker (drikke + "s") drakk drukket drikk ;
|
||||
|
||||
|
||||
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 [] ;
|
||||
|
||||
@@ -72,7 +72,7 @@ concrete StructuralNor of Structural = CatNor **
|
||||
Sg => \\_ => genderForms ["den der"] ["det der"] ;
|
||||
Pl => \\_,_ => ["de der"]
|
||||
} ;
|
||||
det = DDef Def
|
||||
det = DDef Indef
|
||||
} ;
|
||||
that_NP = regNP ["det der"] ["det ders"] SgNeutr ;
|
||||
there_Adv = ss "der" ;
|
||||
@@ -86,7 +86,7 @@ concrete StructuralNor of Structural = CatNor **
|
||||
Sg => \\_ => genderForms ["den her"] ["det her"] ;
|
||||
Pl => \\_,_ => ["de her"]
|
||||
} ;
|
||||
det = DDef Def
|
||||
det = DDef Indef
|
||||
} ;
|
||||
this_NP = regNP ["det her"] ["det hers"] SgNeutr ;
|
||||
those_NP = regNP ["de der"] ["de ders"] Plg ;
|
||||
|
||||
Reference in New Issue
Block a user