diff --git a/src/api/TryCze.gf b/src/api/TryCze.gf index afd8b943a..d5358de1d 100644 --- a/src/api/TryCze.gf +++ b/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 ; +--- } ; } diff --git a/src/hindi/ConstructionHin.gf b/src/hindi/ConstructionHin.gf index 375000c92..5269c2fdd 100644 --- a/src/hindi/ConstructionHin.gf +++ b/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 ; diff --git a/src/japanese/ResJpn.gf b/src/japanese/ResJpn.gf index 0aa59ac7a..6778c7dd0 100644 --- a/src/japanese/ResJpn.gf +++ b/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 + "な"} } diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index 82ffe9c36..25f84f05a 100644 --- a/src/korean/ResKor.gf +++ b/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 ; diff --git a/src/latin/ExtendLat.gf b/src/latin/ExtendLat.gf index 51b6b7c43..c92c56c00 100644 --- a/src/latin/ExtendLat.gf +++ b/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 ; diff --git a/src/polish/VerbMorphoPol.gf b/src/polish/VerbMorphoPol.gf index ce278a5ae..df8d64b65 100644 --- a/src/polish/VerbMorphoPol.gf +++ b/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"; diff --git a/src/spanish/ConstructionSpa.gf b/src/spanish/ConstructionSpa.gf index 52543ae14..b5b34301c 100644 --- a/src/spanish/ConstructionSpa.gf +++ b/src/spanish/ConstructionSpa.gf @@ -33,7 +33,7 @@ lin n_units_AP card cn a = mkAP (lin AdA (mkUtt (mkNP (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 ; diff --git a/src/urdu/ConstructionUrd.gf b/src/urdu/ConstructionUrd.gf index ace31b42a..b3a90bfad 100644 --- a/src/urdu/ConstructionUrd.gf +++ b/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 ;