GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 08:58:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Pes) Remove unused CPolarity

Browse Source
This commit is contained in:
Inari Listenmaa
2019-02-22 16:18:14 +01:00
parent 50200f3e0c
commit bd19c7a8a9
4 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/persian/CatPes.gf
View File

@@ -18,7 +18,7 @@ concrete CatPes of Cat = CommonX - [Adv] ** open ResPes, Prelude in {
vp : ResPes.VPHTense => Polarity => Order => Str ;
c2 : ResPes.Compl
} ;
Imp = {s : CPolarity => ImpForm => Str} ;
Imp = {s : Polarity => ImpForm => Str} ;
---- Question
QCl = {s : ResPes.VPHTense => Polarity => QForm => Str} ;

6
src/persian/PhrasePes.gf
View File

@@ -4,9 +4,9 @@ concrete PhrasePes of Phrase = CatPes ** open Prelude, ResPes in {
PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
UttQS qs = {s = qs.s ! QDir} ;
UttImpSg pol imp = {s = pol.s ++ imp.s ! contrNeg True pol.p ! ImpF Sg False} ;
UttImpPl pol imp = {s = pol.s ++ imp.s ! contrNeg True pol.p ! ImpF Pl False} ;
UttImpPol pol imp = {s = pol.s ++ imp.s ! contrNeg True pol.p ! ImpF Sg True} ;
UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg False} ;
UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Pl False} ;
UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg True} ;
UttS,
UttIP, --- Acc also

16
src/persian/ResPes.gf
View File

@@ -16,16 +16,12 @@ resource ResPes = MorphoPes ** open Prelude,Predef in {
CardOrd = NCard | NOrd ;
RAgr = RNoAg | RAg Agr ;
-- RCase = RC Number Case ;
CPolarity = CPos
| CNeg Bool; -- contracted or not
oper
CN : Type = Noun ** {
hasAdj : Bool ; -- to get the right form when CN is a predicate
compl : Number => Str -- to make possessive suffix attach to the right word
-- dep. on Agr because of RelCN
-- dep. on Number because of RelCN
} ;
NP : Type = {
@@ -56,16 +52,6 @@ resource ResPes = MorphoPes ** open Prelude,Predef in {
cn2str : CN -> Str = \cn ->
cn.s ! Sg ! Bare ++ cn.compl ! Sg ;
contrNeg : Bool -> Polarity -> CPolarity = \b,p -> case p of {
Pos => CPos ;
Neg => CNeg b
} ;
cpol2pol : CPolarity -> Polarity = \cp -> case cp of {
CPos => Pos ;
_ => Neg
} ;
-----------------------
--- Verb Phrase
-----------------------

5
src/persian/SentencePes.gf
View File

@@ -7,12 +7,11 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in {
PredVP np vp = mkClause np vp ;
PredSCVP sc vp = mkSClause ("این" ++ sc.s) (defaultAgr) vp ;
PredSCVP sc vp = mkSClause ("این" ++ sc.s) defaultAgr vp ;
ImpVP vp = {
s = \\cpol,n =>
s = \\pol,n =>
let agr = Ag (numImp n) P2 ;
pol = cpol2pol cpol ;
in case vp.wish of {
True => vp.s ! VPImp pol (numImp n) ++ vp.ad ++ vp.comp ! agr ++ vp.obj.s ++ vp.vComp ! agr ++ vp.embComp;
False => vp.ad ++ vp.comp ! agr ++ vp.obj.s ++ vp.vComp ! agr ++ vp.s ! VPImp pol (numImp n) ++ vp.embComp }