prelude sources to lib/src; present in StructuralEng; refactored checkGFCC

lib/resource/Makefile

@@ -40,7 +40,8 @@ pretest:
 	echo "gr -cat=Cl -number=11 -prob | tb" | $(GF) -probs=lang.gfprob -path=present:prelude -nocf ../present/Lang???.gfc
 
 prelude: 
-	$(GFC) ../prelude/*.gf
+	$(GFC) ../src/*.gf
+	cp -p ../src/*.gf? ../prelude
 
 alltenses:
 #	$(GFC) arabic/GrammarAra.gf
@@ -153,7 +154,11 @@ gfdoc:
 	mv ../prelude/*.html doc/gfdoc
 
 gf3: 
-	export GF_LIB_PATH=..; $(MAKE) -e gf3present gf3alltenses
+	export GF_LIB_PATH=..; $(MAKE) -e gf3prelude gf3present gf3alltenses
+
+gf3prelude: 
+	$(GFNew) ../src/*.gf
+	cp -p ../src/*.gfo ../prelude
 
 gf3alltenses:
 #	$(GFNew) arabic/GrammarAra.gf

lib/resource/english/StructuralEng.gf

@@ -20,8 +20,15 @@ concrete StructuralEng of Structural = CatEng **
   by8agent_Prep = ss "by" ;
   by8means_Prep = ss "by" ;
   can8know_VV, can_VV = {
-    s = table VVForm [["be able to"] ; "can" ; ["been able to"] ;  
-         ["being able to"] ; "could" ; "can't" ; "couldn't"] ; 
+    s = table { 
+      VVF VInf => ["be able to"] ;
+      VVF VPres => "can" ;
+      VVF VPPart => ["been able to"] ;
+      VVF VPresPart => ["being able to"] ;
+      VVF VPast => "could" ;      --# notpresent
+      VVPastNeg => "couldn't" ;   --# notpresent
+      VVPresNeg => "can't"
+      } ;
     isAux = True
     } ;
   during_Prep = ss "during" ;
@@ -51,8 +58,15 @@ concrete StructuralEng of Structural = CatEng **
   most_Predet = ss "most" ;
   much_Det = mkDeterminer Sg "much" ;
   must_VV = {
-    s = table VVForm [["have to"] ; "must" ; ["had to"] ; 
-         ["having to"] ; ["had to"] ; "mustn't" ; ["hadn't to"]] ; ---- 
+    s = table {
+      VVF VInf => ["have to"] ;
+      VVF VPres => "must" ;
+      VVF VPPart => ["had to"] ;
+      VVF VPresPart => ["having to"] ;
+      VVF VPast => ["had to"] ;      --# notpresent
+      VVPastNeg => ["hadn't to"] ;      --# notpresent
+      VVPresNeg => "mustn't"
+      } ;
     isAux = True
     } ;
   no_Phr = ss "no" ;