reduced overgeneration by only allowing one AdA in Phrasebook

examples/phrasebook/Sentences.gf

@@ -3,7 +3,7 @@ abstract Sentences = Numeral ** {
   cat
     Phrase ;
     Sentence ; Question ; 
-    Object ; Item ; Kind ; Quality ; 
+    Object ; Item ; Kind ; Quality ; Property ;  
     Place ; PlaceKind ; Currency ; Price ; Language ;
     Person ; Action ;
 
@@ -36,13 +36,15 @@ abstract Sentences = Numeral ** {
     ItCost : Item -> Price -> Sentence ;
     AmountCurrency : Numeral -> Currency -> Price ;
 
-    ObjItem : Item -> Object ;
+    ObjItem   : Item -> Object ;
     ObjNumber : Numeral -> Kind -> Object ;
+    ObjIndef  : Kind -> Object ;
     
     This, That, These, Those, The, Thes : Kind -> Item ;
     SuchKind : Quality -> Kind -> Kind ;
-    Very : Quality -> Quality ;
+    Very : Property -> Quality ;
-    Too : Quality -> Quality ;
+    Too : Property -> Quality ;
+    PropQuality : Property -> Quality ;
 
     ThePlace : PlaceKind -> Place ;
 

examples/phrasebook/SentencesI.gf

@@ -11,6 +11,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
     Item = NP ;
     Kind = CN ;
     Quality = AP ;
+    Property = A ;
     Object = NP ;
     Place = NP ;
     PlaceKind = CN ;
@@ -49,6 +50,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
 
     ObjItem i = i ;
     ObjNumber n k = mkNP <lin Numeral n : Numeral> k ;
+    ObjIndef k = mkNP a_Quant k ;
 
     This kind = mkNP this_Quant kind ;
     That kind = mkNP that_Quant kind ;
@@ -58,8 +60,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
     The kind = mkNP the_Quant kind ;
     Thes kind = mkNP the_Quant plNum kind ;
     SuchKind quality kind = mkCN quality kind ;
-    Very quality = mkAP very_AdA quality ;
+    Very property = mkAP very_AdA (mkAP property) ;
-    Too quality = mkAP too_AdA quality ;
+    Too property = mkAP too_AdA (mkAP property) ;
+    PropQuality property = mkAP property ;
     ThePlace kind = mkNP the_Quant kind ;
 
     I = mkNP i_Pron ;

examples/phrasebook/Words.gf

@@ -5,7 +5,7 @@ abstract Words = Sentences ** {
     Wine, Beer, Water, Coffee, Tea : Kind ; 
     Cheese, Fish, Pizza : Kind ;
     Fresh, Warm, Italian, 
-      Expensive, Delicious, Boring : Quality ;
+      Expensive, Delicious, Boring, Good : Property ;
 
     Bar, Restaurant, Toilet : PlaceKind ;
 

examples/phrasebook/WordsEng.gf

@@ -12,12 +12,13 @@ concrete WordsEng of Words = SentencesEng **
     Pizza = mkCN (mkN "pizza") ;
     Cheese = mkCN (mkN "cheese") ;
     Fish = mkCN (mkN "fish" "fish") ;
-    Fresh = mkAP (mkA "fresh") ;
+    Fresh = mkA "fresh" ;
-    Warm = mkAP (mkA "warm") ;
+    Warm = mkA "warm" ;
-    Italian = mkAP (mkA "Italian") ;
+    Italian = mkA "Italian" ;
-    Expensive = mkAP (mkA "expensive") ;
+    Expensive = mkA "expensive" ;
-    Delicious = mkAP (mkA "delicious") ;
+    Delicious = mkA "delicious" ;
-    Boring = mkAP (mkA "boring") ;
+    Boring = mkA "boring" ;
+    Good = mkA "good" "better" "best" "well" ;
 
     Restaurant = mkCN (mkN "restaurant") ;
     Bar = mkCN (mkN "bar") ;

examples/phrasebook/WordsFin.gf

@@ -12,16 +12,18 @@ concrete WordsFin of Words = SentencesFin **
     Pizza = mkCN (mkN "pizza") ;
     Cheese = mkCN (mkN "juusto") ;
     Fish = mkCN (mkN "kala") ;
-    Fresh = mkAP (mkA "tuore") ;
+
-    Warm = mkAP (mkA 
+    Fresh = mkA "tuore" ;
+    Warm = mkA 
     (mkN "lämmin" "lämpimän" "lämmintä" "lämpimänä" "lämpimään" 
          "lämpiminä" "lämpimiä" "lämpimien" "lämpimissä" "lämpimiin"
 	 ) 
-    "lämpimämpi" "lämpimin") ;
+    "lämpimämpi" "lämpimin" ;
-    Italian = mkAP (mkA "italialainen") ;
+    Italian = mkA "italialainen" ;
-    Expensive = mkAP (mkA "kallis") ;
+    Expensive = mkA "kallis" ;
-    Delicious = mkAP (mkA "herkullinen") ;
+    Delicious = mkA "herkullinen" ;
-    Boring = mkAP (mkA "tylsä") ;
+    Boring = mkA "tylsä" ;
+    Good = mkA (mkN "hyvä") "parempi" "paras" ; ---- comparisons?
 
     Restaurant = mkCN (mkN "ravintola") ;
     Bar = mkCN (mkN "baari") ;

examples/phrasebook/WordsFre.gf

@@ -1,60 +1,58 @@
--- (c) 2009 Ramona Enache and Aarne Ranta under LGPL
+-- (c) 2009 Ramona Enache and Aarne Ranta under LGPL
-
+
-concrete WordsFre of Words = SentencesFre ** open
+concrete WordsFre of Words = SentencesFre ** open
-  SyntaxFre,
+  SyntaxFre,
-  DiffPhrasebookFre,
+  DiffPhrasebookFre,
-  IrregFre,
+  IrregFre,
-  (E = ExtraFre),
+  (E = ExtraFre),
-  ParadigmsFre in
+  ParadigmsFre in
-{
+{
-flags coding=utf8 ;
+flags coding=utf8 ;
-
+
-lin
+lin
-
+
-Wine = mkCN (mkN "vin") ;
+Wine = mkCN (mkN "vin") ;
-    Beer = mkCN (mkN "bière") ;
+    Beer = mkCN (mkN "bière") ;
-    Water = mkCN (mkN "eau" feminine) ;
+    Water = mkCN (mkN "eau" feminine) ;
-    Coffee = mkCN (mkN "café") ;
+    Coffee = mkCN (mkN "café") ;
-    Tea = mkCN (mkN "thé") ;
+    Tea = mkCN (mkN "thé") ;
-
+
-Cheese = mkCN (mkN "fromage" masculine) ;
+Cheese = mkCN (mkN "fromage" masculine) ;
-Fish = mkCN (mkN "poisson" masculine) ;
+Fish = mkCN (mkN "poisson" masculine) ;
-Pizza = mkCN (mkN "pizza" feminine) ;
+Pizza = mkCN (mkN "pizza" feminine) ;
-
+
-Fresh = mkAP (mkA "frais" "fraîche") ;
+Fresh = mkA "frais" "fraîche" "frais" "fraîchement" ;
-Warm = mkAPA "chaud" ;
+Warm = mkA "chaud" ;
-Italian = mkAPA "italien" ;
+Italian = mkA "italien" ;
-Expensive = mkAPA "cher" ;
+Expensive = mkA "cher" ;
-Delicious = mkAPA "délicieux" ;
+Delicious = mkA "délicieux" ;
-Boring = mkAPA "ennuyeux" ;
+Boring = mkA "ennuyeux" ;
-
+Good = prefixA (mkA "bon" "bonne" "bons" "bien") ;
-    Restaurant = mkCN (mkN "restaurant") ;
+
-    Bar = mkCN (mkN "bar") ;
+    Restaurant = mkCN (mkN "restaurant") ;
-    Toilet = mkCN (mkN "toilette") ;
+    Bar = mkCN (mkN "bar") ;
-
+    Toilet = mkCN (mkN "toilette") ;
-    Euro = mkCN (mkN "euro") ;
+
-    Dollar = mkCN (mkN "dollar") ;
+    Euro = mkCN (mkN "euro") ;
-    Lei = mkCN (mkN "lei") ; ---- ?
+    Dollar = mkCN (mkN "dollar") ;
-
+    Lei = mkCN (mkN "lei") ; ---- ?
-    AWant p obj = mkCl p want_V2 obj ;
+
-    ALike p item = mkCl item plaire_V2 p ;
+    AWant p obj = mkCl p want_V2 obj ;
-    AHave p kind = mkCl p have_V2 (mkNP kind) ;
+    ALike p item = mkCl item plaire_V2 p ;
-    ASpeak p lang = mkCl p  (mkV2 (mkV "parler")) lang ;
+    AHave p kind = mkCl p have_V2 (mkNP kind) ;
-    ALove p q = mkCl p (mkV2 (mkV "aimer")) q ;
+    ASpeak p lang = mkCl p  (mkV2 (mkV "parler")) lang ;
-
+    ALove p q = mkCl p (mkV2 (mkV "aimer")) q ;
-    English = mkNP (mkPN "anglais") ;
+
-    Finnish = mkNP (mkPN "finnois") ;
+    English = mkNP (mkPN "anglais") ;
-    French = mkNP (mkPN "français") ; 
+    Finnish = mkNP (mkPN "finnois") ;
-    Romanian = mkNP (mkPN "roumain") ;
+    French = mkNP (mkPN "français") ; 
-    Swedish = mkNP (mkPN "suédois") ;
+    Romanian = mkNP (mkPN "roumain") ;
-
+    Swedish = mkNP (mkPN "suédois") ;
-    AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "faim" feminine))) ;
+
-    AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "soif" feminine))) ;
+    AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "faim" feminine))) ;
-    ATired p = mkCl p (mkA "fatigué") ;
+    AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "soif" feminine))) ;
-    AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "peur" feminine))) ;
+    ATired p = mkCl p (mkA "fatigué") ;
-    AUnderstand p = mkCl p (mkV IrregFre.comprendre_V2) ;
+    AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "peur" feminine))) ;
-
+    AUnderstand p = mkCl p (mkV IrregFre.comprendre_V2) ;
-oper
+
-mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;
+}
-
-}

