(Ger) Corrections of determiners in Structural, DetQuantOrd in Noun. …

…Additions to Extend
hleiss · Jan 8, 2024 · 4249c33 · 4249c33
1 parent 55f8f5e
commit 4249c33
Show file tree

Hide file tree

Showing 11 changed files with 283 additions and 188 deletions.
diff --git a/src/german/AllGer.gf b/src/german/AllGer.gf
@@ -3,7 +3,6 @@
 concrete AllGer of AllGerAbs =
   LangGer,
   IrregGer,
-----  ExtendGer, ---- to replace ExtraGer
-  ExtraGer
-  ** open ExtendGer in {} ---- to force compilation
+  ExtendGer
+  ** open ExtraGer in {} ---- to force compilation
   ;
diff --git a/src/german/AllGerAbs.gf b/src/german/AllGerAbs.gf
@@ -1,8 +1,7 @@
---# -path=.:../abstract:../common:prelude
+--# -path=.:../abstract:../common:../prelude
 
 abstract AllGerAbs = 
   Lang,
   IrregGerAbs,
-----  Extend,
-  ExtraGerAbs
+  Extend
   ** {} ;
diff --git a/src/german/CatGer.gf b/src/german/CatGer.gf
@@ -67,7 +67,7 @@ concrete CatGer of Cat =
     Quant = {
       s,sp : GenNum => Case => Str ;
       a : Adjf ;
-      hasDefArt : Bool ;
+      isDefArt : Bool ;
       delCardOne : Bool -- delete following cardinal 1 (IndefArt and no_Quant)
       } ;
     Predet = {
@@ -94,18 +94,19 @@ concrete CatGer of Cat =
 
 -- Open lexical classes, e.g. Lexicon
 
-    V, VA, VS, VQ = ResGer.Verb ; -- = {s : VForm => Str} ;
+    V, VA, VS, VQ = Verb ; -- = {s : VForm => Str} ;
     VV = Verb ** {isAux : Bool} ;
     V2, V2A, V2S, V2Q = Verb ** {c2 : Preposition} ;
     V2V = Verb ** {c2 : Preposition ; isAux : Bool ; objCtrl : Bool} ;
     V3 = Verb ** {c2, c3 : Preposition} ;
 
-    A  = {s : Degree => AForm => Str} ;
-    A2 = {s : Degree => AForm => Str ; c2 : Preposition} ;
+    A  = Adjective ; -- = {s : Degree => AForm => Str} ;
+    A2 = Adjective ** {c2 : Preposition} ;
 
-    N  = ResGer.Noun ;
-    N2 = ResGer.Noun ** {c2 : Preposition} ;
-    N3 = ResGer.Noun ** {c2,c3 : Preposition} ;
+    N  = Noun ; -- {s : Number => Case => Str ; co : Str ;
+                --  uncap : {s: Number => Case => Str ; co : Str} ; g : Gender}
+    N2 = Noun ** {c2 : Preposition} ;
+    N3 = Noun ** {c2,c3 : Preposition} ;
     GN = {s : Case => Str; g : Sex} ;
     SN = {s : Sex => Case => Str} ;
     PN = {s : Case => Str; g : Gender; n : Number} ;

diff --git a/src/german/ConstructionGer.gf b/src/german/ConstructionGer.gf
@@ -2,7 +2,7 @@
 
 concrete ConstructionGer of Construction = CatGer **
   open SyntaxGer, SymbolicGer, (P = ParadigmsGer),
-       (L = LexiconGer), (E = ExtraGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in {
+       (L = LexiconGer), (E = ExtendGer), (G = GrammarGer), (I = IrregGer), (R = ResGer), (N = NounGer), Prelude in {
 flags coding=utf8 ;
 
 oper