bronzeage

19 files changed, 148 insertions, 9 deletions

diff --git a/examples/bronzeage/Bronzeage.gf b/examples/bronzeage/Bronzeage.gf
new file mode 100644
index 000000000..0c1bf58c8
--- /dev/null
+++ b/examples/bronzeage/Bronzeage.gf
@@ -0,0 +1,31 @@
+abstract Bronzeage = Cat, Swadesh ** {
+
+  cat
+    Sent ;
+
+  fun
+    PhrPos    : Sent -> Phr ;
+    PhrNeg    : Sent -> Phr ;
+    PhrQuest  : Sent -> Phr ;
+    PhrImp    : Imp  -> Phr ;    
+    PhrImpNeg : Imp  -> Phr ;    
+
+    SentV  : V  -> NP -> Sent ;
+    SentV2 : V2 -> NP -> NP -> Sent ;
+    SentV3 : V3 -> NP -> NP -> NP -> Sent ;
+    SentA  : A  -> NP -> Sent ;
+    SentNP : NP -> NP -> Sent ;
+
+    SentAdvV  : V  -> NP -> Adv -> Sent ;
+    SentAdvV2 : V2 -> NP -> NP -> Adv -> Sent ;
+
+    ImpV  : V -> Imp ;
+    ImpV2 : V2 -> NP -> Imp ;
+
+    DetCN : Det -> CN -> NP ;
+    NumCN : Num -> CN -> NP ;
+
+    UseN  : N -> CN ;
+    ModCN : A -> CN -> CN ;
+
+}
diff --git a/examples/bronzeage/BronzeageEng.gf b/examples/bronzeage/BronzeageEng.gf
new file mode 100644
index 000000000..ab67eba67
--- /dev/null
+++ b/examples/bronzeage/BronzeageEng.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:prelude:resource-1.0/swadesh
+
+concrete BronzeageEng of Bronzeage = CatEng, SwadeshEng ** BronzeageI with
+  (Lang = LangEng),
+  (Swadesh = SwadeshEng) ;
+
diff --git a/examples/bronzeage/BronzeageFin.gf b/examples/bronzeage/BronzeageFin.gf
new file mode 100644
index 000000000..762f6915b
--- /dev/null
+++ b/examples/bronzeage/BronzeageFin.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:resource-1.0/swadesh
+
+concrete BronzeageFin of Bronzeage = CatFin, SwadeshFin **  BronzeageI with
+  (Lang = LangFin),
+  (Swadesh = SwadeshFin) ;
+
diff --git a/examples/bronzeage/BronzeageFre.gf b/examples/bronzeage/BronzeageFre.gf
new file mode 100644
index 000000000..eee718fa5
--- /dev/null
+++ b/examples/bronzeage/BronzeageFre.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:prelude:resource-1.0/swadesh
+
+concrete BronzeageFre of Bronzeage = CatFre, SwadeshFre **  BronzeageI with
+  (Lang = LangFre),
+  (Swadesh = SwadeshFre) ;
+
diff --git a/examples/bronzeage/BronzeageGer.gf b/examples/bronzeage/BronzeageGer.gf
new file mode 100644
index 000000000..6c0a083de
--- /dev/null
+++ b/examples/bronzeage/BronzeageGer.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:resource-1.0/swadesh
+
+concrete BronzeageGer of Bronzeage = CatGer, SwadeshGer **  BronzeageI with
+  (Lang = LangGer),
+  (Swadesh = SwadeshGer) ;
+
diff --git a/examples/bronzeage/BronzeageI.gf b/examples/bronzeage/BronzeageI.gf
new file mode 100644
index 000000000..6c1ab8746
--- /dev/null
+++ b/examples/bronzeage/BronzeageI.gf
@@ -0,0 +1,51 @@
+incomplete concrete BronzeageI of Bronzeage = Cat, Swadesh ** open Lang in {
+
+  flags 
+    startcat = Phr ; optimize = all_subs ;
+    unlexer = text ; lexer = text ;
+
+  lincat
+    Sent = {s : SForm => Str} ; 
+
+  lin
+    PhrPos sent = {s = sent.s ! SPos ++ "."} ;
+    PhrNeg sent = {s = sent.s ! SNeg ++ "."} ;
+    PhrQuest sent = {s = sent.s ! SQuest ++ "?"} ;
+    PhrImp imp = {s = (PhrUtt NoPConj (UttImpSg PPos imp) NoVoc).s ++ "!"} ;
+    PhrImpNeg imp = {s = (PhrUtt NoPConj (UttImpSg PNeg imp) NoVoc).s ++ "!"} ;
+    
+    SentV  v np = mkSent np (UseV v) ;
+
+    SentV2 v x y = mkSent x (ComplV2 v y) ;
+    SentV3 v x y z = mkSent x (ComplV3 v y z) ;
+    SentA  a x = mkSent x (UseComp (CompAP (PositA a))) ;
+    SentNP a x = mkSent x (UseComp (CompNP a)) ;
+
+    SentAdvV  v np adv = mkSent np (AdvVP (UseV v) adv) ;
+    SentAdvV2 v x y adv = mkSent x (AdvVP (ComplV2 v y) adv) ;
+
+    ImpV v = ImpVP (UseV v) ;
+    ImpV2 v x = ImpVP (ComplV2 v x) ;
+
+    DetCN d n = DetCN d n ;
+    NumCN n cn = DetCN (DetPl (PlQuant IndefArt) n NoOrd) cn ;
+
+    UseN n = UseN n ;
+    ModCN a n = AdjCN (PositA a) n ;
+
+  param
+    SForm = SPos | SNeg | SQuest ;
+
+  oper
+    mkSent : NP -> VP -> Sent ;
+    mkSent np vp = 
+      let cl = PredVP np vp
+      in {
+        s = table {
+          SPos   => Predef.toStr S  (UseCl TPres ASimul PPos cl) ;
+          SNeg   => Predef.toStr S  (UseCl TPres ASimul PNeg cl) ;
+          SQuest => Predef.toStr QS (UseQCl TPres ASimul PPos (QuestCl cl))
+          } ;
+        lock_Sent = <>
+      } ;
+}
diff --git a/examples/bronzeage/BronzeageIta.gf b/examples/bronzeage/BronzeageIta.gf
new file mode 100644
index 000000000..24da6a1f4
--- /dev/null
+++ b/examples/bronzeage/BronzeageIta.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:prelude:resource-1.0/swadesh
+
+concrete BronzeageIta of Bronzeage = CatIta, SwadeshIta **  BronzeageI with
+  (Lang = LangIta),
+  (Swadesh = SwadeshIta) ;
+
diff --git a/examples/bronzeage/BronzeageNor.gf b/examples/bronzeage/BronzeageNor.gf
new file mode 100644
index 000000000..8287d5fe0
--- /dev/null
+++ b/examples/bronzeage/BronzeageNor.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:prelude:resource-1.0/swadesh
+
+concrete BronzeageNor of Bronzeage = CatNor, SwadeshNor **  BronzeageI with
+  (Lang = LangNor),
+  (Swadesh = SwadeshNor) ;
+
diff --git a/examples/bronzeage/BronzeageSpa.gf b/examples/bronzeage/BronzeageSpa.gf
new file mode 100644
index 000000000..3d8154796
--- /dev/null
+++ b/examples/bronzeage/BronzeageSpa.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:prelude:resource-1.0/swadesh
+
+concrete BronzeageSpa of Bronzeage = CatSpa, SwadeshSpa **  BronzeageI with
+  (Lang = LangSpa),
+  (Swadesh = SwadeshSpa) ;
+
diff --git a/examples/bronzeage/BronzeageSwe.gf b/examples/bronzeage/BronzeageSwe.gf
new file mode 100644
index 000000000..053a20406
--- /dev/null
+++ b/examples/bronzeage/BronzeageSwe.gf
@@ -0,0 +1,6 @@
+--# -path=.:compiled:prelude:resource-1.0/swadesh
+
+concrete BronzeageSwe of Bronzeage = CatSwe, SwadeshSwe **  BronzeageI with
+  (Lang = LangSwe),
+  (Swadesh = SwadeshSwe) ;
+
diff --git a/examples/stoneage1/StoneageEng.gf b/examples/stoneage1/StoneageEng.gf
index cc8de20a0..2d2a166f5 100644
--- a/examples/stoneage1/StoneageEng.gf
+++ b/examples/stoneage1/StoneageEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageEng of Stoneage = StoneageI with
-  (Lang = LangEng),
+  (Mathematical = MathematicalEng),
   (Swadesh = SwadeshEng) ;
 
