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

src/api/TryCze.gf

@@ -1,6 +1,6 @@
 --# -path=.:../czech:../common:../abstract:../prelude
 
-resource TryCze = ExtraCze, SyntaxCze-[mkVoc], LexiconCze, ParadigmsCze -[mkAdv,mkAdN,mkIAdv,mkDet,mkIDet,mkIP,mkQuant,mkCard,mkPConj,mkVoc]**
+resource TryCze = ExtraCze, SyntaxCze-[mkVoc], LexiconCze, ParadigmsCze -[mkAdv,mkAdN,mkIAdv,mkDet,mkIDet,mkIP,mkQuant,mkPConj,mkVoc]**
   open (P = ParadigmsCze),(S = SyntaxCze) in {
 
 oper
@@ -17,8 +17,8 @@ oper
   mkIP = overload SyntaxCze {
     mkIP : Str -> IP = P.mkIPron ;
   } ;
-  mkCard = overload SyntaxCze {
-    mkCard : Str -> Card = P.mkCardinal ;
-  } ;
+---  mkCard = overload SyntaxCze {
+---    mkCard : Str -> Card = P.mkCardinal ;
+---  } ;
 
 }

src/hindi/ConstructionHin.gf

@@ -89,8 +89,8 @@ lin
   monthYearAdv m y = SyntaxHin.mkAdv in_Prep (mkNP (mkCN m y)) ; -- in May 2012
   dayMonthYearAdv d m y = ParadigmsHin.mkAdv ("on" ++ d.s ! R.NPAcc ++ m.s ! R.Sg ! R.Nom ++ y.s ! R.NPAcc) ; -- on 17 May 2013
 -}
-  intYear = symb ;
-  intMonthday = symb ;
+  intYear y = symb y ;
+  intMonthday m = symb m ;
 
 lincat Language = PN ;
 

src/japanese/ResJpn.gf

@@ -149,7 +149,7 @@ oper
 
   na_mkAdj : Str -> Adj = \ookina ->
     let
-      forms = case ookina of {
+      forms : {root : Str ; attr : Str} = case ookina of {
         stem + ("な"|"の") => {root = stem ; attr = ookina} ;
         _ => {root = ookina ; attr = ookina + "な"}
         }

src/korean/ResKor.gf

@@ -352,7 +352,9 @@ oper
     nObj = \\_ => []
   } ;
 
-  VerbPhrase : Type = BaseVerb ** Complement ** BaseVP ;
+--- AR tried, got "clashing labels futureAttr past pastAttr"
+--- VerbPhrase : Type = BaseVerb ** Complement ** BaseVP ;
+VerbPhrase : Type = BaseVerb ** {s : VForm => Str} ** BaseVP ;
 
   VPSlash : Type = Verb2 ** BaseVP ;
 

src/latin/ExtendLat.gf

@@ -270,10 +270,10 @@ concrete ExtendLat of Extend = CatLat ** open ResLat, Prelude in {
     ReflA2RNP a rnp = {s = \\ag => a.s ! Posit ! ag ++ a.c.s ++ rnp.s ! ag ! a.c.c} ;
     PossPronRNP pron num cn rnp =
       let base = {
-        s = \\_,c => cn.s ! num.n ! c;
+        s = table PronDropForm {_  => cn.s ! num.n} ;
         n = num.n; g = cn.g; p = P3; adv = rnp.s ! Ag pron.pers.g pron.pers.n Nom ! Gen;
         preap=cn.preap; postap=cn.postap;
-        det={s=\\c=>pron.poss.s ! PronNonRefl ! Ag cn.g num.n c; sp=\\_=>""; n=num.n}
+        det={s = table Case {c => pron.poss.s ! PronNonRefl ! Ag cn.g num.n c} ; sp = table Case {_ => ""}}
         }
       in base ;
 

src/polish/VerbMorphoPol.gf

@@ -428,7 +428,7 @@ resource VerbMorphoPol = open CatPol, ResPol, Prelude, (Predef=Predef),
       };
 
   oper mkGerund : adj11table -> SubstForm => Str = \part ->
-    let lemma = case part ! X1 of {
+    let lemma : Str = case part ! X1 of {
           stem + "iany" => stem + "ianie";
           stem + "iony" => stem + "ienie";
           stem + "any" => stem + "anie";

src/spanish/ConstructionSpa.gf

@@ -33,7 +33,7 @@ lin
   n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP <lin Card card : Card> (lin CN cn)))) (lin A a) ;
   n_units_of_NP card cn np =
     mkNP card (lin CN (cn ** {
-      s = \\n => cn.s ! n ++ (np.s ! R.genitive).ton
+      s = table Number {n => cn.s ! n ++ (np.s ! R.genitive).ton}
       })) ;
 
   bottle_of_CN np = mkCN (lin N2 (mkN2 (mkN "botella" feminine) part_Prep)) np ;

src/urdu/ConstructionUrd.gf

@@ -90,8 +90,8 @@ lin
   monthYearAdv m y = SyntaxUrd.mkAdv in_Prep (mkNP (mkCN m y)) ; -- in May 2012
   dayMonthYearAdv d m y = ParadigmsUrd.mkAdv ("on" ++ d.s ! R.NPAcc ++ m.s ! R.Sg ! R.Nom ++ y.s ! R.NPAcc) ; -- on 17 May 2013
 -}
-  intYear = symb ;
-  intMonthday = symb ;
+  intYear y = symb y ;
+  intMonthday m = symb m ;
 
 lincat Language = PN ;