forked from GitHub/gf-core
swedish extra
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
abstract ExtraScandAbs = Extra ** {
|
||||
|
||||
fun
|
||||
fun --# notpresent
|
||||
TFutKommer : Tense ; --# notpresent
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--# -path=.:../scandinavian:../abstract:../common:prelude
|
||||
|
||||
concrete AllSwe of AllSweAbs =
|
||||
LangSwe,
|
||||
LangSwe - [PassV2],
|
||||
IrregSwe,
|
||||
ExtraSwe
|
||||
** {} ;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
abstract AllSweAbs =
|
||||
Lang,
|
||||
Lang - [PassV2] ,
|
||||
IrregSweAbs,
|
||||
ExtraSweAbs
|
||||
** {} ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
--# -path=./gf:.:swedish:prelude:alltenses:abstract:scandinavian:common
|
||||
--# -path=.:../scandinavian:../abstract:../common:prelude
|
||||
concrete ExtraSwe of ExtraSweAbs = ExtraScandSwe - [FocAdv] ,
|
||||
ParadigmsSwe - [nominative] **
|
||||
open CommonScand, ResSwe, ParamX, VerbSwe, Prelude, DiffSwe, StructuralSwe, MorphoSwe,
|
||||
@@ -74,12 +74,12 @@ lin
|
||||
agr = np.a ;
|
||||
vps = vp.s ! VPFinite t a ;
|
||||
vf = case <<t,a> : STense * Anteriority> of {
|
||||
<SPres,Simul> => vps.fin;
|
||||
<SPast,Simul> => vps.fin;
|
||||
<_ ,Simul> => vps.inf;
|
||||
<SPres,Anter> => vps.inf;
|
||||
<SPast,Anter> => vps.inf;
|
||||
<_ ,Anter> => (vp.s ! VPFinite SPast Anter).inf
|
||||
<SPres,Simul> => vps.fin
|
||||
;<SPast,Simul> => vps.fin; --# notpresent
|
||||
<_ ,Simul> => vps.inf; --# notpresent
|
||||
<SPres,Anter> => vps.inf; --# notpresent
|
||||
<SPast,Anter> => vps.inf; --# notpresent
|
||||
<_ ,Anter> => (vp.s ! VPFinite SPast Anter).inf --# notpresent
|
||||
};
|
||||
verb = mkClause subj agr (predV do_V) ;
|
||||
comp = vp.n2 ! agr ++ vp.a2 ++ vp.ext
|
||||
@@ -142,11 +142,11 @@ lin
|
||||
;
|
||||
|
||||
|
||||
SupCl np vp pol = let sub = np.s ! nominative ;
|
||||
verb = (vp.s ! VPFinite SPres Anter).inf ;
|
||||
neg = vp.a1 ! pol.p ++ pol.s ;
|
||||
compl = vp.n2 ! np.a ++ vp.a2 ++ vp.ext in
|
||||
{s = \\_ => sub ++ neg ++ verb ++ compl };
|
||||
SupCl np vp pol = let sub = np.s ! nominative ; --# notpresent
|
||||
verb = (vp.s ! VPFinite SPres Anter).inf ; --# notpresent
|
||||
neg = vp.a1 ! pol.p ++ pol.s ; --# notpresent
|
||||
compl = vp.n2 ! np.a ++ vp.a2 ++ vp.ext in --# notpresent
|
||||
{s = \\_ => sub ++ neg ++ verb ++ compl }; --# notpresent
|
||||
|
||||
|
||||
PassV2 v2 = predV (depV v2);
|
||||
@@ -241,10 +241,6 @@ lin
|
||||
sp = \\_ => genderForms ["varenda en"] ["vartenda ett"] ;
|
||||
n = Sg ; det = DDef Indef};
|
||||
|
||||
most_Det = {s,sp = \\ismod,_ => let av = case ismod of {True => "av" ; False = ""} in
|
||||
detForms ["den mesta"] ["det mesta"] ["de flesta"] ;
|
||||
n = Sg ; det = DDef Indef} ;
|
||||
|
||||
noll_Det = {s,sp = \\_,_ => "noll" ; n = Pl ; det = DDef Indef};
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
--# -path=./gf:.:swedish:prelude:alltenses:abstract:scandinavian:common
|
||||
--# -path=.:../scandinavian:../abstract:../common:prelude
|
||||
-- Structures special for Swedish. These are not implemented in other
|
||||
-- Scandinavian languages.
|
||||
|
||||
@@ -21,7 +21,7 @@ fun
|
||||
RelVS : S -> RelVSCl -> S ; -- hon sover, vilket vi vet
|
||||
RelSlashVS : Temp -> Pol -> VS -> NP -> RelVSCl ; -- vilket vi vet
|
||||
|
||||
FocAP : Comp -> NP -> Foc ;
|
||||
FocAP : Comp -> NP -> Foc ;
|
||||
|
||||
DetNP_utr : Det -> NP ; -- den här
|
||||
|
||||
@@ -61,12 +61,6 @@ fun
|
||||
|
||||
AdvComp : Comp -> Adv -> Comp ; -- jag är redan här
|
||||
|
||||
dethaer_NP : NP ;
|
||||
detdaer_NP : NP ;
|
||||
dedaer8utr_NP : NP ;
|
||||
dedaer8neut_NP : NP ;
|
||||
denhaer_NP : NP ;
|
||||
dendaer_NP : NP ;
|
||||
|
||||
----------------- Predeterminers,Quantifiers,Determiners
|
||||
|
||||
@@ -74,10 +68,8 @@ fun
|
||||
|
||||
sadana_PronAQ : PronAQ ;
|
||||
fler_PronAD : PronAD ;
|
||||
-- overgenerating: alla hela katter. should not be ok.
|
||||
-- predets should be able to decide definites?
|
||||
hela_Predet : Predet ; --hela horder/hela katten -- both
|
||||
sjaelva_Quant : Quant ; -- själva kungen/själva öronen -- def
|
||||
hela_Predet : Predet ; --hela horder/hela katten
|
||||
sjaelva_Quant : Quant ; -- själva kungen/själva öronen
|
||||
samma_Predet : Predet ; -- samma katter/samma öra
|
||||
varenda_Det : Det ;
|
||||
vardera_Det : Det ;
|
||||
|
||||
@@ -11,10 +11,10 @@ concrete GrammarSwe of Grammar =
|
||||
RelativeSwe,
|
||||
ConjunctionSwe,
|
||||
PhraseSwe,
|
||||
TextX,
|
||||
TextX -[Tense,Temp],
|
||||
IdiomSwe,
|
||||
StructuralSwe,
|
||||
TenseX
|
||||
TenseSwe
|
||||
** {
|
||||
|
||||
flags startcat = Phr ; unlexer = text ; lexer = text ;
|
||||
|
||||
Reference in New Issue
Block a user