new big and shallow modules

9 files changed, 122 insertions, 19 deletions

diff --git a/examples/shallow/BigShallowEng.gf b/examples/shallow/BigShallowEng.gf
new file mode 100644
index 000000000..0a474afca
--- /dev/null
+++ b/examples/shallow/BigShallowEng.gf
@@ -0,0 +1,10 @@
+--# -path=.:../big:alltenses:prelude
+
+concrete BigShallowEng of BigShallowEngAbs = 
+  ShallowEng,
+  BigLexEng,
+  IrregEng,
+  ExtraEng-[
+    ComplBareVS,MkVPI
+  ]
+  ** {} ;
diff --git a/examples/shallow/BigShallowEngAbs.gf b/examples/shallow/BigShallowEngAbs.gf
new file mode 100644
index 000000000..e13425a3f
--- /dev/null
+++ b/examples/shallow/BigShallowEngAbs.gf
@@ -0,0 +1,11 @@
+--# -path=.:../big:alltenses:prelude
+
+abstract BigShallowEngAbs = 
+  Shallow,
+  BigLexEngAbs,
+  IrregEngAbs,
+  ExtraEngAbs-[
+    ComplBareVS, -- : VS -> S -> VP ;     -- know you go
+    MkVPI        -- : VP -> VPI ;
+  ]
+  ** {} ;
diff --git a/examples/shallow/BigShallowSwe.gf b/examples/shallow/BigShallowSwe.gf
new file mode 100644
index 000000000..072516254
--- /dev/null
+++ b/examples/shallow/BigShallowSwe.gf
@@ -0,0 +1,10 @@
+--# -path=.:../big:alltenses:prelude
+
+concrete BigShallowSwe of BigShallowSweAbs = 
+  ShallowSwe,
+  BigLexSwe,
+  IrregSwe,
+  ExtraSwe-[
+    ComplBareVS,MkVPI
+  ]
+  ** {} ;
diff --git a/examples/shallow/BigShallowSweAbs.gf b/examples/shallow/BigShallowSweAbs.gf
new file mode 100644
index 000000000..a8a39a3e8
--- /dev/null
+++ b/examples/shallow/BigShallowSweAbs.gf
@@ -0,0 +1,11 @@
+--# -path=.:../big:alltenses:prelude
+
+abstract BigShallowSweAbs = 
+  Shallow,
+  BigLexSweAbs,
+  IrregSweAbs,
+  ExtraSweAbs-[
+    ComplBareVS, -- : VS -> S -> VP ;     -- know you go
+    MkVPI        -- : VP -> VPI ;
+  ]
+  ** {} ;
diff --git a/examples/shallow/Shallow.gf b/examples/shallow/Shallow.gf
index 275221ba0..c521b668e 100644
--- a/examples/shallow/Shallow.gf
+++ b/examples/shallow/Shallow.gf
@@ -1,5 +1,5 @@
-abstract Shallow = Lexicon, Grammar-[
-  VP, 
+abstract Shallow = Grammar-[
+  VP,        --- cat
   ImpersCl,  -- : VP -> Cl ;        -- it rains
   GenericCl, -- : VP -> Cl ;        -- one sleeps
   ProgrVP,   -- : VP -> VP ;        -- be sleeping
@@ -11,19 +11,19 @@ abstract Shallow = Lexicon, Grammar-[
   PredSCVP,  -- : SC -> VP -> Cl ;         -- that you go makes me happy
   ImpVP,     -- : VP -> Imp ;              -- go
   EmbedVP,   -- : VP -> SC ;               -- to go
-  UseV    ,  -- : V   -> VP ;              -- sleep
-  ComplV2 ,  -- : V2  -> NP -> VP ;        -- use it
+  UseV    ,  --- : V   -> VP ;              -- sleep
+  ComplV2 ,  --- : V2  -> NP -> VP ;        -- use it
   ComplV3 ,  -- : V3  -> NP -> NP -> VP ;  -- send a message to her
-  ComplVV ,  -- : VV  -> VP -> VP ;        -- want to run
-  ComplVS ,  -- : VS  -> S  -> VP ;        -- know that she runs
+  ComplVV ,  --- : VV  -> VP -> VP ;        -- want to run
+  ComplVS ,  --- : VS  -> S  -> VP ;        -- know that she runs
   ComplVQ ,  -- : VQ  -> QS -> VP ;        -- ask if she runs
   ComplVA ,  -- : VA  -> AP -> VP ;        -- look red
   ComplV2A,  -- : V2A -> NP -> AP -> VP ;  -- paint the house red
   ReflV2  ,  -- : V2 -> VP ;               -- use itself
-  UseComp ,  -- : Comp -> VP ;             -- be warm
+  UseComp ,  --- : Comp -> VP ;             -- be warm
   PassV2  ,  -- : V2 -> VP ;               -- be used
-  AdvVP   ,  -- : VP -> Adv -> VP ;        -- sleep here
-  AdVVP      -- : AdV -> VP -> VP ;        -- always sleep
+  AdvVP   ,  --- : VP -> Adv -> VP ;        -- sleep here
+  AdVVP      --- : AdV -> VP -> VP ;        -- always sleep
   ]
 ** {
 
@@ -38,11 +38,21 @@ abstract Shallow = Lexicon, Grammar-[
     ConAdV : AdV -> AdVs -> AdVs ;
 
     PredUseV    : NP -> AdVs -> V -> Advs -> Cl ;
-    PredComplV2 : NP -> AdVs -> V2 -> NP -> Advs -> Cl ;
-    PredUseComp : NP -> AdVs -> Comp -> Advs -> Cl ;
+    PredComplV2 : NP -> AdVs -> V2 -> NP -> Cl ;     -- Advs are attached to NP
+    PredComplVS : NP -> AdVs -> VS -> S -> Cl ;      -- Advs are attached to S
+    PredUseComp : NP -> AdVs -> Comp -> Advs -> Cl ; --- could be so here too
+
+    PredComplVV_V    : NP -> AdVs -> VV -> V -> Advs -> Cl ;
+    PredComplVV_V2   : NP -> AdVs -> VV -> V2 -> NP -> Cl ;
+    PredComplVV_Comp : NP -> AdVs -> VV -> Comp -> Advs -> Cl ;
 
     QuestUseV    : IP -> AdVs -> V -> Advs -> QCl ;
-    QuestComplV2 : IP -> AdVs -> V2 -> NP -> Advs -> QCl ;
+    QuestComplV2 : IP -> AdVs -> V2 -> NP -> QCl ;
+    QuestComplVS : IP -> AdVs -> VS -> S -> QCl ;
     QuestUseComp : IP -> AdVs -> Comp -> Advs -> QCl ;
 
+    QuestComplVV_V    : IP -> AdVs -> VV -> V -> Advs -> QCl ;
+    QuestComplVV_V2   : IP -> AdVs -> VV -> V2 -> NP -> QCl ;
+    QuestComplVV_Comp : IP -> AdVs -> VV -> Comp -> Advs -> QCl ;
+
 }
diff --git a/examples/shallow/ShallowEng.gf b/examples/shallow/ShallowEng.gf
index 2580c7746..eacffefc5 100644
--- a/examples/shallow/ShallowEng.gf
+++ b/examples/shallow/ShallowEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:alltenses:prelude
 
-concrete ShallowEng of Shallow = LexiconEng, GrammarEng - [
+concrete ShallowEng of Shallow = GrammarEng - [
   VP, 
   ImpersCl, 
   GenericCl,
diff --git a/examples/shallow/ShallowFre.gf b/examples/shallow/ShallowFre.gf
index 70997aa9c..d8b9002cd 100644
--- a/examples/shallow/ShallowFre.gf
+++ b/examples/shallow/ShallowFre.gf
@@ -1,6 +1,6 @@
 --# -path=.:alltenses:prelude
 
-concrete ShallowFre of Shallow = LexiconFre, GrammarFre - [
+concrete ShallowFre of Shallow = GrammarFre - [
   VP, 
   ImpersCl, 
   GenericCl,
diff --git a/examples/shallow/ShallowI.gf b/examples/shallow/ShallowI.gf
index 3754a526f..e8669d9f5 100644
--- a/examples/shallow/ShallowI.gf
+++ b/examples/shallow/ShallowI.gf
@@ -1,4 +1,4 @@
-incomplete concrete ShallowI of Shallow = Lexicon, Grammar-[
+incomplete concrete ShallowI of Shallow = Grammar-[
   VP, 
   ImpersCl,  -- : VP -> Cl ;        -- it rains
   GenericCl, -- : VP -> Cl ;        -- one sleeps
@@ -39,16 +39,34 @@ incomplete concrete ShallowI of Shallow = Lexicon, Grammar-[
 
     PredUseV np adVs v advs = 
       PredVP np (AdvVP (AdVVP adVs (UseV v)) advs) ;
-    PredComplV2 np adVs v ob advs = 
-      PredVP np (AdvVP (AdVVP adVs (ComplV2 v ob)) advs) ;
+    PredComplV2 np adVs v ob = 
+      PredVP np (AdVVP adVs (ComplV2 v ob)) ;
+    PredComplVS np adVs v ob = 
+      PredVP np (AdVVP adVs (ComplVS v ob)) ;
     PredUseComp np adVs v advs = 
       PredVP np (AdvVP (AdVVP adVs (UseComp v)) advs) ;
 
+    PredComplVV_V np adVs vv v advs = 
+      PredVP np (AdvVP (AdVVP adVs (ComplVV vv (UseV v))) advs) ;
+    PredComplVV_V2 np adVs vv v2 ob = 
+      PredVP np (AdVVP adVs (ComplVV vv (ComplV2 v2 ob))) ;
+    PredComplVV_Comp np adVs vv v advs = 
+      PredVP np (AdvVP (AdVVP adVs (ComplVV vv (UseComp v))) advs) ;
+
     QuestUseV np adVs v advs = 
       QuestVP np (AdvVP (AdVVP adVs (UseV v)) advs) ;
-    QuestComplV2 np adVs v ob advs = 
-      QuestVP np (AdvVP (AdVVP adVs (ComplV2 v ob)) advs) ;
+    QuestComplV2 np adVs v ob = 
+      QuestVP np (AdVVP adVs (ComplV2 v ob)) ;
+    QuestComplVS np adVs v ob = 
+      QuestVP np (AdVVP adVs (ComplVS v ob)) ;
     QuestUseComp np adVs v advs = 
       QuestVP np (AdvVP (AdVVP adVs (UseComp v)) advs) ;
 
+    QuestComplVV_V np adVs vv v advs = 
+      QuestVP np (AdvVP (AdVVP adVs (ComplVV vv (UseV v))) advs) ;
+    QuestComplVV_V2 np adVs vv v2 ob = 
+      QuestVP np (AdVVP adVs (ComplVV vv (ComplV2 v2 ob))) ;
+    QuestComplVV_Comp np adVs vv v advs = 
+      QuestVP np (AdvVP (AdVVP adVs (ComplVV vv (UseComp v))) advs) ;
+
 }
diff --git a/examples/shallow/ShallowSwe.gf b/examples/shallow/ShallowSwe.gf
new file mode 100644
index 000000000..9163b575d
--- /dev/null
+++ b/examples/shallow/ShallowSwe.gf
@@ -0,0 +1,33 @@
+--# -path=.:alltenses:prelude
+
+concrete ShallowSwe of Shallow = GrammarSwe - [
+  VP, 
+  ImpersCl, 
+  GenericCl,
+  ProgrVP,  
+  ImpPl1,   
+  UttVP,    
+  QuestVP,  
+  RelVP,    
+  PredVP,   
+  PredSCVP, 
+  ImpVP,    
+  EmbedVP,  
+  UseV    , 
+  ComplV2 , 
+  ComplV3 , 
+  ComplVV , 
+  ComplVS , 
+  ComplVQ , 
+  ComplVA , 
+  ComplV2A, 
+  ReflV2  , 
+  UseComp , 
+  PassV2  , 
+  AdvVP   , 
+  AdVVP     
+  ]
+
+** ShallowI with 
+  (Grammar = GrammarSwe) ;
+