(Ara) Conjunctions, ComplV*, additions in Idiom&Construction, etc.

2018-11-14 15:48:20 +01:00
parent 0373d2cd18
commit b89aa34bfd
15 changed files with 385 additions and 207 deletions
@@ -1,45 +1,80 @@
 concrete ConjunctionAra of Conjunction = 
  CatAra ** open ResAra, Coordination, Prelude in {
--
--  flags optimize=all_subs ;
--
--  lin
--
--    ConjS = conjunctSS ;
--    DConjS = conjunctDistrSS ;
--
--    ConjAdv = conjunctSS ;
--    DConjAdv = conjunctDistrSS ;
--
--    ConjNP conj ss = conjunctTable Case conj ss ** {
--      a = {n = conjNumber conj.n ss.a.n ; p = ss.a.p}
--      } ;
--    DConjNP conj ss = conjunctDistrTable Case conj ss ** {
--      a = {n = conjNumber conj.n ss.a.n ; p = ss.a.p}
--      } ;
--
--    ConjAP conj ss = conjunctTable Agr conj ss ** {
--      isPre = ss.isPre
--      } ;
--    DConjAP conj ss = conjunctDistrTable Agr conj ss ** {
--      isPre = ss.isPre
--      } ;
--
---- These fun's are generated from the list cat's.
--
--    BaseS = twoSS ;
--    ConsS = consrSS comma ;
--    BaseAdv = twoSS ;
--    ConsAdv = consrSS comma ;
--    BaseNP x y = twoTable Case x y ** {a = conjAgr x.a y.a} ;
--    ConsNP xs x = consrTable Case comma xs x ** {a = conjAgr xs.a x.a} ;
--    BaseAP x y = twoTable Agr x y ** {isPre = andB x.isPre y.isPre} ;
--    ConsAP xs x = consrTable Agr comma xs x ** {isPre = andB xs.isPre x.isPre} ;
--
--  lincat
--    [S] = {s1,s2 : Str} ;
--    [Adv] = {s1,s2 : Str} ;
--    [NP] = {s1,s2 : Case => Str ; a : Agr} ;
--    [AP] = {s1,s2 : Agr => Str ; isPre : Bool} ;
--
+
+lincat
+
+  [S],
+  [Adv] = {s1,s2 : Str} ;
+  [NP] = {s1,s2 : Case => Str ; a : Agr ; empty : Str} ;
+  [AP] = {s1,s2 : Species => Gender => Number => State => Case => Str} ;
+
+lin
+
+  BaseS,
+  BaseAdv = twoSS ;
+  ConsS,
+  ConsAdv = consrSS comma ;
+  ConjS,
+  ConjAdv = conjunctSS ;
+
+  BaseNP x y = twoTable Case x y ** {
+    a = conjAgr x.a y.a ;
+    empty = []
+    } ;
+  ConsNP xs x = consrTable Case comma xs x ** {
+    a = conjAgr xs.a x.a ;
+    empty = []
+    } ;
+  ConjNP conj ss = conjunctTable Case conj ss ** {
+    a = let gn = pgn2gn ss.a.pgn in 
+        {pgn = Per3 gn.g (conjNumber conj.n gn.n) ; isPron = False} ;
+    empty = []
+    } ;
+
+  BaseAP x y = twoTable5 Species  Gender  Number  State  Case x y  ;
+  ConsAP xs x = consrTable5 Species  Gender  Number  State  Case comma xs x ;
+  ConjAP conj ss = conjunctTable5 Species  Gender  Number  State  Case conj ss ;
+
+
+oper
+  conjAgr : Agr -> Agr -> Agr = \a,b -> {
+    isPron = False ;
+    pgn = let gnA = pgn2gn a.pgn ; gnB = pgn2gn b.pgn in
+    	  Per3 (conjGender gnA.g gnB.g) (conjNumber gnA.n gnB.n)
+    } ;
+
+  conjGender : Gender -> Gender -> Gender = \g,h ->
+    case g of {Fem => h ; _ => Masc} ;
+
+  conjNumber : Number -> Number -> Number = \m,n ->
+    case m of {Sg => n ; _ => Pl} ;
+
+  -- move to predef?
+
+  ListTable5 : PType -> PType -> PType -> PType -> PType -> Type = \P,Q,R,T,S -> 
+    {s1,s2 : P => Q => R => T => S => Str} ; 
+
+  twoTable5 : (P,Q,R,T,S : PType) -> (_,_ : {s : P => Q => R => T => S => Str}) -> 
+              ListTable5 P Q R T S = 
+    \_,_,_,_,_,x,y ->
+    {s1 = x.s ; s2 = y.s} ; 
+
+  consrTable5 : 
+    (P,Q,R,T,S : PType) -> Str -> {s : P => Q => R => T => S => Str} -> 
+       ListTable5 P Q R T S -> ListTable5 P Q R T S =
+     \P,Q,R,T,S,c,x,xs ->
+    {s1 = \\p,q,r,t,s => xs.s1 ! p ! q ! r ! t ! s ++ c ++ xs.s2 ! p ! q ! r ! t ! s ; 
+     s2 = x.s
+    } ; 
+
+  conjunctTable5 : 
+    (P,Q,R,T,S : PType) -> Conjunction -> ListTable5 P Q R T S -> {s : P => Q => R => T => S => Str} = 
+    \P,Q,R,T,S,or,xs ->
+    {s = \\p,q,r,t,s => xs.s1 ! p ! q ! r ! t ! s ++ or.s ++ xs.s2 ! p ! q ! r ! t ! s} ;
+
+  -- conjunctDistrTable5 : 
+  --   (P,Q,R,T,S : PType) -> ConjunctionDistr -> ListTable5 P Q R T S -> 
+  --      {s : P => Q => R => T => S => Str} = 
+  --   \P,Q,R,T,S,or,xs ->
+  --   {s = \\p,q,r,t,s => or.s1++ xs.s1 ! p ! q ! r ! t ! s ++ or.s2 ++ xs.s2 ! p ! q ! r ! t ! s} ;
 }