comparative adverbs generalized to cover more of Attempto

8 files changed, 29 insertions, 32 deletions

diff --git a/examples/attempto/Attempto.gf b/examples/attempto/Attempto.gf
index 546e525eb..9e9051df4 100644
--- a/examples/attempto/Attempto.gf
+++ b/examples/attempto/Attempto.gf
@@ -16,6 +16,7 @@ cat Prep ;
 cat S ;
 cat VP ;
 cat V ;
+cat VS ;
 cat V2 ;
 cat V3 ;
 cat Adv ;
@@ -86,6 +87,7 @@ fun they_NP : NP ;
 fun somebody_NP : NP ;
 fun something_NP : NP ;
 --fun noone_NP : NP ;
+fun nobody_NP : NP ;
 fun nothing_NP : NP ;
 --fun not_everyoneNP : NP ;
 fun not_everybodyNP : NP ;
@@ -150,17 +152,17 @@ fun neg_vpS : NP -> VP -> S ;
 fun not_provably_vpS : NP -> VP -> S ;
 
 fun vVP  : V -> VP ;
+fun vsVP : VS -> S  -> VP ;
 fun v2VP : V2 -> NP -> VP ;
 fun v3VP : V3 -> NP -> NP -> VP ;
 
 -- 2.3.2
 
-fun apVP : AP -> VP ;
-fun compVP : A -> NP -> VP ; -- John is richer than Mary
-fun as_asVP : A -> NP -> VP ; -- John is as rich as Mary
+fun apVP    : AP -> VP ;
+fun compVP  : A -> NP -> VP ;  -- John is richer than Mary
+fun as_asVP : AP -> NP -> VP ; -- John is as rich as Mary
+fun more_thanVP : AP -> NP -> VP ; -- John is as rich as Mary
 
--- John is as fond-of Mary as Bill
--- John is more fond-of Mary than Bill
 -- John is as fond-of Mary as of Sue
 -- John is more fond-of Mary than of Sue
 
@@ -213,8 +215,6 @@ fun not_possibleS : S -> S ;
 fun necessaryS : S -> S ; 
 fun not_necessaryS : S -> S ; 
 
-fun thatS : S -> S -> S ;
-
 -- 3.5
 
 fun npQS : NP -> VP -> QS ;
diff --git a/examples/attempto/AttemptoI.gf b/examples/attempto/AttemptoI.gf
index 1841cd197..8d67e6c79 100644
--- a/examples/attempto/AttemptoI.gf
+++ b/examples/attempto/AttemptoI.gf
@@ -18,6 +18,7 @@ lincat Prep = Syntax.Prep ;
 lincat S = Syntax.S ;
 lincat VP = Syntax.VP ;
 lincat V = Syntax.V ;
+lincat VS = Syntax.VS ;
 lincat V2 = Syntax.V2 ;
 lincat V3 = Syntax.V3 ;
 lincat Adv = Syntax.Adv ;
@@ -118,8 +119,7 @@ lin superlAP a = mkAP (mkOrd a) ;
 -- 2.2.2
 
 lin relCN = mkCN ;
---lin relNP = mkNP ;
-
+lin relNP = mkNP ;
 
 lin andRS = mkRS and_Conj ;
 lin orRS = mkRS or_Conj ;
@@ -145,6 +145,7 @@ lin neg_vpS np vp = mkS negativePol (mkCl np vp) ;
 lin not_provably_vpS np vp = mkS negativePol (mkCl np (mkVP vp provably_Adv)) ;
 
 lin vVP  = mkVP ;
+lin vsVP = mkVP ;
 lin v2VP = mkVP ;
 lin v3VP = mkVP ;
 
@@ -152,13 +153,11 @@ lin v3VP = mkVP ;
 
 lin apVP = mkVP ;
 lin compVP a np = mkVP (mkAP a np) ;
---lin as_asVP : A -> NP -> S ; -- John is as rich as Mary
-
--- John is as fond-of Mary as Bill
--- John is more fond-of Mary than Bill
--- John is as fond-of Mary as of Sue
--- John is more fond-of Mary than of Sue
+lin as_asVP ap np = mkVP (mkAP as_CAdv ap np) ; -- John is as rich as Mary
+lin more_thanVP ap np = mkVP (mkAP more_CAdv ap np) ;
 
