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

=Implemented ComparA in Adjective. Needs through testing

Browse Source
This commit is contained in:
David Bamutura
2019-05-17 01:16:44 +02:00
parent fdc4dced45
commit 5f5d71bb0a
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rukiga/AdjectiveCgg.gf
View File

@@ -5,12 +5,14 @@ concrete AdjectiveCgg of Adjective = CatCgg **
lin lin
PositA a = a; PositA a = {s=\\_=> a.s; position1= a.position1; isProper = a.isProper; isPrep = a.isPrep};
-- The superlative use is covered in $Ord$. -- The superlative use is covered in $Ord$.
--AdjOrd : Ord -> AP ; -- warmest --AdjOrd : Ord -> AP ; -- warmest
AdjOrd ord = {s= ord.s; position1= ord.position1}; AdjOrd ord = {s= \\agr => ord.s!agr ; position1= ord.position1; isProper = False; isPrep = False};
-- UseComparA : A -> AP ; -- warmer
UseComparA a ={s =\\_ => a.s ++ BIND ++ "ho" ++ "kukira"; position1= a.position1; isProper = a.isProper; isPrep = a.isPrep};
{- {-
abstract Adjective = Cat ** { abstract Adjective = Cat ** {

12
src/rukiga/NounCgg.gf
View File

@@ -32,28 +32,28 @@ lin
AdjCN ap cn = AdjCN ap cn =
case <ap.position1, ap.isProper, > of { case <ap.position1, ap.isProper, > of {
<Pre, True> => { <Pre, True> => {
s = \\ num, ns =>ap.s ++ cn.s ! num ! ns ; s = \\ num, ns =>ap.s ! AgP3 Sg KI_BI ++ cn.s ! num ! ns ;
gender = cn.gender gender = cn.gender
}; };
<Post, False> => case ap.isPrep of { <Post, False> => case ap.isPrep of {
False => { False => {
s = \\ num, ns => cn.s ! num ! ns ++ mkAdjPronIVClitic (AgP3 num cn.gender) s = \\ num, ns => cn.s ! num ! ns ++ mkAdjPronIVClitic (AgP3 num cn.gender)
++ ap.s; ++ ap.s ! AgP3 Sg KI_BI;
gender = cn.gender gender = cn.gender
}; };
True => { True => {
s = \\ num, ns => (cn.s ! num ! ns) ++ s = \\ num, ns => (cn.s ! num ! ns) ++
mkGenPrepNoIVClitic (AgP3 num cn.gender) ++ ap.s ; mkGenPrepNoIVClitic (AgP3 num cn.gender) ++ ap.s ! AgP3 Sg KI_BI;
gender = cn.gender gender = cn.gender
} }
}; };
<Pre, False> => { <Pre, False> => {
s = \\ num, ns => mkAdjPronIVClitic (AgP3 num cn.gender) s = \\ num, ns => mkAdjPronIVClitic (AgP3 num cn.gender)
++ ap.s ++ (cn.s ! num ! ns) ; ++ ap.s ! AgP3 Sg KI_BI ++ (cn.s ! num ! ns) ;
gender = cn.gender gender = cn.gender
}; };
<Post, True> => { <Post, True> => {
s = \\ num, ns => (cn.s ! num ! ns) ++ ap.s ; s = \\ num, ns => (cn.s ! num ! ns) ++ ap.s ! AgP3 Sg KI_BI;
gender = cn.gender gender = cn.gender
} }
@@ -141,7 +141,7 @@ lin
--AdjDAP : DAP -> AP -> DAP ; -- the large (one) --AdjDAP : DAP -> AP -> DAP ; -- the large (one)
AdjDAP dap ap = AdjDAP dap ap =
{ s = dap.s ++ ap.s ; { s = dap.s ++ ap.s! AgP3 Sg KI_BI ; -- does no harm since they are all same strings
s2 = dap.s2; s2 = dap.s2;
ntype = dap.ntype ; ntype = dap.ntype ;
num = dap.num ; num = dap.num ;