Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

src/english/ParadigmsEng.gf

@@ -616,6 +616,8 @@ mkVoc s = lin Voc (ss s) ;
   us_britishV : Str -> V = \s -> case s of {
     _ + ("el" | "al" | "ol") => regV s | mkV s (s + "s") (s + "led") (s + "led") (s + "ling") ;
     _ + "or" => regV s | regV (Predef.tk 2 s + "our") ;
+    _ + "ise" => regV (Predef.tk 2 s + "ze") | regV s ;
+    _ + "ize" => regV s | regV (Predef.tk 2 s + "se") ;
     _ => regV s
     } ;
 

src/malay/ConstructionMay.gf

@@ -1,4 +1,4 @@
-concrete ConstructionMay of Construction = CatMay ** open ParadigmsMay in {
+concrete ConstructionMay of Construction = CatMay ** open ParadigmsMay, (L=LexiconMay), SyntaxMay in {
 
 lincat
   Timeunit = N ;
@@ -6,9 +6,16 @@ lincat
   Monthday = NP ;
   Month = N ;
   Year = NP ;
-{-
+
 lin
 
+  has_age_VP card = mkVP umur_V2 (mkNP <lin Card card : Card> L.year_N) ;
+
+oper
+  umur_V2 : V2 = mkV2 (mkV "umur") noPrep ;
+
+{-
+
   timeunitAdv n time =
   let n_card : Card   = n ;
       n_hours_NP : NP = mkNP n_card time ;

src/malay/MissingMay.gf

@@ -1,7 +1,6 @@
 resource MissingMay = open GrammarMay, Prelude in {
 oper AdAP : AdA -> AP -> AP  = notYet "AdAP" ;
 oper AdAdv : AdA -> Adv -> Adv  = notYet "AdAdv" ;
-oper AdNum : AdN -> Card -> Card  = notYet "AdNum" ;
 oper AdVVP : AdV -> VP -> VP  = notYet "AdVVP" ;
 oper AdVVPSlash : AdV -> VPSlash -> VPSlash  = notYet "AdVVPSlash" ;
 oper AddAdvQVP : QVP -> IAdv -> QVP  = notYet "AddAdvQVP" ;
@@ -54,7 +53,6 @@ oper IdetQuant : IQuant -> Num -> IDet  = notYet "IdetQuant" ;
 oper ImpP3 : NP -> VP -> Utt  = notYet "ImpP3" ;
 oper ImpPl1 : VP -> Utt  = notYet "ImpPl1" ;
 oper ImpVP : VP -> Imp  = notYet "ImpVP" ;
-oper OrdDigits : Digits -> Ord  = notYet "OrdDigits" ;
 oper OrdNumeral : Numeral -> Ord  = notYet "OrdNumeral" ;
 oper OrdNumeralSuperl : Numeral -> A -> Ord  = notYet "OrdNumeralSuperl" ;
 oper OrdSuperl : A -> Ord  = notYet "OrdSuperl" ;
@@ -113,14 +111,11 @@ oper art_N : N  = notYet "art_N" ;
 oper as_CAdv : CAdv  = notYet "as_CAdv" ;
 oper ashes_N : N  = notYet "ashes_N" ;
 oper ask_V2Q : V2Q  = notYet "ask_V2Q" ;
-oper at_least_AdN : AdN  = notYet "at_least_AdN" ;
-oper at_most_AdN : AdN  = notYet "at_most_AdN" ;
 oper baby_N : N  = notYet "baby_N" ;
 oper back_N : N  = notYet "back_N" ;
 oper bad_A : A  = notYet "bad_A" ;
 oper bank_N : N  = notYet "bank_N" ;
 oper bark_N : N  = notYet "bark_N" ;
-oper because_Subj : Subj  = notYet "because_Subj" ;
 oper become_VA : VA  = notYet "become_VA" ;
 oper beer_N : N  = notYet "beer_N" ;
 oper before_Prep : Prep  = notYet "before_Prep" ;

src/malay/NounMay.gf

@@ -104,13 +104,13 @@ concrete NounMay of Noun = CatMay ** open ResMay, Prelude in {
   -- : Numeral -> Card ;
   NumNumeral num = num ;
 
-{-
+
   -- : AdN -> Card -> Card ;
   AdNum adn card = card ** { s = adn.s ++ card.s } ;
 
   -- : Digits  -> Ord ;
   OrdDigits digs = digs ** { s = digs.s ! NOrd } ;
--}
+
   -- : Numeral -> Ord ;
   OrdNumeral num = {
     s = num.ord

src/malay/StructuralMay.gf

@@ -3,11 +3,11 @@ concrete StructuralMay of Structural = CatMay **
 
 -------
 -- Ad*
+lin at_least_AdN = ss "sekurangnya" ;
+lin at_most_AdN = ss "paling tua" ;
 {-
 lin almost_AdA = mkAdA "" ;
 lin almost_AdN = ss "" ;
-lin at_least_AdN = ss "" ;
-lin at_most_AdN = ss "" ;
 lin so_AdA = ss "" ;
 lin too_AdA = ss "" ;
 lin very_AdA = mkAdA "" ;
@@ -154,7 +154,7 @@ lin whoSg_IP = mkIP "siapa";
 -- Subj
 
 -- lin although_Subj =
--- lin because_Subj =
+lin because_Subj = ss "kerana" ;
 lin if_Subj = ss "sekiranya" ;
 lin that_Subj = ss "yang" ;
 lin when_Subj = ss "kalau" ;