+---- John is as fond-of Mary as of Sue
+---- John is more fond-of Mary than of Sue
 
 lincat PP = Adv ;
 lincat [PP] = Adv ;
@@ -222,8 +221,6 @@ lin necessaryS s = mkS (adj_thatCl necessary_A s) ;
 lin not_necessaryS s = mkS negativePol (adj_thatCl necessary_A s) ;
 
 
---lin thatS s t = mkS s (mkAdv that_Subj t) ;
-
 -- 3.5
 
 lin npQS np vp = mkQS (mkCl np vp) ;
diff --git a/examples/attempto/LexAttemptoEng.gf b/examples/attempto/LexAttemptoEng.gf
index 65ed0aa28..395e00c35 100644
--- a/examples/attempto/LexAttemptoEng.gf
+++ b/examples/attempto/LexAttemptoEng.gf
@@ -4,7 +4,7 @@ instance LexAttemptoEng of LexAttempto =
    SyntaxEng, 
    ParadigmsEng, 
    ConstructX, 
-   MakeStructuralEng,
+   (M = MakeStructuralEng),
    IrregEng in {
 
 oper
@@ -23,11 +23,11 @@ oper
 
   each_Det = ExtraEng.each_Det ;
 
-  that_Subj = mkSubj "that" ;
+  that_Subj = M.mkSubj "that" ;
 
-  comma_and_Conj = mkConj [] ", and" plural ;
-  comma_or_Conj = mkConj [] ", or" singular ;
-  slash_Conj = mkConj [] "/" singular ;
+  comma_and_Conj = M.mkConj [] ", and" plural ;
+  comma_or_Conj = M.mkConj [] ", or" singular ;
+  slash_Conj = M.mkConj [] "/" singular ;
 
 
 }
diff --git a/examples/attempto/TestAttempto.gf b/examples/attempto/TestAttempto.gf
index ad76f4d15..1b953ed2d 100644
--- a/examples/attempto/TestAttempto.gf
+++ b/examples/attempto/TestAttempto.gf
@@ -51,7 +51,7 @@ fun
   course_N : CN ;
   carefully_Adv : Adv ;
   time_N : CN ;
-  believe_V : V ;
+  believe_VS : VS ;
   seriously_Adv : Adv ;
   clerk_N : CN ;
   screen_N : CN ;
@@ -62,7 +62,7 @@ fun
   reject_V2 : V2 ;
   accept_V2 : V2 ;
   type_V2 : V2 ;
-  know_V : V ;
+  know_VS : VS ;
   manager_N : CN ;
   oversleep_V : V ;
   valid_A : A ;
diff --git a/examples/attempto/TestAttemptoEng.gf b/examples/attempto/TestAttemptoEng.gf
index 2cf864744..9da59ff12 100644
--- a/examples/attempto/TestAttemptoEng.gf
+++ b/examples/attempto/TestAttemptoEng.gf
@@ -53,7 +53,7 @@ lin patiently_Adv = mkAdv "patiently" ;
 lin course_N = mkkN "course" ;
 lin carefully_Adv = mkAdv "carefully" ;
 lin time_N = mkkN "time" ;
-lin believe_V = mkV "believe" ;
+lin believe_VS = mkVS (mkV "believe") ;
 lin seriously_Adv = mkAdv "seriously" ;
 lin clerk_N = mkkN "clerk" ;
 lin screen_N = mkkN "screen" ;
@@ -64,7 +64,7 @@ lin automated_teller_N = mkkN "automated" ;
 lin reject_V2 = mkV2 "reject" ;
 lin accept_V2 = mkV2 "accept" ;
 lin type_V2 = mkV2 "type" ;
-lin know_V = IrregEng.know_V ;
+lin know_VS = mkVS IrregEng.know_V ;
 lin manager_N = mkkN "manager" ;
 lin oversleep_V = mkV "oversleep" "overslept" "overslept" ;
 lin valid_A = mkA "valid" ;
