extended Attempto with some constructs

8 files changed, 39 insertions, 22 deletions

diff --git a/examples/attempto/Attempto.gf b/examples/attempto/Attempto.gf
index e8e0f46b9..0020973ce 100644
--- a/examples/attempto/Attempto.gf
+++ b/examples/attempto/Attempto.gf
@@ -1,11 +1,12 @@
-abstract Attempto = Symbols ** {
+abstract Attempto = 
+  Numeral, Symbols ** {
 
 flags startcat = ACEText ;
 
 cat CN ;
 cat NP ;
 cat Card ;
-cat Numeral ;
+---cat Numeral ;
 cat PN ;
 cat A ;
 cat A2 ;
@@ -54,10 +55,10 @@ fun noMassNP : MCN -> NP ;
 fun allMassNP : MCN -> NP ;
 fun notAllMassNP : MCN -> NP ;
 
-fun one_Card : Card ;
-fun two_Card : Card ;
-fun five_Card : Card ;
-fun ten_Card : Card ;
+---fun one_Card : Card ;
+---fun two_Card : Card ;
+---fun five_Card : Card ;
+---fun ten_Card : Card ;
 
 
 fun pnNP : PN -> NP ;
@@ -234,7 +235,7 @@ fun whoseIP : CN -> IP ;  -- whose dog
 
 -- 3.6
 
-fun impVP : NP -> VP -> Text ; -- John, go to the bank!
+fun np_impVP : NP -> VP -> Text ; -- John, go to the bank!
 
 -- 4
 
@@ -246,6 +247,14 @@ fun baseText : Text -> ACEText ;
 fun sText : S -> Text ;
 fun qsText : QS -> Text ;
 
+-- more
+
+fun npVP  : NP -> VP ;              -- is a bank
+fun impVP : VP -> Text ;            -- go to the bank!
+fun numeralCard : Numeral -> Card ; -- fifteen banks
+fun digitsCard : Digits -> Card ;   -- 8 banks
+fun have_V2 : V2 ;                  -- has (an apple)
+
 }
 
 
diff --git a/examples/attempto/AttemptoEng.gf b/examples/attempto/AttemptoEng.gf
index 19f3654f8..5e13b3aab 100644
--- a/examples/attempto/AttemptoEng.gf
+++ b/examples/attempto/AttemptoEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:present
 
-concrete AttemptoEng of Attempto = SymbolsC ** AttemptoI with
+concrete AttemptoEng of Attempto = SymbolsC,NumeralEng ** AttemptoI with
   (Syntax = SyntaxEng),
   (Symbolic = SymbolicEng),
   (LexAttempto = LexAttemptoEng) ;
diff --git a/examples/attempto/AttemptoFin.gf b/examples/attempto/AttemptoFin.gf
index 687040243..b03f7b0b1 100644
--- a/examples/attempto/AttemptoFin.gf
+++ b/examples/attempto/AttemptoFin.gf
@@ -1,6 +1,6 @@
 --# -path=.:present
 
-concrete AttemptoFin of Attempto = SymbolsC ** AttemptoI with
+concrete AttemptoFin of Attempto = NumeralFin, SymbolsC ** AttemptoI with
   (Syntax = SyntaxFin),
   (Symbolic = SymbolicFin),
   (LexAttempto = LexAttemptoFin) ;
diff --git a/examples/attempto/AttemptoFre.gf b/examples/attempto/AttemptoFre.gf
index 9bd7099a3..97eed0c73 100644
--- a/examples/attempto/AttemptoFre.gf
+++ b/examples/attempto/AttemptoFre.gf
@@ -1,6 +1,6 @@
 --# -path=.:present
 
-concrete AttemptoFre of Attempto = SymbolsC ** AttemptoI with
+concrete AttemptoFre of Attempto = NumeralFre, SymbolsC ** AttemptoI with
   (Syntax = SyntaxFre),
   (Symbolic = SymbolicFre),
   (LexAttempto = LexAttemptoFre) ;
diff --git a/examples/attempto/AttemptoGer.gf b/examples/attempto/AttemptoGer.gf
index 5d5d28430..a5db09cb3 100644
--- a/examples/attempto/AttemptoGer.gf
+++ b/examples/attempto/AttemptoGer.gf
@@ -1,6 +1,6 @@
 --# -path=.:/Users/aarne/GF/next-lib/present
 
-concrete AttemptoGer of Attempto = SymbolsC ** AttemptoI with
+concrete AttemptoGer of Attempto = SymbolsC, NumeralGer ** AttemptoI with
   (Syntax = SyntaxGer),
   (Symbolic = SymbolicGer),
   (LexAttempto = LexAttemptoGer) ;
diff --git a/examples/attempto/AttemptoI.gf b/examples/attempto/AttemptoI.gf
index 48b8b1a5d..f81631641 100644
--- a/examples/attempto/AttemptoI.gf
+++ b/examples/attempto/AttemptoI.gf
@@ -1,4 +1,4 @@
-incomplete concrete AttemptoI of Attempto = SymbolsC ** open 
+incomplete concrete AttemptoI of Attempto = SymbolsC, Numeral ** open 
   Syntax, 
   Symbolic,
   Prelude,
@@ -8,7 +8,7 @@ in {
 lincat CN = Syntax.CN ;
 lincat NP = Syntax.NP ;
 lincat Card = Syntax.Card ;
-lincat Numeral = Syntax.Numeral ;
+--lincat Numeral = Syntax.Numeral ;
 lincat PN = Syntax.PN ;
 lincat A = Syntax.A ;
 lincat A2 = Syntax.A2 ;
@@ -32,7 +32,7 @@ lincat ACEText = Syntax.Text ;
 lincat RP = Syntax.RP ;
 
 lincat MCN = Syntax.CN ;
-lincat PP = Adv ;
+lincat PP = Syntax.Adv ;
 
 lin aNP = mkNP a_Art ;
 lin theNP = mkNP the_Art ;
@@ -57,10 +57,10 @@ lin allMassNP cn = mkNP all_Predet (mkNP cn) ;
 lin noMassNP = mkNP no_Quant ;
 lin notAllMassNP cn = mkNP not_Predet (mkNP all_Predet (mkNP cn)) ; 
 
-lin one_Card = mkCard n1_Numeral ;
-lin two_Card = mkCard n2_Numeral ;
-lin five_Card = mkCard n5_Numeral ;
-lin ten_Card = mkCard n10_Numeral ;
+---lin one_Card = mkCard n1_Numeral ;
+---lin two_Card = mkCard n2_Numeral ;
+---lin five_Card = mkCard n5_Numeral ;
+---lin ten_Card = mkCard n10_Numeral ;
 
 lin pnNP = mkNP ;
 lin intNP = symb ;
@@ -159,7 +159,6 @@ 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 ;
 
 --lin BasePP p = p ;
@@ -235,7 +234,7 @@ lin whoseIP = mkIP whose_IDet ;
 
 -- 3.6
 
-lin impVP np vp = mkText (mkPhr (mkUtt (mkImp vp)) (mkVoc np)) exclMarkPunct ; 
+lin np_impVP np vp = mkText (mkPhr (mkUtt (mkImp vp)) (mkVoc np)) exclMarkPunct ; 
         ---- John, go to the bank!
 
 
@@ -244,6 +243,15 @@ lin baseText t = t ;
 lin sText = mkText ;
 lin qsText = mkText ;
 
+
+--- more
+
+lin npVP = mkVP ;
+lin impVP vp = mkText (mkImp vp) ;
+lin numeralCard n = mkCard <lin Numeral n : Numeral> ;
+lin digitsCard n = mkCard <lin Digits n : Digits> ;
+lin have_V2 = Syntax.have_V2 ;
+
 }
 
 
diff --git a/examples/attempto/AttemptoIta.gf b/examples/attempto/AttemptoIta.gf
index 55656aaf0..5b71536fc 100644
--- a/examples/attempto/AttemptoIta.gf
+++ b/examples/attempto/AttemptoIta.gf
@@ -1,6 +1,6 @@
 --# -path=.:present
 
-concrete AttemptoIta of Attempto = SymbolsC ** AttemptoI with
+concrete AttemptoIta of Attempto = NumeralIta, SymbolsC ** AttemptoI with
   (Syntax = SyntaxIta),
   (Symbolic = SymbolicIta),
   (LexAttempto = LexAttemptoIta) ;
diff --git a/examples/attempto/AttemptoSwe.gf b/examples/attempto/AttemptoSwe.gf
index f0f1e6249..db8084d9e 100644
--- a/examples/attempto/AttemptoSwe.gf
+++ b/examples/attempto/AttemptoSwe.gf
@@ -1,6 +1,6 @@
 --# -path=.:present
 
-concrete AttemptoSwe of Attempto = SymbolsC ** AttemptoI with
+concrete AttemptoSwe of Attempto = NumeralSwe, SymbolsC ** AttemptoI with
   (Syntax = SyntaxSwe),
   (Symbolic = SymbolicSwe),
   (LexAttempto = LexAttemptoSwe) ;