make use of CommonX.CAdv

This commit is contained in:
Krasimir Angelov
2018-07-10 13:59:01 +02:00
parent 5d734f9a6c
commit 43950360a6
5 changed files with 11 additions and 12 deletions

View File

@@ -29,8 +29,8 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in {
-- $SuperlA$ belongs to determiner syntax in $Noun$. -- $SuperlA$ belongs to determiner syntax in $Noun$.
CAdvAP ad ap np = { CAdvAP ad ap np = {
s = \\a,p => ad.s ++ ap.s ! a ! p ++ ad.sn ++ np.s ! RObj CPrep ; s = \\a,p => ad.s ++ ap.s ! a ! p ++ ad.p ++ np.s ! RObj CPrep ;
adv = ad.s ++ ap.adv ++ ad.sn ++ np.s ! RObj CPrep ; adv = ad.s ++ ap.adv ++ ad.p ++ np.s ! RObj CPrep ;
isPre = False isPre = False
} ; } ;

View File

@@ -5,10 +5,10 @@ concrete AdverbBul of Adverb = CatBul ** open ResBul, Prelude in {
lin lin
PositAdvAdj a = {s = a.adv} ; PositAdvAdj a = {s = a.adv} ;
ComparAdvAdj cadv a np = { ComparAdvAdj cadv a np = {
s = cadv.s ++ "ïî" ++ "-" ++ a.s ! ASg Neut Indef ++ "îò" ++ np.s ! RObj CPrep s = cadv.s ++ a.s ! ASg Neut Indef ++ cadv.p ++ np.s ! RObj CPrep
} ; } ;
ComparAdvAdjS cadv a s = { ComparAdvAdjS cadv a s = {
s = cadv.s ++ "ïî" ++ "-" ++ a.s ! ASg Neut Indef ++ "îò" ++ "êîëêîòî" ++ s.s s = cadv.s ++ a.s ! ASg Neut Indef ++ cadv.p ++ "êîëêîòî" ++ s.s
} ; } ;
PrepNP prep np = {s = prep.s ++ np.s ! RObj prep.c} ; PrepNP prep np = {s = prep.s ++ np.s ! RObj prep.c} ;
@@ -19,5 +19,6 @@ concrete AdverbBul of Adverb = CatBul ** open ResBul, Prelude in {
SubjS = cc2 ; SubjS = cc2 ;
AdnCAdv cadv = {s = cadv.sn ++ "îò"} ; AdnCAdv cadv = {s = cadv.s ++ cadv.p} ;
} }

View File

@@ -1,5 +1,5 @@
--# -coding=utf8 --# -coding=utf8
concrete CatBul of Cat = CommonX - [IAdv,CAdv,AdV,SC] ** open ResBul, Prelude, Predef, (R = ParamX) in { concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef, (R = ParamX) in {
lincat lincat
-- Tensed/Untensed -- Tensed/Untensed
@@ -44,7 +44,6 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,AdV,SC] ** open ResBul, Prelude, P
-- Adverb -- Adverb
CAdv = {s : Str; sn : Str} ;
IAdv = {s : QForm => Str} ; IAdv = {s : QForm => Str} ;
AdV = {s : Str; p : Polarity} ; AdV = {s : Str; p : Polarity} ;
SC = {s : Agr => Str} ; SC = {s : Agr => Str} ;

View File

@@ -22,7 +22,6 @@ oper
-- Adverbs modifying adjectives and sentences can also be formed. -- Adverbs modifying adjectives and sentences can also be formed.
mkAdA : Str -> AdA = \x -> lin AdA (ss x) ; mkAdA : Str -> AdA = \x -> lin AdA (ss x) ;
mkCAdv : Str -> Str -> CAdv = \s,sn -> lin CAdv {s = s; sn = sn} ;
--2 Adjectives --2 Adjectives
-- --

View File

@@ -1,6 +1,6 @@
--# -coding=cp1251 --# -coding=cp1251
concrete StructuralBul of Structural = CatBul ** concrete StructuralBul of Structural = CatBul **
open MorphoBul, ParadigmsBul, Prelude in { open MorphoBul, ParadigmsBul, Prelude, (X = ConstructX) in {
flags coding=cp1251 ; flags coding=cp1251 ;
@@ -48,9 +48,9 @@ concrete StructuralBul of Structural = CatBul **
"âúâ" / strs {"â" ; "ô" ; "Â" ; "Ô"} "âúâ" / strs {"â" ; "ô" ; "Â" ; "Ô"}
}) ; }) ;
it_Pron = mkPron "òî" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Neut) PronP3 ; it_Pron = mkPron "òî" "íåãîâ" "íåãîâèÿ" "íåãîâèÿò" "íåãîâà" "íåãîâàòà" "íåãîâî" "íåãîâîòî" "íåãîâè" "íåãîâèòå" (GSg Neut) PronP3 ;
less_CAdv = {s="íå"; sn="ïî-ìàëêî"} ; less_CAdv = X.mkCAdv "ïî-ìàëêî" "îò" ;
many_Det = mkDeterminerPl "ìíîãî" ; many_Det = mkDeterminerPl "ìíîãî" ;
more_CAdv = {s=[]; sn="ïîâå÷å"} ; more_CAdv = X.mkCAdv "ïîâå÷å" "îò" ;
most_Predet = {s = \\_ => "ïîâå÷åòî"} ; most_Predet = {s = \\_ => "ïîâå÷åòî"} ;
much_Det = mkDeterminerSg "ìíîãî" "ìíîãî" "ìíîãî"; much_Det = mkDeterminerSg "ìíîãî" "ìíîãî" "ìíîãî";
must_VV = must_VV =
@@ -122,7 +122,7 @@ concrete StructuralBul of Structural = CatBul **
youPl_Pron = mkPron "âèå" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl PronP2 ; youPl_Pron = mkPron "âèå" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl PronP2 ;
youPol_Pron = mkPron "âèå" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl PronP2 ; youPol_Pron = mkPron "âèå" "âàø" "âàøèÿ" "âàøèÿò" "âàøà" "âàøàòà" "âàøå" "âàøåòî" "âàøè" "âàøèòå" GPl PronP2 ;
as_CAdv = mkCAdv "" "êîëêîòî" ; as_CAdv = X.mkCAdv [] "êîëêîòî" ;
have_V2 = dirV2 (stateV (mkV186 "èìàì")) ; have_V2 = dirV2 (stateV (mkV186 "èìàì")) ;