examples/phrasebook/WordsIta.gf

@@ -1,58 +1,59 @@
--- (c) 2009 Ramona Enache and Aarne Ranta under LGPL
+-- (c) 2009 Ramona Enache and Aarne Ranta under LGPL
-
+
-concrete WordsIta of Words = SentencesIta ** open
+concrete WordsIta of Words = SentencesIta ** open
-  SyntaxIta,
+  SyntaxIta,
-  DiffPhrasebookIta,
+  DiffPhrasebookIta,
-  BeschIta,
+  BeschIta,
-  (E = ExtraIta),
+  (E = ExtraIta),
-  ParadigmsIta in {
+  ParadigmsIta in {
-
+
-lin
+lin
-
+
-Wine = mkCN (mkN "vino") ;
+Wine = mkCN (mkN "vino") ;
-    Beer = mkCN (mkN "birra") ;
+    Beer = mkCN (mkN "birra") ;
-    Water = mkCN (mkN "acqua") ;
+    Water = mkCN (mkN "acqua") ;
-    Coffee = mkCN (mkN "caffè") ;
+    Coffee = mkCN (mkN "caffè") ;
---   Tea = mkCN (mkN "té") ; ----
+--   Tea = mkCN (mkN "té") ; ----
-
+
-Cheese = mkCN (mkN "formaggio") ;
+Cheese = mkCN (mkN "formaggio") ;
-Fish = mkCN (mkN "pesce") ;
+Fish = mkCN (mkN "pesce") ;
-Pizza = mkCN (mkN "pizza") ;
+Pizza = mkCN (mkN "pizza") ;
-
+
-Fresh = mkAP (mkA "fresco") ;
+Fresh = mkA "fresco" ;
-Warm = mkAPA "caldo" ;
+Warm = mkA "caldo" ;
-Italian = mkAPA "italiano" ;
+Italian = mkA "italiano" ;
-Expensive = mkAPA "caro" ;
+Expensive = mkA "caro" ;
-Delicious = mkAPA "delizioso" ;
+Delicious = mkA "delizioso" ;
-Boring = mkAPA "noioso" ;
+Boring = mkA "noioso" ;
-
+Good = prefixA (mkA "buono" "buona" "buoni" "buone" "bene") ;
-    Restaurant = mkCN (mkN "ristorante") ;
+
-    Bar = mkCN (mkN "bar") ;
+    Restaurant = mkCN (mkN "ristorante") ;
-    Toilet = mkCN (mkN "bagno") ;
+    Bar = mkCN (mkN "bar") ;
-
+    Toilet = mkCN (mkN "bagno") ;
-    Euro = mkCN (mkN "euro" "euro" masculine) ;
+
-    Dollar = mkCN (mkN "dollar") ;
+    Euro = mkCN (mkN "euro" "euro" masculine) ;
-    Lei = mkCN (mkN "lei") ; ---- ?
+    Dollar = mkCN (mkN "dollar") ;
-
+    Lei = mkCN (mkN "lei") ; ---- ?
-    AWant p obj = mkCl p want_V2 obj ;
+
-    ALike p item = mkCl item (mkV2 (mkV (piacere_64 "piacere")) dative) p ;
+    AWant p obj = mkCl p want_V2 obj ;
-    AHave p kind = mkCl p have_V2 (mkNP kind) ;
+    ALike p item = mkCl item (mkV2 (mkV (piacere_64 "piacere")) dative) p ;
-    ASpeak p lang = mkCl p  (mkV2 (mkV "parlare")) lang ;
+    AHave p kind = mkCl p have_V2 (mkNP kind) ;
-    ALove p q = mkCl p (mkV2 (mkV "amare")) q ;
+    ASpeak p lang = mkCl p  (mkV2 (mkV "parlare")) lang ;
-
+    ALove p q = mkCl p (mkV2 (mkV "amare")) q ;
-    English = mkNP (mkPN "inglese") ;
+
-    Finnish = mkNP (mkPN "finlandese") ;
+    English = mkNP (mkPN "inglese") ;
-    French = mkNP (mkPN "francese") ; 
+    Finnish = mkNP (mkPN "finlandese") ;
-    Romanian = mkNP (mkPN "rumeno") ;
+    French = mkNP (mkPN "francese") ; 
-    Swedish = mkNP (mkPN "svedese") ;
+    Romanian = mkNP (mkPN "rumeno") ;
-
+    Swedish = mkNP (mkPN "svedese") ;
-    AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "fame" feminine))) ;
+
-    AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ;
+    AHungry p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "fame" feminine))) ;
-    ATired p = mkCl p (mkA "stanco") ;
+    AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ;
-    AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ;
+    ATired p = mkCl p (mkA "stanco") ;
-    AUnderstand p = mkCl p (mkV "capire") ;
+    AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ;
-
+    AUnderstand p = mkCl p (mkV "capire") ;
-oper
+
-mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;
+oper
-
+mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;
-}
+
+}

