GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-12 20:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed the word order of Scand discontious conjunctions: antinger jag vinner eller... -> antingen vinner jag eller...

Browse Source
This commit is contained in:
aarne
2015-05-22 11:31:57 +00:00
parent fc7c285e52
commit b57e5dcc12
8 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/scandinavian/CatScand.gf
View File

@@ -85,7 +85,7 @@ incomplete concrete CatScand of Cat =
-- Structural
Conj = {s1,s2 : Str ; n : Number} ;
Conj = {s1,s2 : Str ; n : Number ; isDiscont : Bool} ; -- isDiscont: there is an adverb: antingen vinner jag eller du vinner
Subj = {s : Str} ;
Prep = {s : Str} ;

7
lib/src/scandinavian/ConjunctionScand.gf
View File

@@ -5,7 +5,10 @@ incomplete concrete ConjunctionScand of Conjunction =
lin
ConjS conj ss = conjunctDistrTable Order conj ss ;
ConjS conj ss = {
s = \\p => let o : Order = case conj.isDiscont of {True => Inv ; _ => p}
in conj.s1 ++ ss.s1 ! o ++ conj.s2 ++ ss.s2 ! p ;
} ;
ConjAdv conj ss = conjunctDistrSS conj ss ;
@@ -40,7 +43,7 @@ incomplete concrete ConjunctionScand of Conjunction =
s2 = table {Inv => y.s ! Main ; o => y.s ! o}
} ;
ConsS x xs = { -- consrTable Order comma ;
s1 = \\o => x.s ! Inv ++ comma ++ xs.s1 ! case o of {Inv => Main ; _ => o} ;
s1 = \\o => x.s ! o ++ comma ++ xs.s1 ! case o of {Inv => Main ; _ => o} ;
s2 = xs.s2
} ;
BaseAdv = twoSS ;