diff --git a/examples-3.0/tutorial/semantics/BaseI.gf b/examples-3.0/tutorial/semantics/BaseI.gf index d90431e2f..b7ed86666 100644 --- a/examples-3.0/tutorial/semantics/BaseI.gf +++ b/examples-3.0/tutorial/semantics/BaseI.gf @@ -50,7 +50,7 @@ lin (mkCN common_A (mkCN divisor_N2 (mkNP and_Conj nps))) ; WhatIs np = mkPhr (mkQS (mkQCl whatSg_IP (mkVP np))) ; --- WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP (mkIDet which_IQuant plNum) cn) (mkVP ap))) ; + WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP which_IQuant cn) (mkVP ap))) ; QuestS s = mkPhr (mkQS (mkQCl s)) ; Yes = mkPhr yes_Utt ; diff --git a/lib/resource-1.4/Make.hs b/lib/resource-1.4/Make.hs index a94e21fc0..fff30cf80 100644 --- a/lib/resource-1.4/Make.hs +++ b/lib/resource-1.4/Make.hs @@ -30,10 +30,10 @@ langs = [ langsLang = langs `except` ["Ara"] -- languages for which to compile Try -langsAPI = langsLang `except` ["Cat","Hin","Ina","Rus","Tha"] +langsAPI = langsLang `except` ["Bul","Cat","Hin","Ina","Rus","Tha"] -- languages for which to compile Mathematical -langsMath = langsLang `except` ["Bul","Cat","Hin","Ina","Rus","Tha"] +langsMath = langsAPI -- languages for which to run treebank test langsTest = langsLang `except` ["Cat","Hin","Spa","Tha"] diff --git a/lib/resource-1.4/api/Constructors.gf b/lib/resource-1.4/api/Constructors.gf index 43b517ce9..fba76be90 100644 --- a/lib/resource-1.4/api/Constructors.gf +++ b/lib/resource-1.4/api/Constructors.gf @@ -704,25 +704,25 @@ incomplete resource Constructors = open Grammar in { mkQCl : IP -> QCl -- 8. what is there } ; -{- + --3 IP, interrogative pronouns mkIP : overload { -- Interrogative pronouns --- can be formed much like noun phrases, by using interrogative determiners. +-- can be formed much like noun phrases, by using interrogative quantifiers. - mkIP : IDet -> N -> IP ; -- 1. which city - mkIP : IDet -> (Num) -> (Ord) -> CN -> IP ; -- 2. which five best cities + mkIP : IQuant -> N -> IP ; -- 1. which city + mkIP : IQuant -> (Num) -> CN -> IP ; -- 2. which five big cities -- An interrogative pronoun can be modified by an adverb. - mkIP : IP -> Adv -> IP -- 3. who in Paris + mkIP : IP -> Adv -> IP -- 3. who in Paris } ; -- More interrogative pronouns and determiners can be found in $Structural$. --} + --3 IAdv, interrogative adverbs. @@ -1315,11 +1315,18 @@ incomplete resource Constructors = open Grammar in { = IdetCN ; mkIP : IDet -> N -> IP -- which song = \i,n -> IdetCN i (UseN n) ; + mkIP : IQuant -> CN -> IP -- which songs + = \i,n -> IdetCN (IdetQuant i NumSg) n ; + mkIP : IQuant -> Num -> CN -> IP -- which songs + = \i,nu,n -> IdetCN (IdetQuant i nu) n ; + mkIP : IQuant -> N -> IP -- which song + = \i,n -> IdetCN (IdetQuant i NumSg) (UseN n) ; mkIP : IP -> Adv -> IP -- who in Europe = AdvIP } ; whichSg_IDet : IDet = IdetQuant which_IQuant NumSg ; + whichPl_IDet : IDet = IdetQuant which_IQuant NumPl ; mkIAdv : Prep -> IP -> IAdv = PrepIP ;