examples/phrasebook/WordsRon.gf

@@ -1,66 +1,67 @@
--- (c) 2009 Ramona Enache under LGPL
+-- (c) 2009 Ramona Enache under LGPL
-
+
-concrete WordsRon of Words = SentencesRon ** open
+concrete WordsRon of Words = SentencesRon ** open
-  SyntaxRon,
+  SyntaxRon,
-  ParadigmsRon,
+  ParadigmsRon,
-  BeschRon,
+  BeschRon,
-  DiffPhrasebookRon in
+  DiffPhrasebookRon in
-{
+{
-flags coding=utf8 ;
+flags coding=utf8 ;
-
+
-lin
+lin
-
+
-Wine = mkCN (mkN "vin" "vinuri" neuter) ;
+Wine = mkCN (mkN "vin" "vinuri" neuter) ;
-    Beer = mkCN (mkN "bere") ;
+    Beer = mkCN (mkN "bere") ;
-    Water = mkCN (mkN "apă") ;
+    Water = mkCN (mkN "apă") ;
-----    Coffee = mkCN (mkN "coffee") ;
+----    Coffee = mkCN (mkN "coffee") ;
-----    Tea = mkCN (mkN "tea") ;
+----    Tea = mkCN (mkN "tea") ;
-
+
-Cheese = mkCN (mkN "brânză" "brânzeturi" feminine) ;
+Cheese = mkCN (mkN "brânză" "brânzeturi" feminine) ;
-Fish = mkCN (mkN "peşte" "peşti" masculine) ;
+Fish = mkCN (mkN "peşte" "peşti" masculine) ;
-Pizza = mkCN (mkN "pizza" "pizze" feminine) ;
+Pizza = mkCN (mkN "pizza" "pizze" feminine) ;
-
+
-Fresh = mkAPA "proaspăt" "proaspătă" "proaspeţi" "proaspete" ;
+Fresh = mkA "proaspăt" "proaspătă" "proaspeţi" "proaspete" ;
-Warm = mkAPA "cald" "caldă" "calzi" "calde" ;
+Warm = mkA "cald" "caldă" "calzi" "calde" ;
-Italian = mkAPA "italian" "italiană" "italieni" "italiene" ;
+Italian = mkA "italian" "italiană" "italieni" "italiene" ;
-Expensive = mkAPA "scump" "scumpă" "scumpi" "scumpe" ;
+Expensive = mkA "scump" "scumpă" "scumpi" "scumpe" ;
-Delicious = mkAPA "delicios" "delcioasă" "delicioşi" "delicioase" ;
+Delicious = mkA "delicios" "delcioasă" "delicioşi" "delicioase" ;
-Boring = mkAPA "plictisitor" "plictisitoare" "plictisitori" "plictisitoare" ;
+Boring = mkA "plictisitor" "plictisitoare" "plictisitori" "plictisitoare" ;
-
+Good = mkA "bun" "bună" "buni" "bune" "bine" ;
-    Restaurant = mkCN (mkN "restaurant") ;
+
-    Bar = mkCN (mkNR "bar") ;
+    Restaurant = mkCN (mkN "restaurant") ;
-    Toilet = mkCN (mkN "toaleta") ;
+    Bar = mkCN (mkNR "bar") ;
-
+    Toilet = mkCN (mkN "toaleta") ;
-    Euro = mkCN (mkN "euro" "euro") ;
+
-    Dollar = mkCN (mkN "dolar" masculine) ;
+    Euro = mkCN (mkN "euro" "euro") ;
-    Lei = mkCN (mkN "leu" "lei") ;
+    Dollar = mkCN (mkN "dolar" masculine) ;
-
+    Lei = mkCN (mkN "leu" "lei") ;
-    AWant p obj = mkCl p want_V2 obj ;
+
-    ALike p item = mkCl p like_V2 item ;
+    AWant p obj = mkCl p want_V2 obj ;
-    AHave p kind = mkCl p have_V2 (SyntaxRon.mkNP kind) ;
+    ALike p item = mkCl p like_V2 item ;
-    ASpeak p lang = mkCl p  (dirV2 (mkV "vorbi")) lang ;
+    AHave p kind = mkCl p have_V2 (SyntaxRon.mkNP kind) ;
-    ALove p q = mkCl p (dirV2 (mkV "iubi")) q ;
+    ASpeak p lang = mkCl p  (dirV2 (mkV "vorbi")) lang ;
-
+    ALove p q = mkCl p (dirV2 (mkV "iubi")) q ;
-    English = SyntaxRon.mkNP (mkPN "engleză") ; ---- ?
+
---    Finnish = mkNP (mkPN "finnois") ;
+    English = SyntaxRon.mkNP (mkPN "engleză") ; ---- ?
---    French = mkNP (mkPN "français") ; 
+--    Finnish = mkNP (mkPN "finnois") ;
-    Romanian = SyntaxRon.mkNP (mkPN "română") ; ---- ?
+--    French = mkNP (mkPN "français") ; 
---    Swedish = mkNP (mkPN "suédois") ;
+    Romanian = SyntaxRon.mkNP (mkPN "română") ; ---- ?
-
+--    Swedish = mkNP (mkPN "suédois") ;
---    AHungry p = mkCl p have_V2 (SyntaxRon.mkNP a_Det (mkN "foame")) ;
+
---    AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ;
+--    AHungry p = mkCl p have_V2 (SyntaxRon.mkNP a_Det (mkN "foame")) ;
---    ATired p = mkCl p (mkA "stanco") ;
+--    AThirsty p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "sete" feminine))) ;
---    AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ;
+--    ATired p = mkCl p (mkA "stanco") ;
-    AUnderstand p = mkCl p (v_besch83 "înţelege") ;
+--    AScared p = mkCl p (E.ComplCN have_V2 (mkCN (mkN "paura" feminine))) ;
-{-
+    AUnderstand p = mkCl p (v_besch83 "înţelege") ;
-  GImHungry = ss "mi-e foame" ;
+{-
-  GImThirsty = ss "mi-e sete" ;
+  GImHungry = ss "mi-e foame" ;
-  GImTired = ss "mi-e somn" ;
+  GImThirsty = ss "mi-e sete" ;
-  GImScared = ss "mi-e frică" ;
+  GImTired = ss "mi-e somn" ;
--}
+  GImScared = ss "mi-e frică" ;
-
+-}
-
+
-oper
+
-mkAPA : (_,_,_,_ : Str) -> AP = \x,y,z,u -> mkAP (mkA x y z u) ;
+oper
-
+mkAPA : (_,_,_,_ : Str) -> AP = \x,y,z,u -> mkAP (mkA x y z u) ;
-}
+
+}

examples/phrasebook/WordsSwe.gf

@@ -12,12 +12,13 @@ concrete WordsSwe of Words = SentencesSwe **
     Pizza = mkCN (mkN "pizza") ;
     Cheese = mkCN (mkN "ost") ;
     Fish = mkCN (mkN "fisk") ;
-    Fresh = mkAP (mkA "färsk") ;
+    Fresh = mkA "färsk" ;
-    Warm = mkAP (mkA "varm") ;
+    Warm = mkA "varm" ;
-    Italian = mkAP (mkA "italiensk") ;
+    Italian = mkA "italiensk" ;
-    Expensive = mkAP (mkA "dyr") ;
+    Expensive = mkA "dyr" ;
-    Delicious = mkAP (mkA "läcker") ;
+    Delicious = mkA "läcker" ;
-    Boring = mkAP (mkA "tråkig") ;
+    Boring = mkA "tråkig" ;
+    Good = mkA "god" "gott" "goda" "bättre" "bäst" ;
 
     Restaurant = mkCN (mkN "restaurang" "restauranger") ;
     Bar = mkCN (mkN "bar" "barer") ;