mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-24 10:22:50 -06:00
we now support irregAdv in Swedish
This commit is contained in:
@@ -53,7 +53,8 @@ oper
|
|||||||
AF (APosit _) c => mkCase c store ;
|
AF (APosit _) c => mkCase c store ;
|
||||||
AF ACompar c => mkCase c storre ;
|
AF ACompar c => mkCase c storre ;
|
||||||
AF (ASuperl SupStrong) c => mkCase c storst ;
|
AF (ASuperl SupStrong) c => mkCase c storst ;
|
||||||
AF (ASuperl SupWeak) c => mkCase c (storst + "e")
|
AF (ASuperl SupWeak) c => mkCase c (storst + "e") ;
|
||||||
|
AAdv => stort
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,8 @@ oper
|
|||||||
AF (APosit _) c => mkCase c store ;
|
AF (APosit _) c => mkCase c store ;
|
||||||
AF ACompar c => mkCase c storre ;
|
AF ACompar c => mkCase c storre ;
|
||||||
AF (ASuperl SupStrong) c => mkCase c storst ;
|
AF (ASuperl SupStrong) c => mkCase c storst ;
|
||||||
AF (ASuperl SupWeak) c => mkCase c (storst + "e")
|
AF (ASuperl SupWeak) c => mkCase c (storst + "e") ;
|
||||||
|
AAdv => stort
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -2,13 +2,13 @@ incomplete concrete AdverbScand of Adverb = CatScand ** open CommonScand, ResSca
|
|||||||
|
|
||||||
lin
|
lin
|
||||||
PositAdvAdj a = {
|
PositAdvAdj a = {
|
||||||
s = a.s ! adverbForm
|
s = a.s ! AAdv
|
||||||
} ;
|
} ;
|
||||||
ComparAdvAdj cadv a np = {
|
ComparAdvAdj cadv a np = {
|
||||||
s = cadv.s ++ a.s ! adverbForm ++ cadv.p ++ np.s ! nominative
|
s = cadv.s ++ a.s ! AAdv ++ cadv.p ++ np.s ! nominative
|
||||||
} ;
|
} ;
|
||||||
ComparAdvAdjS cadv a s = {
|
ComparAdvAdjS cadv a s = {
|
||||||
s = cadv.s ++ a.s ! adverbForm ++ cadv.p ++ s.s ! Sub
|
s = cadv.s ++ a.s ! AAdv ++ cadv.p ++ s.s ! Sub
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
PrepNP prep np = {s = prep.s ++ np.s ! accusative} ;
|
PrepNP prep np = {s = prep.s ++ np.s ! accusative} ;
|
||||||
@@ -16,7 +16,7 @@ incomplete concrete AdverbScand of Adverb = CatScand ** open CommonScand, ResSca
|
|||||||
AdAdv = cc2 ;
|
AdAdv = cc2 ;
|
||||||
|
|
||||||
PositAdAAdj a = {
|
PositAdAAdj a = {
|
||||||
s = a.s ! adverbForm
|
s = a.s ! AAdv
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
SubjS subj s = {
|
SubjS subj s = {
|
||||||
@@ -25,7 +25,4 @@ incomplete concrete AdverbScand of Adverb = CatScand ** open CommonScand, ResSca
|
|||||||
|
|
||||||
AdnCAdv cadv = {s = cadv.s ++ conjThan} ;
|
AdnCAdv cadv = {s = cadv.s ++ conjThan} ;
|
||||||
|
|
||||||
oper
|
|
||||||
adverbForm : AForm = AF (APosit (Strong (GSg Neutr))) Nom ;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ param
|
|||||||
|
|
||||||
Gender = Utr | Neutr ;
|
Gender = Utr | Neutr ;
|
||||||
|
|
||||||
AForm = AF AFormGrad Case ;
|
AForm = AF AFormGrad Case | AAdv ;
|
||||||
|
|
||||||
AFormGrad =
|
AFormGrad =
|
||||||
APosit AFormPos
|
APosit AFormPos
|
||||||
@@ -192,7 +192,8 @@ oper
|
|||||||
AF (APosit a) c => mkCase c (mkAdjPos a liten litet lilla sma) ;
|
AF (APosit a) c => mkCase c (mkAdjPos a liten litet lilla sma) ;
|
||||||
AF ACompar c => mkCase c mindre ;
|
AF ACompar c => mkCase c mindre ;
|
||||||
AF (ASuperl SupStrong) c => mkCase c minst ;
|
AF (ASuperl SupStrong) c => mkCase c minst ;
|
||||||
AF (ASuperl SupWeak) c => mkCase c minsta
|
AF (ASuperl SupWeak) c => mkCase c minsta ;
|
||||||
|
AAdv => litet
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,9 @@ lin
|
|||||||
caseInfl Nom ++
|
caseInfl Nom ++
|
||||||
tr (intagAttr "th" "colspan=5" "genitiv") ++
|
tr (intagAttr "th" "colspan=5" "genitiv") ++
|
||||||
caseInfl Nom
|
caseInfl Nom
|
||||||
)
|
) ++
|
||||||
|
heading1 ("Adverb") ++
|
||||||
|
paragraph (adj.s ! AAdv) ;
|
||||||
} where {
|
} where {
|
||||||
caseInfl : Case -> Str = \c ->
|
caseInfl : Case -> Str = \c ->
|
||||||
tr (intagAttr "th" "rowspan=3" "obest" ++
|
tr (intagAttr "th" "rowspan=3" "obest" ++
|
||||||
|
|||||||
@@ -189,6 +189,8 @@ oper
|
|||||||
|
|
||||||
invarA : Str -> A ; -- e.g. äkta
|
invarA : Str -> A ; -- e.g. äkta
|
||||||
|
|
||||||
|
irregAdv : A -> Str -> A ; -- adverb irreg
|
||||||
|
|
||||||
---- Adjective with deviant adverb.
|
---- Adjective with deviant adverb.
|
||||||
|
|
||||||
---- deviantAdvA : Str -> A -> A ; -- e.g. bra, god
|
---- deviantAdvA : Str -> A -> A ; -- e.g. bra, god
|
||||||
@@ -582,6 +584,8 @@ oper
|
|||||||
|
|
||||||
invarA s = mk3cA s s s True ;
|
invarA s = mk3cA s s s True ;
|
||||||
|
|
||||||
|
irregAdv a adv = lin A {s = table {AAdv => adv; aform => a.s ! aform}; isComp = a.isComp} ;
|
||||||
|
|
||||||
mkA2 a p = a ** {c2 = mkComplement p.s ; lock_A2 = <>} ;
|
mkA2 a p = a ** {c2 = mkComplement p.s ; lock_A2 = <>} ;
|
||||||
|
|
||||||
mkAdv x = ss x ** {lock_Adv = <>} ;
|
mkAdv x = ss x ** {lock_Adv = <>} ;
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ lin
|
|||||||
isDet = True
|
isDet = True
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
PositAdVAdj a = {s = a.s ! G.adverbForm} ;
|
PositAdVAdj a = {s = a.s ! AAdv} ;
|
||||||
|
|
||||||
UseQuantPN q pn = {
|
UseQuantPN q pn = {
|
||||||
s = \\c => q.s ! Sg ! True ! False ! pn.g ++ pn.s ! caseNP c ;
|
s = \\c => q.s ! Sg ! True ! False ! pn.g ++ pn.s ! caseNP c ;
|
||||||
|
|||||||
Reference in New Issue
Block a user