took tense linearizations apart from Common/Cat to Tense, for bettter structure of lib

This commit is contained in:
aarne
2009-12-03 10:53:14 +00:00
parent 5c678ab686
commit a7809c3e1c
35 changed files with 127 additions and 96 deletions

View File

@@ -1,7 +1,7 @@
--# -path=.:../Romance:../common:../abstract:../common:prelude
concrete CatRon of Cat =
CommonX - [CAdv,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond]
CommonX - [CAdv,Temp,Tense]
** open Prelude, ResRon, MorphoRon,(R = ParamX) in {
flags optimize=all_subs ;
@@ -136,15 +136,6 @@ concrete CatRon of Cat =
Tense = {s : Str ; t : RTense} ;
lin
TTAnt t a = {s = a.s ++ t.s ; a = a.a ; t = t.t} ;
TPres = {s = []} ** {t = RPres} ;
TPast = {s = []} ** {t = RPast} ; --# notpresent
TFut = {s = []} ** {t = RFut} ; --# notpresent
TCond = {s = []} ** {t = RCond} ; --# notpresent
oper
aagr : Gender -> Number -> AAgr = \g,n ->

View File

@@ -12,9 +12,10 @@ concrete GrammarRon of Grammar =
RelativeRon,
ConjunctionRon,
PhraseRon,
TextX - [CAdv,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond],
TextX - [CAdv,Temp,Tense],
Prelude, MorphoRon, Coordination,
StructuralRon
StructuralRon,
TenseRon
** {
flags startcat = Phr ; unlexer = text ; lexer = text ;

View File

@@ -0,0 +1,11 @@
concrete TenseRon of Tense =
CatRon [Tense,Temp], TenseX [Ant,Pol,AAnter,ASimul,PNeg,PPos] ** open ResRon in {
lin
TTAnt t a = {s = a.s ++ t.s ; a = a.a ; t = t.t} ;
TPres = {s = []} ** {t = RPres} ;
TPast = {s = []} ** {t = RPast} ; --# notpresent
TFut = {s = []} ** {t = RFut} ; --# notpresent
TCond = {s = []} ** {t = RCond} ; --# notpresent
}