mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 00:52:51 -06:00
reflexive and deponent as verb features added
This commit is contained in:
@@ -3,8 +3,7 @@
|
||||
concrete BasicSwe of Basic = CatSwe ** open ParadigmsSwe in {
|
||||
|
||||
flags
|
||||
startcat=Phr ; lexer=textlit ; unlexer=text ;
|
||||
optimize=all ;
|
||||
optimize=values ;
|
||||
|
||||
lin
|
||||
airplane_N = regN "flygplan" neutrum ;
|
||||
@@ -93,8 +92,8 @@ lin
|
||||
have_V2 = dirV2 (mkV "ha" "har" "ha" "hade" "haft" "haft") ; ---- pp
|
||||
hear_V2 = dirV2 (mkV "höra" "hör" "hör" "hörde" "hört" "hörd") ;
|
||||
hill_N = regN "kulle" utrum ;
|
||||
hope_VS = mkVS ((regV "önska")) ;
|
||||
---- hope_VS = mkVS (depV (regV "hoppas")) ;
|
||||
-- hope_VS = mkVS ((regV "önska")) ;
|
||||
hope_VS = mkVS (depV (regV "hoppa")) ;
|
||||
horse_N = regN "häst" utrum ;
|
||||
hot_A = regADeg "het" ;
|
||||
house_N = regN "hus" neutrum ;
|
||||
@@ -105,7 +104,7 @@ lin
|
||||
know_V2 = dirV2 (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ;
|
||||
lake_N = mkN "sjö" "sjön" "sjöar" "sjöarna" ;
|
||||
lamp_N = regN "lampa" utrum;
|
||||
learn_V2 = dirV2 (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd") ; ---- refl!
|
||||
learn_V2 = dirV2 (reflV (mkV "lära" "lär" "lär" "lärde" "lärt" "lärd")) ;
|
||||
leather_N = mkN "läder" "lädret" "läder" "lädren" ;
|
||||
leave_V2 = dirV2 (regV "lämna") ;
|
||||
like_V2 = mkV2 (mk2V "tycka" "tyckte") "om" ;
|
||||
|
||||
@@ -51,6 +51,14 @@ instance DiffSwe of DiffScand = open ResScand, Prelude in {
|
||||
Neutr => allt
|
||||
} ;
|
||||
|
||||
reflPron : Agr -> Str = \a -> case a of {
|
||||
{gn = Plg ; p = P1} => "oss" ;
|
||||
{gn = Plg ; p = P2} => "er" ;
|
||||
{p = P1} => "mig" ;
|
||||
{p = P2} => "dig" ;
|
||||
{p = P3} => "sig"
|
||||
} ;
|
||||
|
||||
relPron : GenNum => RCase => Str = \\gn,c => case c of {
|
||||
RNom => "som" ;
|
||||
RGen => "vars" ;
|
||||
|
||||
@@ -145,7 +145,8 @@ adj2Reg : Str -> Str -> Adjective = \vid,vitt ->
|
||||
funnet = funn ! Strong SgNeutr ! Nom ;
|
||||
funna = funn ! Strong Plg ! Nom
|
||||
in
|
||||
mkVerb finna finner finn fann funnit funnen funnet funna ;
|
||||
mkVerb finna finner finn fann funnit funnen funnet funna **
|
||||
{vtype=VAct} ;
|
||||
|
||||
ptPretForms : Str -> AFormPos => Case => Str = \funnen -> \\a,c =>
|
||||
let
|
||||
|
||||
@@ -229,9 +229,11 @@ oper
|
||||
|
||||
--3 Deponent verbs.
|
||||
--
|
||||
-- Some words are used in passive forms only, e.g. "hoppas".
|
||||
-- Some words are used in passive forms only, e.g. "hoppas", some as
|
||||
-- reflexive e.g. "ångra sig".
|
||||
|
||||
depV : V -> V ;
|
||||
reflV : V -> V ;
|
||||
|
||||
--3 Two-place verbs
|
||||
--
|
||||
@@ -338,8 +340,9 @@ oper
|
||||
irregV x y z = irregVerb x y z
|
||||
** {s1 = [] ; lock_V = <>} ;
|
||||
|
||||
partV v p = {s = \\f => v.s ! f ++ p ; lock_V = <>} ;
|
||||
---- depV v = deponentVerb v ** {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 = <>} ;
|
||||
|
||||
mkV2 v p = v ** {s = v.s ; c2 = p ; lock_V2 = <>} ;
|
||||
dirV2 v = mkV2 v [] ;
|
||||
|
||||
Reference in New Issue
Block a user