Merge pull request #360 from bamutra/master

Request for Merge

Author: inariksit

languages.csv

@@ -4,6 +4,7 @@ Amh,Amharic,amharic,,,,,n,n,,n
 Ara,Arabic,arabic,,,,,,y,,y
 Bul,Bulgarian,bulgarian,,,y,,,,,y
 Cat,Catalan,catalan,Romance,,y,,,,y,y
+Cgg,Rukiga,rukiga,,,y,y,n,n,y,y
 Chi,Chinese (simplified),chinese,,,,,,,,y
 Cze,Czech,czech,,,,,,n,,y
 Dan,Danish,danish,Scand,,y,,,,,y

src/prelude/Coordination.gf

@@ -3,25 +3,43 @@ resource Coordination = open Prelude in {
 param
   ListSize = TwoElem | ManyElem ;
 
-oper 
+oper
+  -- Type of [X] for any X whose lincat is {s : Str}.
+  -- example : ListX = {s1 = "a , b" ; s2 = "c"}
   ListX = {s1,s2 : Str} ;
 
-  twoStr : (x,y : Str) -> ListX = \x,y -> 
+  -- Helper funs for twoSS and conjSS
+  twoStr : (x,y : Str) -> ListX = \x,y ->
     {s1 = x ; s2 = y} ; 
-  consStr : Str -> ListX -> Str -> ListX = \comma,xs,x -> 
+  consStr : Str -> ListX -> Str -> ListX = \comma,xs,x ->
     {s1 = xs.s1 ++ comma ++ xs.s2 ; s2 = x } ; 
 
-  twoSS : (_,_ : SS) -> ListX = \x,y -> 
+  -- Create a ListX from two Xs. Example:
+  --     x = {s = "here"} ;
+  --     y = {s = "there"} ;
+  -- twoSS x y ==> {s1 = "here" ; s2 = "there"}
+  twoSS : (_,_ : SS) -> ListX = \x,y ->
     twoStr x.s y.s ;
-  consSS : Str -> ListX -> SS -> ListX = \comma,xs,x -> 
+
+  -- Add new X to a ListX, along with a separator. Example:
+  --     comma = ","
+  --     xs = {s1 = "here" ; s2 = "there"}
+  --     x = {s = "everywhere"}
+  -- consSS comma xs x ==> {s1 = "here , there" ; s2 = "everywhere"}
+  consSS : Str -> ListX -> SS -> ListX = \comma,xs,x ->
     consStr comma xs x.s ;
 
   Conjunction : Type = SS ;
   ConjunctionDistr : Type = {s1 : Str ; s2 : Str} ;
 
+  -- Form an X from Conjunction and ListX. Example:
+  --   or = {s = "and"}
+  --   xs = {s1 = "here , there" ; s2 = "everywhere"}
+  -- conjunctX or xs = {s = "here, there and everywhere"}
   conjunctX : Conjunction -> ListX -> Str = \or,xs ->
     xs.s1 ++ or.s ++ xs.s2 ;
-
+    
+  -- Like conjunctX, but conjunction has two parts: "both here and there"
   conjunctDistrX : ConjunctionDistr -> ListX -> Str = \or,xs ->
     or.s1 ++ xs.s1 ++ or.s2 ++ xs.s2 ;
 
@@ -33,7 +51,10 @@ oper
 
   -- all this lifted to tables
 
-  ListTable : PType -> Type = \P -> {s1,s2 : P => Str} ; 
+  -- Type for a table with the given parameter P on the LHS.
+  -- For example, if the lincat for X is {s : Number => Str},
+  -- then the lincat for [X] should be ListTable Number, which expands to {s1, s2 : Number => Str}.
+  ListTable : PType -> Type = \P -> {s1,s2 : P => Str} ;
 
   twoTable : (P : PType) -> (_,_ : {s : P => Str}) -> ListTable P = \_,x,y ->
     {s1 = x.s ; s2 = y.s} ; 

src/rukiga/CatCgg.gf

@@ -6,7 +6,7 @@ concrete CatCgg of Cat = CommonX -[Adv,IAdv, AdA]**
 lincat
 
 
-  Imp = {s : Res. ImpPol=> Str} ;
+  Imp = {s : Res.ImpPol=> Str} ;
   QS = {s : Str} ;
 
   -- Note: SS is a shorthand for {s:Str}, defined in Prelude.gf
@@ -34,7 +34,7 @@ lincat
   V,VS, VQ, VA = Res.Verb ;   --change to {verb : Str ; comp = []}               -- one-place verb                      e.g. "sleep"  
   V2,V2Q, V2S = Res.Verb2;
   V2A,V3 = Res.Verb3;    -- three-place verb                    e.g. "show"
-  
+  V2V = Res.Verb ** {comp,c3 : Str ; typ : Res.VVType} ;
   VP = Res.VerbPhrase ;           -- verb phrase                         e.g. "is very warm"
 
   N = Res.Noun ;                  -- common noun                         e.g. "house"
@@ -92,9 +92,9 @@ lincat
   Digits  = {s : Res.CardOrd => Res.Agreement=>Str ; n : Res.Number ; tail : Px.DTail} ;
   Ord  = {s :Res.Agreement=>Str; position:Res.Position} ;
   Card = {s :Res.Agreement=>Str; n : Res.Number} ;
-  
+  A2 =  Res.Adjective ** { c2 : Str ; isPre : Bool} ;
   DAP = Res.Determiner ;
-  N2  = Res.Noun ** {c2 : Res.Agreement =>Str};    -- relational noun                     e.g. "son"   
+  N2  = Res.Noun ** {c2 : Res.Agreement =>Str};    -- relational noun                     e.g. "son"
   Prep = Res.Preposition;  -- preposition, or just case           e.g. "in"
   N3   = N2 ** {c3 : Res.Agreement =>Str};
   VV = Res.Verb ** {inf:Str; whenUsed: Res.VVMood}; --inf is the other verb
@@ -106,6 +106,10 @@ linref
   VP =\vp -> vp.adv ++ vp.s ++ BIND ++ vp.pres ++ vp.comp ++vp.comp2 ++ vp.ap;
   VPSlash =\vpslash -> vpslash.s ++ BIND ++ vpslash.pres;
 
+lindef
+  A2 = \s -> {s = s; position = Res.Post; isProper = False;
+              isPrep = False; isNeg = False;c2 = ""; isPre = True};
+
 
 --1 Cat: the Category System
 

src/rukiga/IdiomCgg.gf

@@ -1,8 +1,11 @@
 --# -path=.:../prelude:../abstract:../common
 
 concrete IdiomCgg of Idiom = CatCgg **
-  open Prelude, ResCgg in {
+  open Prelude,Predef, ResCgg in {
 
+
+lin
+  ImpPl1  vp = {s="tu" ++ BIND ++ vp.s ++ BIND ++ vp.pres ++ BIND ++ "6e"};      -- let's go
 {-
 --1 Idiom: Idiomatic Expressions