diff --git a/examples/attempto/TestAttemptoFre.gf b/examples/attempto/TestAttemptoFre.gf
index d8e281083..3c2f0fcdd 100644
--- a/examples/attempto/TestAttemptoFre.gf
+++ b/examples/attempto/TestAttemptoFre.gf
@@ -52,7 +52,7 @@ lin patiently_Adv = mkAdv "patiemment" ;
 lin course_N = mkkN "cours" ;
 lin carefully_Adv = mkAdv "soigneusement" ;
 lin time_N = mkkN "temps" ;
-lin believe_V = mkV croire_V2 ;
+lin believe_VS = mkVS (mkV croire_V2) ;
 lin seriously_Adv = mkAdv "sérieusement" ;
 lin clerk_N = mkkN "employé" ;
 lin screen_N = mkkN "écran" ;
@@ -63,7 +63,7 @@ lin automated_teller_N = mkgN "automate" masculine ;
 lin reject_V2 = mkV2 "rejeter" ;
 lin accept_V2 = mkV2 "accepter" ;
 lin type_V2 = mkV2 "taper" ;
-lin know_V = mkV savoir_V2 ;
+lin know_VS = mkVS (mkV savoir_V2) ;
 lin manager_N = mkkN "directeur" ;
 lin oversleep_V = mkV dormir_V2 ; ----
 lin valid_A = mkA "valide" ;
diff --git a/examples/attempto/TestAttemptoGer.gf b/examples/attempto/TestAttemptoGer.gf
index 4f1092e3e..5f47dc9e5 100644
--- a/examples/attempto/TestAttemptoGer.gf
+++ b/examples/attempto/TestAttemptoGer.gf
@@ -52,7 +52,7 @@ lin patiently_Adv = mkAdv "geduldig" ;
 lin course_N = mkkN "Kurse" ; ----
 lin carefully_Adv = mkAdv "vorsichtig" ;
 lin time_N = mkgN "Zeit" "Zeiten" feminine ;
-lin believe_V = mkV "glauben" ;
+lin believe_VS = mkVS (mkV "glauben") ;
 lin seriously_Adv = mkAdv "seriös" ; ----
 lin clerk_N = mkgN "Angestellt" "Angestellten" masculine ; ----
 lin screen_N = mkgN "Schirm" "Schirme" masculine ;
@@ -63,7 +63,7 @@ lin automated_teller_N = mkgN "Automat" "Automate" neuter ;
 lin reject_V2 = mkV2 (mkV "verwerfen" "verwirft" "verwarf" "verwürfe" "verworfen") ;
 lin accept_V2 = mkV2 (mkV "an" nehmen_V) ;
 lin type_V2 = mkV2 schreiben_V ;
-lin know_V = wissen_V ;
+lin know_VS = mkVS wissen_V ;
 lin manager_N = mkgN "Manager" "Manager" masculine ; ----
 lin oversleep_V = schlafen_V ; ----
 lin valid_A = mkA "gültig" ;
diff --git a/examples/attempto/TestAttemptoSwe.gf b/examples/attempto/TestAttemptoSwe.gf
index 21b1d8b37..c6e7698e6 100644
--- a/examples/attempto/TestAttemptoSwe.gf
+++ b/examples/attempto/TestAttemptoSwe.gf
@@ -52,7 +52,7 @@ lin patiently_Adv = mkAdv "tålamodigt" ;
 lin course_N = mkCN (mkN "kurs" "kurser") ;
 lin carefully_Adv = mkAdv "försiktigt" ;
 lin time_N = mkCN (mkN "tid" "tider") ;
-lin believe_V = mkV "tro" ;
+lin believe_VS = mkVS (mkV "tro") ;
 lin seriously_Adv = mkAdv "seriöst" ;
 lin clerk_N = mkCN (mkN "kontorist" "kontorister") ;
 lin screen_N = mkkN "skärm" neutrum ;
@@ -63,7 +63,7 @@ lin automated_teller_N = mkCN (mkN "automat" "automater") ;
 lin reject_V2 = mkV2 "förkasta" ;
 lin accept_V2 = mkV2 "acceptera" ;
 lin type_V2 = mkV2 skriva_V ; ----
-lin know_V = veta_V ;
+lin know_VS = mkVS veta_V ;
 lin manager_N = mkCN (mkN "chef" "chefer") ;
 lin oversleep_V = mkV "försova" "försov" "försovit" ;
 lin valid_A = mkA "giltig" ;