functorized Query and added Swe

1 files changed, 14 insertions, 186 deletions

diff --git a/examples/query/QueryEng.gf b/examples/query/QueryEng.gf
index 7ab5c2ef5..0cd9c74b7 100644
--- a/examples/query/QueryEng.gf
+++ b/examples/query/QueryEng.gf
@@ -1,6 +1,11 @@
 --# -path=.:present
 
-concrete QueryEng of Query = open
+concrete QueryEng of Query = QueryI with 
+  (Syntax = SyntaxEng),
+  (Lang = LangEng),
+  (LexQuery = LexQueryEng) **
+open
+  LexQueryEng,
   ParadigmsEng,
   IrregEng,
   SyntaxEng,
@@ -10,193 +15,10 @@ concrete QueryEng of Query = open
   Prelude
 in {
 
-lincat
-  Move = Utt ; ---- Text ;
-  Query = Utt ;
-  Answer = Cl ; -- Utt ;
-  Set = NP ;
-  Interrogative = IP ;
-  Function = {cn : CN ; prep : Prep} ;
-  Kind = CN ;
-  Property = {ap : AP ; vp : VP} ;
-  Relation = {ap : AP ; vp : VP ; prep : Prep} ;
-  Individual = NP ;
-  Name = NP ;
-  [Individual] = [NP] ;
-
-lin
-  MQuery  q = q ; ---- mkText (mkPhr q) questMarkPunct ;
-  MAnswer a = mkUtt a ; ---- mkText (mkPhr a) fullStopPunct ;
- 
-  QSet s = 
-    let 
-     ss : NP = s 
-        | mkNP (mkNP theSg_Det L.name_N) (mkAdv possess_Prep s)
-        | mkNP (mkNP thePl_Det L.name_N) (mkAdv possess_Prep s)
-        | mkNP (GenNP s) sgNum L.name_N 
-        | mkNP (GenNP s) plNum L.name_N ;
-    in 
-      mkUtt (mkImp (mkVP give_V3 ss (mkNP i_Pron)))
-    | mkUtt (mkQS (mkQCl (L.CompIP whatSg_IP) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP (L.IdetIP (mkIDet which_IQuant))) ss))
-    | mkUtt ss ;
-
-  QWhere s = 
-      mkUtt (mkQS (mkQCl where_IAdv s))
-    | mkUtt (mkQS (mkQCl where_IAdv (mkCl s (mkA "located" | mkA "situated")))) ;
-  QWhat i p = mkUtt (mkQS (mkQCl i p.vp)) ;
-  QWhatWhat i j p = mkUtt (mkQS (QuestQVP i (AdvQVP p.vp (mkIAdv p.prep j)))) ;
-  QWhatWhere i p = mkUtt (mkQS (QuestQVP i (AdvQVP p.vp where_IAdv))) ;
-  QRelWhere s p = mkUtt (mkQS (mkQCl where_IAdv (mkCl s p.vp))) ;
-
-  QFun r s = 
-      mkUtt 
-        (mkImp (mkVP give_V3 
-          (mkNP and_Conj s (mkNP (mkQuant they_Pron) plNum r.cn)) (mkNP i_Pron)))
-    | mkUtt (mkQS (mkQCl (mkIP what_IQuant plNum r.cn) s have_V2))
-    | mkUtt (mkQS (mkQCl whatSg_IP 
-        (mkClSlash (mkClSlash s have_V2) (mkAdv as_Prep (mkNP aPl_Det r.cn))))) ; 
-
-  QFunPair s f = 
-    let 
-     ss0 : NP = s 
-              | mkNP (mkNP thePl_Det L.name_N) (mkAdv possess_Prep s) ;
-     ss  : NP = mkNP and_Conj ss0 (mkNP (mkQuant they_Pron) plNum f.cn)
-              | mkNP ss0 (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum f.cn))
-    in 
-      mkUtt (mkImp (mkVP give_V3 ss (mkNP i_Pron)))
-    | mkUtt (mkQS (mkQCl (L.CompIP whatPl_IP) ss))
-    | mkUtt (mkQS (mkQCl (L.CompIP (L.IdetIP (mkIDet which_IQuant))) ss))
-    | mkUtt ss ;
-
-  QInfo  s = 
-    let
-      info : NP = mkNP (all_NP | (mkNP information_N)) (mkAdv about_Prep s) ;
-    in
-      mkUtt (mkImp (mkVP give_V3 info (mkNP i_Pron)))
-    | mkUtt (mkQCl whatSg_IP 
-        (mkClSlash (mkClSlash (mkNP youSg_Pron) (mkV2 know_V)) (mkAdv about_Prep s)))
-    | mkUtt info ;
-
-  QCalled i = mkUtt (mkQS (mkQCl how_IAdv (mkCl i 
-    (mkVP (also_AdV | otherwise_AdV) (mkVP called_A))))) ;
-
-  QWhether a = mkUtt (mkQS a) ;
-
-  AKind s k = (mkCl s (L.UseComp (L.CompCN k))) ;
-  AInd s i = (mkCl s i) ;
-  AName s n = (mkCl n (mkNP the_Det (mkCN L.name_N (mkAdv possess_Prep s)))) ;
-  AProp s p = (mkCl s p.vp) ;
-
-  SAll k = mkNP all_Predet (mkNP aPl_Det k) | mkNP thePl_Det k ;
-  SFun s r = mkNP (GenNP s) plNum r.cn | mkNP (GenNP s) sgNum r.cn ;
-  SOne k = mkNP n1_Numeral k ;
-  SIndef k = mkNP a_Det k ;
-  SDef k = mkNP the_Det k ;
-  SPlural k = mkNP aPl_Det k ;
-  SOther k = mkNP aPl_Det (mkCN other_A k) ;
-  SInd i = i ;
-  SInds is = mkNP and_Conj is ;
-
-  IWhich k = 
-      mkIP what_IQuant  (sgNum | plNum) k
-    | mkIP which_IQuant (sgNum | plNum) k ;
-
-  IWho = whoSg_IP | whoPl_IP ;
-  IWhat = whatSg_IP | whatPl_IP ;
-
-  KFunSet r s = 
-     mkCN r.cn (mkAdv r.prep s) ;
-
-  KFunsSet r q s = 
-     mkCN (ConjCN and_Conj (BaseCN r.cn q.cn)) (mkAdv r.prep s) ;
-
-  KFunKind k r s = 
-    mkCN k (mkRS (mkRCl that_RP (mkVP (mkNP aPl_Det (mkCN r.cn (mkAdv r.prep s)))))) ;
-  
-  KFunPair k r = mkCN k (mkAdv with_Prep (mkNP (mkQuant they_Pron) plNum r.cn)) ;
-  KProp p k = 
-     mkCN p.ap k 
-   | mkCN k (mkRS (mkRCl that_RP p.vp)) ;
-  KFun r = r.cn ;
-
-  IName n = n ;
-
-  PCalled  i  = propCalled i ;
-  PCalleds is = propCalled (mkNP or_Conj is) ;
-
-  PIs i = propVP (mkVP i) ;
-
-  PRelation r s = {
-    ap = AdvAP r.ap (mkAdv r.prep s) ; 
-    vp = mkVP r.vp (mkAdv r.prep s)
-    } ;
-
-  BaseIndividual = mkListNP ;
-  ConsIndividual = mkListNP ;
-
-oper
--- structural words
-  about_Prep = mkPrep "about" ;
-  all_NP = mkNP (mkPN "all") ; ---
-  also_AdV = mkAdV "also" ;
-  also_AdA = mkAdA "also" ;
-  as_Prep = mkPrep "as" ;
-  at_Prep = mkPrep "at" ;
-  called_A = mkA "called" | mkA "named" ;
-  give_V3 = mkV3 give_V ;
-  information_N = mkN "information" ;
-  other_A = mkA "other" ;
-  otherwise_AdV = mkAdV "otherwise" ;
-  otherwise_AdA = mkAdA "otherwise" ;
-  what_IQuant = M.mkIQuant "what" "what" ;
-
--- lexical constructors
-  mkName : Str -> NP = 
-    \s -> mkNP (mkPN s) ;
-  mkFunction : Str -> {cn : CN ; prep : Prep} = 
-    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
-
-  propAP : AP -> {ap : AP ; vp : VP} = \ap -> {
-    ap = ap ;
-    vp = mkVP ap
-    } ;
-
-  propVP : VP -> {ap : AP ; vp : VP} = \vp -> {
-    ap = PartVP vp ;
-    vp = vp
-    } ;
-
-  relAP : AP -> Prep -> {ap : AP ; vp : VP ; prep : Prep} = \ap,p -> {
-    ap = ap ;
-    vp = mkVP ap ;
-    prep = p
-    } ;
-
-  relVP : VP -> Prep -> {ap : AP ; vp : VP ; prep : Prep} = \vp,p -> {
-    ap = PartVP vp ;
-    vp = vp ;
-    prep = p
-    } ;
-
-  propCalled : NP -> {ap : AP ; vp : VP} = \i -> 
-    propAP (mkAP (also_AdA | otherwise_AdA) (mkAP (mkA2 called_A []) i)) ;
-
-  noPrep : Prep = mkPrep [] ;
-
 -- lexicon
 
-lincat
-  Country = {np : NP ; a : A} ;
-  JobTitle = CN ;
 lin
-  NCountry c = c.np ;
-  PCountry c = propAP (mkAP c.a) ;
-
-  Located = 
-      relAP (mkAP (mkA "located")) in_Prep
-    | relAP (mkAP (mkA "situated")) in_Prep
-    ;
+  Located = relAP (mkAP located_A) in_Prep ;
 
   In = relVP UseCopula in_Prep ;
 
@@ -211,7 +33,7 @@ lin
 
   HaveTitle = 
       relAP (mkAP (mkA "employed")) as_Prep
-    --- | relVP UseCopula noPrep
+    | relVP UseCopula noPrep
     | relVP (mkVP (mkV "work")) as_Prep
     | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title"))))) possess_Prep
     ;
@@ -275,4 +97,10 @@ oper
   mkCountry : Str -> Str -> {np : NP ; a : A} = 
     \n,a -> {np = mkNP (mkPN n) ; a = mkA a} ;
 
+  mkName : Str -> NP = 
+    \s -> mkNP (mkPN s) ;
+  mkFunction : Str -> Fun =
+    \s -> {cn = mkCN (mkN s) ; prep = possess_Prep} ;
+
+
 }