mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-24 02:12:50 -06:00
use SOFT_BIND in the Bulgarian and Swedish grammars
This commit is contained in:
@@ -62,7 +62,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
ExtAdvNP np adv = {
|
ExtAdvNP np adv = {
|
||||||
s = \\c => np.s ! c ++ "," ++ adv.s ;
|
s = \\c => np.s ! c ++ comma ++ adv.s ;
|
||||||
a = np.a
|
a = np.a
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ lin pot3plus n m = {
|
|||||||
|
|
||||||
oper
|
oper
|
||||||
commaIf : DTail -> Str = \t -> case t of {
|
commaIf : DTail -> Str = \t -> case t of {
|
||||||
T3 => "," ;
|
T3 => comma ;
|
||||||
_ => []
|
_ => []
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ lin
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
ApposNP np1 np2 = {
|
ApposNP np1 np2 = {
|
||||||
s = \\role => np1.s ! role ++ "," ++ np2.s ! RSubj ;
|
s = \\role => np1.s ! role ++ comma ++ np2.s ! RSubj ;
|
||||||
a = np1.a
|
a = np1.a
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -25,5 +25,5 @@ concrete PhraseBul of Phrase = CatBul ** open Prelude, ResBul in {
|
|||||||
PConjConj conj = {s = conj.s ++ linCoord!conj.conj} ;
|
PConjConj conj = {s = conj.s ++ linCoord!conj.conj} ;
|
||||||
|
|
||||||
NoVoc = {s = []} ;
|
NoVoc = {s = []} ;
|
||||||
VocNP np = {s = "," ++ np.s ! RVoc} ;
|
VocNP np = {s = comma ++ np.s ! RVoc} ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -693,4 +693,6 @@ resource ResBul = ParamX ** open Prelude, Predef in {
|
|||||||
|
|
||||||
linCoordSep : Str -> Bool => Ints 2 => Str ;
|
linCoordSep : Str -> Bool => Ints 2 => Str ;
|
||||||
linCoordSep s = table {True => linCoord; False=> \\_ => s} ;
|
linCoordSep s = table {True => linCoord; False=> \\_ => s} ;
|
||||||
|
|
||||||
|
comma : Str = SOFT_BIND ++ "," ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
|
|||||||
c2 = slash.c2
|
c2 = slash.c2
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
EmbedS s = {s = "," ++ "֌" ++ s.s} ;
|
EmbedS s = {s = comma ++ "֌" ++ s.s} ;
|
||||||
EmbedQS qs = {s = qs.s ! QIndir} ;
|
EmbedQS qs = {s = qs.s ! QIndir} ;
|
||||||
EmbedVP vp = {s = daComplex Simul Pos vp ! Perf ! {gn=GSg Masc; p=P1}} ;
|
EmbedVP vp = {s = daComplex Simul Pos vp ! Perf ! {gn=GSg Masc; p=P1}} ;
|
||||||
|
|
||||||
@@ -66,10 +66,10 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
|
|||||||
c2 = cl.c2
|
c2 = cl.c2
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
ExtAdvS a s = {s = a.s ++ "," ++ s.s} ;
|
ExtAdvS a s = {s = a.s ++ comma ++ s.s} ;
|
||||||
AdvS a s = {s = a.s ++ s.s} ;
|
AdvS a s = {s = a.s ++ s.s} ;
|
||||||
|
|
||||||
SSubjS a s b = {s = a.s ++ "," ++ s.s ++ b.s} ;
|
SSubjS a s b = {s = a.s ++ comma ++ s.s ++ b.s} ;
|
||||||
|
|
||||||
RelS s r = {s = s.s ++ "," ++ r.s ! {gn=gennum ANeut Sg; p=P3}} ;
|
RelS s r = {s = s.s ++ comma ++ r.s ! {gn=gennum ANeut Sg; p=P3}} ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,6 @@ lin
|
|||||||
MkSymb s = s ;
|
MkSymb s = s ;
|
||||||
|
|
||||||
BaseSymb = infixSS "è" ;
|
BaseSymb = infixSS "è" ;
|
||||||
ConsSymb = infixSS "," ;
|
ConsSymb = infixSS comma ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
|
|||||||
})
|
})
|
||||||
(predV vv) ;
|
(predV vv) ;
|
||||||
|
|
||||||
ComplVS v s = insertObj (\\_ => "," ++ "֌" ++ s.s) (predV v) ;
|
ComplVS v s = insertObj (\\_ => comma ++ "֌" ++ s.s) (predV v) ;
|
||||||
ComplVQ v q = insertObj (\\_ => q.s ! QDir) (predV v) ;
|
ComplVQ v q = insertObj (\\_ => q.s ! QDir) (predV v) ;
|
||||||
|
|
||||||
ComplVA v ap =
|
ComplVA v ap =
|
||||||
@@ -33,7 +33,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
|
|||||||
insertSlashObj2 (\\a => ap.s ! aform a.gn Indef (RObj Acc)) (slashV v v.c2) ;
|
insertSlashObj2 (\\a => ap.s ! aform a.gn Indef (RObj Acc)) (slashV v v.c2) ;
|
||||||
|
|
||||||
-- test: I saw a boy to whom she said that they are here
|
-- test: I saw a boy to whom she said that they are here
|
||||||
SlashV2S v s = insertSlashObj2 (\\_ => "," ++ "֌" ++ s.s) (slashV v v.c2) ;
|
SlashV2S v s = insertSlashObj2 (\\_ => comma ++ "֌" ++ s.s) (slashV v v.c2) ;
|
||||||
|
|
||||||
-- test: I saw a boy whom she asked who is here
|
-- test: I saw a boy whom she asked who is here
|
||||||
SlashV2Q v q = insertSlashObj2 (\\_ => q.s ! QDir) (slashV v v.c2) ;
|
SlashV2Q v q = insertSlashObj2 (\\_ => q.s ! QDir) (slashV v v.c2) ;
|
||||||
|
|||||||
@@ -76,5 +76,6 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in {
|
|||||||
en2,ea2,eext : Bool = False -- indicate if the field exists
|
en2,ea2,eext : Bool = False -- indicate if the field exists
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
comma : Str = SOFT_BIND ++ "," ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ lin
|
|||||||
insertObj (\\a => vps.c2.s ++ vps.n3 ! a) (passiveVP vps) ;
|
insertObj (\\a => vps.c2.s ++ vps.n3 ! a) (passiveVP vps) ;
|
||||||
|
|
||||||
|
|
||||||
RelVS s rvs = {s = \\o => s.s ! o ++ "," ++ rvs.s ! agrP3 Neutr Sg ! RPrep True} ;
|
RelVS s rvs = {s = \\o => s.s ! o ++ comma ++ rvs.s ! agrP3 Neutr Sg ! RPrep True} ;
|
||||||
RelSlashVS t p vs np = let vpform = VPFinite t.t t.a ;
|
RelSlashVS t p vs np = let vpform = VPFinite t.t t.a ;
|
||||||
cl = PredVP np (predV vs) ;
|
cl = PredVP np (predV vs) ;
|
||||||
vilket = IdRP.s ! Neutr ! Sg ! (RPrep True) in
|
vilket = IdRP.s ! Neutr ! Sg ! (RPrep True) in
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ lin
|
|||||||
PresPartRS ant pol vp = mkRS ant pol (mkRCl which_RP vp) ; --- probably not as participle construction
|
PresPartRS ant pol vp = mkRS ant pol (mkRCl which_RP vp) ; --- probably not as participle construction
|
||||||
|
|
||||||
ApposNP np1 np2 = {
|
ApposNP np1 np2 = {
|
||||||
s = \\c => np1.s ! c ++ "," ++ np2.s ! NPNom ;
|
s = \\c => np1.s ! c ++ comma ++ np2.s ! NPNom ;
|
||||||
a = np1.a
|
a = np1.a
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user