diff --git a/examples/stoneage1/StoneageFin.gf b/examples/stoneage1/StoneageFin.gf
index 6efe406b7..6a7763bc7 100644
--- a/examples/stoneage1/StoneageFin.gf
+++ b/examples/stoneage1/StoneageFin.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:resource-1.0/swadesh
 
 concrete StoneageFin of Stoneage = StoneageI with
-  (Lang = LangFin),
+  (Mathematical = MathematicalFin),
   (Swadesh = SwadeshFin) ;
 
diff --git a/examples/stoneage1/StoneageFre.gf b/examples/stoneage1/StoneageFre.gf
index 8f6986022..dcd310826 100644
--- a/examples/stoneage1/StoneageFre.gf
+++ b/examples/stoneage1/StoneageFre.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageFre of Stoneage = StoneageI with
-  (Lang = LangFre),
+  (Mathematical = MathematicalFre),
   (Swadesh = SwadeshFre) ;
 
diff --git a/examples/stoneage1/StoneageGer.gf b/examples/stoneage1/StoneageGer.gf
index f13b731d5..b7a896770 100644
--- a/examples/stoneage1/StoneageGer.gf
+++ b/examples/stoneage1/StoneageGer.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:resource-1.0/swadesh
 
 concrete StoneageGer of Stoneage = StoneageI with
