forked from GitHub/gf-rgl
Introduced transgressive as an adverb...
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
concrete ConstructionRus of Construction = CatRus **
|
concrete ConstructionRus of Construction = CatRus **
|
||||||
open Predef, SyntaxRus, SymbolicRus, (P=ParadigmsRus), ResRus, Prelude,
|
open Predef, SyntaxRus, SymbolicRus, (P=ParadigmsRus), ResRus, Prelude,
|
||||||
QuestionRus, SentenceRus, AdverbRus, AdjectiveRus, VerbRus,
|
QuestionRus, SentenceRus, AdverbRus, AdjectiveRus, VerbRus,
|
||||||
(L=LexiconRus),
|
(L=LexiconRus), (T=TenseRus),
|
||||||
(N=NounRus), IdiomRus, (EX=ExtraRus) in {
|
(N=NounRus), IdiomRus, (EX=ExtraRus) in {
|
||||||
|
|
||||||
lin
|
lin
|
||||||
|
|||||||
@@ -177,12 +177,15 @@ oper
|
|||||||
------------------------
|
------------------------
|
||||||
--2 Adverbs, prepositions, conjunctions, ...
|
--2 Adverbs, prepositions, conjunctions, ...
|
||||||
|
|
||||||
mkAdv : Str -> Adv ;
|
mkAdv : overload {
|
||||||
|
mkAdv : Str -> Adv ;
|
||||||
|
mkAdv : Temp -> Pol -> VPSlash -> Adv ; -- introduce transgressive: "делая что-то ,"
|
||||||
|
} ;
|
||||||
mkIAdv : Str -> IAdv ;
|
mkIAdv : Str -> IAdv ;
|
||||||
mkConj : overload {
|
mkConj : overload {
|
||||||
mkConj : Str -> Number -> Conj ; -- only middle conjunction
|
mkConj : Str -> Number -> Conj ; -- only middle conjunction
|
||||||
mkConj : Str -> Str -> Number -> Conj ; -- two-part conjunction
|
mkConj : Str -> Str -> Number -> Conj ; -- two-part conjunction
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
mkInterj : Str -> Interj ;
|
mkInterj : Str -> Interj ;
|
||||||
mkPrep : Str -> Case -> Prep ;
|
mkPrep : Str -> Case -> Prep ;
|
||||||
@@ -363,8 +366,21 @@ oper
|
|||||||
------------------------
|
------------------------
|
||||||
-- Adverbs, prepositions, conjunctions, ...
|
-- Adverbs, prepositions, conjunctions, ...
|
||||||
|
|
||||||
mkAdv : Str -> Adv
|
mkAdv = overload {
|
||||||
= \s -> lin Adv (makeAdverb s) ;
|
mkAdv : Str -> Adv
|
||||||
|
= \s -> lin Adv (makeAdverb s) ;
|
||||||
|
mkAdv : Temp -> Pol -> VPSlash -> Adv
|
||||||
|
= \temp,pol,vps -> lin Adv {
|
||||||
|
s=vps.adv ! Ag (GSg Neut) P3
|
||||||
|
++ pol.s
|
||||||
|
++ case temp.t of {Pres => vps.verb.prtr ; _ => vps.verb.ptr }
|
||||||
|
++ verbRefl vps.verb
|
||||||
|
++ case temp.t of {Cond => "бы" ; _ => []}
|
||||||
|
++ vps.dep
|
||||||
|
++ vps.compl ! Ag (GSg Neut) P3
|
||||||
|
++ vps.c.s ; -- comma is needed. Up to user?
|
||||||
|
} ;
|
||||||
|
} ;
|
||||||
|
|
||||||
mkIAdv : Str -> IAdv
|
mkIAdv : Str -> IAdv
|
||||||
= \s -> lin IAdv (makeAdverb s) ;
|
= \s -> lin IAdv (makeAdverb s) ;
|
||||||
|
|||||||
Reference in New Issue
Block a user