Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

GrammaticalFramework · Oct 15, 2024 · 9217669 · 9217669
2 parents cc964d1 + e63a3c9
commit 9217669
Show file tree

Hide file tree

Showing 12 changed files with 85,472 additions and 26 deletions.
diff --git a/src/abstract/Extend.gf b/src/abstract/Extend.gf
@@ -305,4 +305,7 @@ fun
 fun
   TPastSimple : Tense ;
 
+fun
+  SubjunctRelCN : CN -> RS -> CN ; -- e.g. Romance languages when subjunctive/conjunctive is needed
+
 }
diff --git a/src/catalan/ExtendCat.gf b/src/catalan/ExtendCat.gf
@@ -1,7 +1,9 @@
 --# -path=alltenses:../common:../abstract:../romance
 concrete ExtendCat of Extend = CatCat ** ExtendRomanceFunctor--  -
-  -- [
-  --   ]
+--  [
+
+
+--     ]
   -- don't forget to put the names of your own
                        -- definitions here
   with
@@ -15,4 +17,6 @@ concrete ExtendCat of Extend = CatCat ** ExtendRomanceFunctor--  -
   ParadigmsCat in {
     -- put your own definitions here
 
+
+
 } ;
diff --git a/src/common/ExtendFunctor.gf b/src/common/ExtendFunctor.gf
@@ -137,6 +137,8 @@ lin
   ExistNPQS t p np = UseQCl t p (QuestCl (ExistNP np)) ;
   ExistIPQS t p np = UseQCl t p (ExistIP np) ;
 
+  SubjunctRelCN cn rs = RelCN cn rs ; -- no difference from indicative
+
 lincat
   X = {s : Str} ;
 

diff --git a/src/french/ExtendFre.gf b/src/french/ExtendFre.gf
@@ -7,7 +7,7 @@ concrete ExtendFre of Extend =
    GenRP,
    ExistCN, ExistMassCN, ExistPluralCN, RNP, ReflRNP,
    PassVPSlash, PassAgentVPSlash, PastPartAP, PastPartAgentAP, ApposNP, CompoundN,
-   BaseVPS, ConsVPS, PredVPS, MkVPS, ConjVPS
+   BaseVPS, ConsVPS, PredVPS, MkVPS, ConjVPS, RelVPS, ExistsNP
    ]                   -- put the names of your own definitions here
   with
     (Grammar = GrammarFre) **
@@ -153,5 +153,16 @@ lin UseDAP = \dap ->
           ! DDir ! tm.t ! tm.a ! p.p ! m
       } ;
     ConjVPS = conjunctDistrTable3 Mood Agr Bool ;
+
+    RelVPS rp vpi = {
+      s = \\m, agr => rp.s ! False ! complAgr agr ! Nom ++ vpi
+                      .s ! m ! (Ag rp.a.g rp.a.n P3) ! False ;
+      c = Nom
+      } ;
+
+    ExistsNP np =
+      mkClause "il" True False np.a
+      (insertComplement (\\_ => (np.s ! Nom).ton)
+         (predV (mkV "exister"))) ;
 
 }
diff --git a/src/french/MakeStructuralFre.gf b/src/french/MakeStructuralFre.gf
@@ -44,6 +44,11 @@ oper
       spn = \\c => prepCase c ++ s ;
       n = Sg ; s2 = \\g => [] ; isNeg = False
     } ;
+    mkDet : Str -> Number -> Det = \s, n -> lin Det {
+      s,sp = \\_,c => prepCase c ++ s ;
+      spn = \\c => prepCase c ++ s ;
+      n = n ; s2 = \\g => [] ; isNeg = False
+    } ;
     mkDet : Str -> Str -> Number -> Det = \m,f,n -> lin Det {
       s,sp = \\g,c => prepCase c ++ case g of {Masc => m ; Fem => f} ;
       spn = \\c => prepCase c ++ m ;

diff --git a/src/italian/ExtendIta.gf b/src/italian/ExtendIta.gf
@@ -2,7 +2,9 @@
 concrete ExtendIta of Extend = CatIta ** ExtendRomanceFunctor  -
    [
    GenRP,
-   PassVPSlash, PassAgentVPSlash
+   PassVPSlash, PassAgentVPSlash,
+   ExistsNP
+
    ]
   -- don't forget to put the names of your own
                        -- definitions here
@@ -14,7 +16,8 @@ concrete ExtendIta of Extend = CatIta ** ExtendRomanceFunctor  -
   MorphoIta,
   Coordination,
   Prelude,
-  ParadigmsIta in {
+  ParadigmsIta,
+  IrregIta in {
     -- put your own definitions here
 
 lin
@@ -45,4 +48,13 @@ oper
          comp  = \\a => vps.comp ! a ++ (let agr = complAgr a in vps.s.s ! VPart agr.g agr.n) ++ agent ;
         } ;
 
+
+lin
+    ExistsNP np =
+      mkClause [] True False np.a
+      (insertComplement (\\_ => (np.s ! Nom).ton)
+         (predV esistere_V)) ;
+
+
+
 }