-  (Lang = LangGer),
+  (Mathematical = MathematicalGer),
   (Swadesh = SwadeshGer) ;
 
diff --git a/examples/stoneage1/StoneageI.gf b/examples/stoneage1/StoneageI.gf
index 392fc6ebf..50a76c9e4 100644
--- a/examples/stoneage1/StoneageI.gf
+++ b/examples/stoneage1/StoneageI.gf
@@ -1,4 +1,4 @@
-incomplete concrete StoneageI of Stoneage = open Lang, Swadesh in { 
+incomplete concrete StoneageI of Stoneage = open Mathematical, Swadesh in { 
 
 flags
   startcat=S ;
@@ -230,6 +230,14 @@ lin
 oper
 
   PresV : V -> NP -> Phr = \v,s -> 
+    PhrUtt NoPConj (UttS (PosCl (predV v s))) NoVoc ;
+  PresV2 : V2 -> NP -> NP -> Phr = \v,s,o -> 
+    PhrUtt NoPConj (UttS (PosCl (predV2 v s o))) NoVoc ;
+  PresV3 : V3 -> NP -> NP -> NP -> Phr = \v,s,o,r -> 
+    PhrUtt NoPConj (UttS (PosCl (predV3 v s o r))) NoVoc ;
+
+{-
+  PresV : V -> NP -> Phr = \v,s -> 
     PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos 
       (PredVP s (UseV v)))) NoVoc ;
   PresV2 : V2 -> NP -> NP -> Phr = \v,s,o -> 
@@ -238,6 +246,7 @@ oper
   PresV3 : V3 -> NP -> NP -> NP -> Phr = \v,s,o,r -> 
     PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos 
       (PredVP s (ComplV3 v o r)))) NoVoc ;
+-}
 
   ModA : A -> CN -> CN = \a ->
     AdjCN (PositA a) ;
diff --git a/examples/stoneage1/StoneageIta.gf b/examples/stoneage1/StoneageIta.gf
index 8d0b7e4e9..8cf815f15 100644
--- a/examples/stoneage1/StoneageIta.gf
+++ b/examples/stoneage1/StoneageIta.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageIta of Stoneage = StoneageI with
-  (Lang = LangIta),
+  (Mathematical = MathematicalIta),
   (Swadesh = SwadeshIta) ;
 
diff --git a/examples/stoneage1/StoneageNor.gf b/examples/stoneage1/StoneageNor.gf
index ec0f54ce8..86a88f995 100644
--- a/examples/stoneage1/StoneageNor.gf
+++ b/examples/stoneage1/StoneageNor.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageNor of Stoneage = StoneageI with
-  (Lang = LangNor),
+  (Mathematical = MathematicalNor),
   (Swadesh = SwadeshNor) ;
 
diff --git a/examples/stoneage1/StoneageSpa.gf b/examples/stoneage1/StoneageSpa.gf
index 3f8b908b6..73cb60e21 100644
--- a/examples/stoneage1/StoneageSpa.gf
+++ b/examples/stoneage1/StoneageSpa.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageSpa of Stoneage = StoneageI with
-  (Lang = LangSpa),
+  (Mathematical = MathematicalSpa),
   (Swadesh = SwadeshSpa) ;
 
diff --git a/examples/stoneage1/StoneageSwe.gf b/examples/stoneage1/StoneageSwe.gf
index 376c34896..b8383ba8e 100644
--- a/examples/stoneage1/StoneageSwe.gf
+++ b/examples/stoneage1/StoneageSwe.gf
@@ -1,6 +1,6 @@
 --# -path=.:compiled:prelude:resource-1.0/swadesh
 
 concrete StoneageSwe of Stoneage = StoneageI with
-  (Lang = LangSwe),
+  (Mathematical = MathematicalSwe),
   (Swadesh = SwadeshSwe) ;