mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 19:42:50 -06:00
Slash in Fin
This commit is contained in:
@@ -80,7 +80,7 @@ lincat
|
|||||||
Cl = Clause ;
|
Cl = Clause ;
|
||||||
-- = {s : SType => Bool => SForm => Str} ;
|
-- = {s : SType => Bool => SForm => Str} ;
|
||||||
|
|
||||||
Slash = Sentence ** {s2 : Str ; c : Case} ;
|
Slash = QuestClause ** {s2 : Str ; c : ComplCase} ;
|
||||||
|
|
||||||
RP = {s : Number => Case => Str} ;
|
RP = {s : Number => Case => Str} ;
|
||||||
RCl = {s : Bool => SForm => Number => Str} ;
|
RCl = {s : Bool => SForm => Number => Str} ;
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ lin
|
|||||||
--3 Sentences and relative clauses
|
--3 Sentences and relative clauses
|
||||||
--
|
--
|
||||||
|
|
||||||
---- SlashV2 = slashTransVerbCl ;
|
SlashV2 = slashTransVerbCl ;
|
||||||
---- SlashVV2 = slashVerbVerb ;
|
---- SlashVV2 = slashVerbVerb ;
|
||||||
---- SlashAdv cl p = slashAdverb cl p.s ;
|
---- SlashAdv cl p = slashAdverb cl p.s ;
|
||||||
|
|
||||||
|
|||||||
@@ -1150,18 +1150,20 @@ oper
|
|||||||
-- neutralizes: even prepositions are attached after relative and interrogative
|
-- neutralizes: even prepositions are attached after relative and interrogative
|
||||||
-- pronouns: "jota ennen" cf. "ennen talvea". Otherwise, the category and
|
-- pronouns: "jota ennen" cf. "ennen talvea". Otherwise, the category and
|
||||||
-- the rules are very similar to transitive verbs. Notice that the case gets
|
-- the rules are very similar to transitive verbs. Notice that the case gets
|
||||||
-- fixed by the Boolean parameter and the subject.
|
-- fixed by the Boolean parameter and the subject, when the slash is
|
||||||
|
-- used: "talo jonka ostin - talo jota en ostanut" ;
|
||||||
|
-- "talo joka minulla on - talo jota minulla ei ole".
|
||||||
|
|
||||||
SentenceSlashNounPhrase = Sentence ** {s2 : Str ; c : Case} ;
|
|
||||||
{-
|
SentenceSlashNounPhrase = QuestClause ** {s2 : Str ; c : ComplCase} ;
|
||||||
slashTransVerb : Bool -> NounPhrase -> TransVerb -> SentenceSlashNounPhrase =
|
|
||||||
\b,jussi,ostaa ->
|
slashTransVerbCl : NounPhrase -> TransVerb -> SentenceSlashNounPhrase =
|
||||||
predVerbPhrase jussi (predVerbGroup b (predVerb ostaa)) ** {
|
\jussi,ostaa -> {
|
||||||
s2 = ostaa.s3 ++ ostaa.s4 ;
|
s = \\p => (sats2clause (mkSats jussi ostaa)).s ! <SDecl,p.p1,p.p2> ;
|
||||||
c = npForm2Case jussi.n
|
s2 = ostaa.s3 ;
|
||||||
(complementCase b ostaa.c (Pres jussi.n (np2Person jussi.p)))
|
c = ostaa.c
|
||||||
} ;
|
} ;
|
||||||
-}
|
|
||||||
|
|
||||||
|
|
||||||
--2 Relative pronouns and relative clauses
|
--2 Relative pronouns and relative clauses
|
||||||
@@ -1305,8 +1307,8 @@ oper
|
|||||||
-- intVerbPhrase : IntPron -> VerbPhrase -> Question = \kuka,ui ->
|
-- intVerbPhrase : IntPron -> VerbPhrase -> Question = \kuka,ui ->
|
||||||
-- predVerbPhrase (kuka ** {p = NP3}) ui ;
|
-- predVerbPhrase (kuka ** {p = NP3}) ui ;
|
||||||
|
|
||||||
intSlash : IntPron -> SentenceSlashNounPhrase -> Question = \kuka,tapaat ->
|
-- intSlash : IntPron -> SentenceSlashNounPhrase -> QuestClause = \kuka,tapaat ->
|
||||||
ss (kuka.s ! NPCase tapaat.c ++ tapaat.s2 ++ tapaat.s) ;
|
-- ss (kuka.s ! NPCase tapaat.c ++ tapaat.s2 ++ tapaat.s) ;
|
||||||
|
|
||||||
|
|
||||||
--3 Interrogative adverbials
|
--3 Interrogative adverbials
|
||||||
|
|||||||
Reference in New Issue
Block a user