msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Added ExtAdvS separate from AdvS in Sentence

Browse Source
This commit is contained in:
aarne
2011-08-03 15:19:39 +00:00
parent 930d9ab752
commit 2d91016760
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/src/abstract/Sentence.gf
View File

@@ -62,9 +62,11 @@ abstract Sentence = Cat ** {
UseRCl : Temp -> Pol -> RCl -> RS ;
UseSlash : Temp -> Pol -> ClSlash -> SSlash ;
-- An adverb can be added to the beginning of a sentence.
-- An adverb can be added to the beginning of a sentence, either with comma ("externally")
-- or without:
AdvS : Adv -> S -> S ; -- today, I will go home
AdvS : Adv -> S -> S ; -- then I will go home
ExtAdvS : Adv -> S -> S ; -- next week, I will go home
-- This covers subjunctive clauses, but they can also be added to the end.

3
lib/src/english/SentenceEng.gf
View File

@@ -56,7 +56,8 @@ concrete SentenceEng of Sentence = CatEng ** open Prelude, ResEng in {
c2 = cl.c2
} ;
AdvS a s = {s = a.s ++ "," ++ s.s} ;
AdvS a s = {s = a.s ++ s.s} ;
ExtAdvS a s = {s = a.s ++ "," ++ s.s} ;
SSubjS a s b = {s = a.s ++ s.s ++ b.s} ;

1
lib/src/finnish/SentenceFin.gf
View File

@@ -60,6 +60,7 @@ concrete SentenceFin of Sentence = CatFin ** open Prelude, ResFin in {
} ;
AdvS a s = {s = a.s ++ s.s} ;
ExtAdvS a s = {s = a.s ++ "," ++ s.s} ;
RelS s r = {s = s.s ++ "," ++ r.s ! agrP3 Sg} ; ---- mikä

2
lib/src/german/SentenceGer.gf
View File

@@ -61,6 +61,8 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer, Prelude in {
} ;
AdvS a s = {s = table {Sub => a.s ++ s.s ! Sub ; o => a.s ++ s.s ! Inv}} ;
ExtAdvS a s =
{s = table {Sub => a.s ++ "," ++ s.s ! Sub ; o => a.s ++ "," ++ s.s ! Inv}} ;
SSubjS a s b = {s = \\o => a.s ! o ++ "," ++ s.s ++ b.s ! Sub} ;

3
lib/src/romance/SentenceRomance.gf
View File

@@ -67,7 +67,8 @@ incomplete concrete SentenceRomance of Sentence =
c2 = cl.c2
} ;
AdvS a s = {s = \\o => a.s ++ "," ++ s.s ! o} ;
AdvS a s = {s = \\o => a.s ++ s.s ! o} ;
ExtAdvS a s = {s = \\o => a.s ++ "," ++ s.s ! o} ;
SSubjS a s b = {s = \\m => a.s ! m ++ s.s ++ b.s ! s.m} ;

1
lib/src/scandinavian/SentenceScand.gf
View File

@@ -58,6 +58,7 @@ incomplete concrete SentenceScand of Sentence =
} ;
AdvS a s = {s = \\o => a.s ++ s.s ! Inv} ;
ExtAdvS a s = {s = \\o => a.s ++ "," ++ s.s ! Inv} ;
RelS s r = {s = \\o => s.s ! o ++ "," ++ r.s ! agrP3 Neutr Sg} ; --- vilket