redocumenting resource

lib/resource-1.0/english/CatEng.gf

@@ -1,4 +1,4 @@
-concrete CatEng of Cat = open ResEng, Prelude in {
+concrete CatEng of Cat = TenseX ** open ResEng, Prelude in {
 
   flags optimize=all_subs ;
 
@@ -69,7 +69,7 @@ concrete CatEng of Cat = open ResEng, Prelude in {
     Subj = {s : Str} ;
     Prep = {s : Str} ;
 
--- Open lexical classes, e.g. Basic
+-- Open lexical classes, e.g. Lexicon
 
     V, VS, VQ, VA = Verb ; -- = {s : VForm => Str} ;
     V2, VV, V2A = Verb ** {c2 : Str} ;

lib/resource-1.0/english/LangEng.gf

@@ -11,9 +11,8 @@ concrete LangEng of Lang =
   RelativeEng,
   ConjunctionEng,
   PhraseEng,
-  TensedEng,
   StructuralEng,
-  BasicEng
+  LexiconEng
   ** {
 
 flags startcat = Phr ;

lib/resource-1.0/english/LexiconEng.gf

@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete BasicEng of Basic = CatEng ** open ParadigmsEng in {
+concrete LexiconEng of Lexicon = CatEng ** open ParadigmsEng in {
 
 flags 
   optimize=values ;

lib/resource-1.0/english/PhraseEng.gf

@@ -1,4 +1,4 @@
-concrete PhraseEng of Phrase = CatEng, TenseX ** open ResEng in {
+concrete PhraseEng of Phrase = CatEng ** open ResEng in {
 
   lin
     PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;

lib/resource-1.0/english/SentenceEng.gf

@@ -3,6 +3,7 @@ concrete SentenceEng of Sentence = CatEng ** open ResEng in {
   flags optimize=all_subs ;
 
   lin
+
     PredVP np vp = mkClause (np.s ! Nom) np.a vp ;
 
     PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
@@ -38,4 +39,8 @@ concrete SentenceEng of Sentence = CatEng ** open ResEng in {
     EmbedQS qs = {s = qs.s ! QIndir} ;
     EmbedVP vp = {s = "to" ++ infVP vp (agrP3 Sg)} ; --- agr
 
+    UseCl  t a p cl = {s = t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! ODir} ;
+    UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
+    UseRCl t a p cl = {s = \\r => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! r} ;
+
 }

lib/resource-1.0/english/TensedEng.gf

@@ -1,10 +0,0 @@
-concrete TensedEng of Tensed = CatEng, TenseX ** open ResEng in {
-
-  flags optimize=all_subs ;
-
-  lin
-    UseCl  t a p cl = {s = t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! ODir} ;
-    UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;
-    UseRCl t a p cl = {s = \\r => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! r} ;
-
-}