From 54d6dd30ccd180d2fca95f3c09a3f1d98249a838 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 13 Dec 2007 10:12:00 +0000
Subject: [PATCH] prelude sources to lib/src; present in StructuralEng;
 refactored checkGFCC

---
 resource/Makefile                 |  9 +++++++--
 resource/english/StructuralEng.gf | 22 ++++++++++++++++++----
 {prelude => src}/Coordination.gf  |  0
 {prelude => src}/Formal.gf        |  0
 {prelude => src}/HTML.gf          |  0
 {prelude => src}/Latex.gf         |  0
 {prelude => src}/Precedence.gf    |  0
 {prelude => src}/Predef.gf        |  0
 {prelude => src}/PredefAbs.gf     |  0
 {prelude => src}/PredefCnc.gf     |  0
 {prelude => src}/Prelude.gf       |  0
 11 files changed, 25 insertions(+), 6 deletions(-)
 rename {prelude => src}/Coordination.gf (100%)
 rename {prelude => src}/Formal.gf (100%)
 rename {prelude => src}/HTML.gf (100%)
 rename {prelude => src}/Latex.gf (100%)
 rename {prelude => src}/Precedence.gf (100%)
 rename {prelude => src}/Predef.gf (100%)
 rename {prelude => src}/PredefAbs.gf (100%)
 rename {prelude => src}/PredefCnc.gf (100%)
 rename {prelude => src}/Prelude.gf (100%)

diff --git a/resource/Makefile b/resource/Makefile
index d16ebef9d..03b923ceb 100644
--- a/resource/Makefile
+++ b/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
diff --git a/resource/english/StructuralEng.gf b/resource/english/StructuralEng.gf
index e35b172c0..c6253f6b4 100644
--- a/resource/english/StructuralEng.gf
+++ b/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" ;
diff --git a/prelude/Coordination.gf b/src/Coordination.gf
similarity index 100%
rename from prelude/Coordination.gf
rename to src/Coordination.gf
diff --git a/prelude/Formal.gf b/src/Formal.gf
similarity index 100%
rename from prelude/Formal.gf
rename to src/Formal.gf
diff --git a/prelude/HTML.gf b/src/HTML.gf
similarity index 100%
rename from prelude/HTML.gf
rename to src/HTML.gf
diff --git a/prelude/Latex.gf b/src/Latex.gf
similarity index 100%
rename from prelude/Latex.gf
rename to src/Latex.gf
diff --git a/prelude/Precedence.gf b/src/Precedence.gf
similarity index 100%
rename from prelude/Precedence.gf
rename to src/Precedence.gf
diff --git a/prelude/Predef.gf b/src/Predef.gf
similarity index 100%
rename from prelude/Predef.gf
rename to src/Predef.gf
diff --git a/prelude/PredefAbs.gf b/src/PredefAbs.gf
similarity index 100%
rename from prelude/PredefAbs.gf
rename to src/PredefAbs.gf
diff --git a/prelude/PredefCnc.gf b/src/PredefCnc.gf
similarity index 100%
rename from prelude/PredefCnc.gf
rename to src/PredefCnc.gf
diff --git a/prelude/Prelude.gf b/src/Prelude.gf
similarity index 100%
rename from prelude/Prelude.gf
rename to src/Prelude.gf