mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-05 01:02:51 -06:00
took tense linearizations apart from Common/Cat to Tense, for bettter structure of lib
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
concrete CatGer of Cat =
|
||||
CommonX - [Tense,TPres,TPast,TFut,TCond,TTAnt,Temp] **
|
||||
CommonX - [Tense,Temp] **
|
||||
open ResGer, Prelude in {
|
||||
|
||||
flags optimize=all_subs ;
|
||||
@@ -93,11 +93,4 @@ concrete CatGer of Cat =
|
||||
Temp = {s : Str ; t : ResGer.Tense ; a : Anteriority ; m : Mood} ;
|
||||
Tense = {s : Str ; t : ResGer.Tense ; m : Mood} ;
|
||||
|
||||
lin
|
||||
TTAnt t a = {s = t.s ++ a.s ; t = t.t ; a = a.a ; m = t.m} ;
|
||||
|
||||
TPres = {s = [] ; t = Pres ; m = MIndic} ;
|
||||
TPast = {s = [] ; t = Past ; m = MIndic} ; --# notpresent
|
||||
TFut = {s = [] ; t = Fut ; m = MIndic} ; --# notpresent
|
||||
TCond = {s = [] ; t = Cond ; m = MIndic} ; --# notpresent
|
||||
}
|
||||
|
||||
@@ -11,9 +11,10 @@ concrete GrammarGer of Grammar =
|
||||
RelativeGer,
|
||||
ConjunctionGer,
|
||||
PhraseGer,
|
||||
TextX - [Tense,TPres,TPast,TFut,TCond,TTAnt,Temp],
|
||||
TextX - [Tense,Temp],
|
||||
IdiomGer,
|
||||
StructuralGer
|
||||
StructuralGer,
|
||||
TenseGer
|
||||
** {
|
||||
|
||||
flags startcat = Phr ; unlexer = text ; lexer = text ;
|
||||
|
||||
@@ -152,7 +152,7 @@ resource ResGer = ParamX ** open Prelude in {
|
||||
} ;
|
||||
|
||||
conjAgr : Agr -> Agr -> Agr = \a,b -> {
|
||||
g = Utr ; ----
|
||||
g = Neutr ; ----
|
||||
n = conjNumber a.n b.n ;
|
||||
p = conjPerson a.p b.p
|
||||
} ;
|
||||
|
||||
12
lib/src/german/TenseGer.gf
Normal file
12
lib/src/german/TenseGer.gf
Normal file
@@ -0,0 +1,12 @@
|
||||
concrete TenseGer of Tense =
|
||||
CatGer [Tense,Temp], TenseX [Ant,Pol,AAnter,ASimul,PNeg,PPos] ** open ResGer in {
|
||||
|
||||
lin
|
||||
TTAnt t a = {s = t.s ++ a.s ; t = t.t ; a = a.a ; m = t.m} ;
|
||||
|
||||
TPres = {s = [] ; t = Pres ; m = MIndic} ;
|
||||
TPast = {s = [] ; t = Past ; m = MIndic} ; --# notpresent
|
||||
TFut = {s = [] ; t = Fut ; m = MIndic} ; --# notpresent
|
||||
TCond = {s = [] ; t = Cond ; m = MIndic} ; --# notpresent
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user