bug fix in with-modules and gr checker; factoring out cats to Common

lib/resource-1.0/abstract/Adverb.gf

@@ -4,7 +4,7 @@ abstract Adverb = Cat ** {
 
   fun
 
--- The two main ways of formins adverbs is from adjectives and by
+-- The two main ways of forming adverbs are from adjectives and by
 -- prepositions from noun phrases.
 
     PositAdvAdj : A -> Adv ;                 -- quickly

lib/resource-1.0/abstract/Cat.gf

@@ -24,7 +24,6 @@ abstract Cat = Common ** {
 
     QCl ;   -- question clause, with all tenses    e.g. "why does she walk"
     IP ;    -- interrogative pronoun               e.g. "who"
-    IAdv ;  -- interrogative adverb                e.g. "why"
     IComp ; -- interrogative complement of copula  e.g. "where"
     IDet ;  -- interrogative determiner            e.g. "which"
 
@@ -68,16 +67,6 @@ abstract Cat = Common ** {
     Num ;   -- cardinal number (used with QuantPl) e.g. "seven"
     Ord ;   -- ordinal number (used in Det)        e.g. "seventh"
 
---2 Adverbs
-
--- Constructed in [Adverb Adverb.html].  
--- Many adverbs are constructed in [Structural Structural.html].
-
-    Adv ;   -- verb-phrase-modifying adverb,       e.g. "in the house"
-    AdV ;   -- adverb directly attached to verb    e.g. "always"
-    AdA ;   -- adjective-modifying adverb,         e.g. "very"
-    AdN ;   -- numeral-modifying adverb,           e.g. "more than"
-
 --2 Numerals
 
 -- Constructed in [Numeral Numeral.html].

lib/resource-1.0/abstract/Structural.gf

@@ -4,7 +4,7 @@
 --
 -- Here we have some words belonging to closed classes and appearing
 -- in all languages we have considered.
--- Sometimes they are not really meaningful, e.g. $we_NP$ in Spanish
+-- Sometimes they are not really meaningful, e.g. $we_Pron$ in Spanish
 -- should be replaced by masculine and feminine variants.
 
 abstract Structural = Cat ** {

lib/resource-1.0/abstract/Text.gf

@@ -1,6 +1,6 @@
 --1 Texts
 
-abstract Text = Cat ** {
+abstract Text = Common ** {
 
   fun
     TEmpty : Text ;

lib/resource-1.0/common/TextX.gf

@@ -1,4 +1,4 @@
-concrete TextX of Text = {
+concrete TextX of Text = CommonX ** {
 
 -- This will work for almost all languages except Spanish.
 

src/GF/Compile/CheckGrammar.hs

@@ -346,7 +346,7 @@ inferLType gr trm = case trm of
    Q m ident | isPredef m -> termWith trm $ checkErr (typPredefined ident)
 
    Q m ident -> checks [
-     termWith trm $ checkErr (lookupResType gr m ident)
+     termWith trm $ checkErr (lookupResType gr m ident) >>= comp
      ,
      checkErr (lookupResDef gr m ident) >>= infer
      ,
@@ -356,7 +356,7 @@ inferLType gr trm = case trm of
    QC m ident | isPredef m -> termWith trm $ checkErr (typPredefined ident)
 
    QC m ident -> checks [
-     termWith trm $ checkErr (lookupResType gr m ident)
+     termWith trm $ checkErr (lookupResType gr m ident) >>= comp
      ,
      checkErr (lookupResDef gr m ident) >>= infer
      ,
@@ -825,7 +825,7 @@ checkEqLType env t u trm = do
                    not (any (\ (k,b) -> alpha g a b && l == k) ts)]
          (locks,others) = partition isLockLabel ls
        in case others of
-         _:_ -> Bad $ "missing record fieds" +++ unwords (map prt others)
+         _:_ -> Bad $ "missing record fields" +++ unwords (map prt others)
          _ -> return locks
      _ -> Bad ""
 

src/GF/Compile/Rebuild.hs

@@ -72,8 +72,8 @@ rebuildModule ms mo@(i,mi) = do
                      ++ [oQualif i i | i <- map snd insts] ----
                      ++ [oSimple i   | i <- map snd insts] ----
                ----      ++ [oSimple ext] ---- to encode dependence
-      --- check if me is incomplete; --- why inherit all forced by syntax
-      return $ ModMod $ Module mt0 stat' fs (map inheritAll me) ops1 js 
+      --- check if me is incomplete
+      return $ ModMod $ Module mt0 stat' fs me ops1 js 
                           ---- (mapTree (qualifInstanceInfo insts) js) -- not needed
 
     _ -> return mi

src/GF/Infra/Modules.hs

@@ -58,7 +58,7 @@ data MGrammar i f a = MGrammar {modules :: [(i,ModInfo i f a)]}
 data ModInfo i f a =
     ModMainGrammar (MainGrammar i)
   | ModMod  (Module i f a)
-  | ModWith (ModuleType i) ModuleStatus i [i] [OpenSpec i]
+  | ModWith (ModuleType i) ModuleStatus i [(i,MInclude i)] [OpenSpec i]
   deriving Show
 
 data Module i f a = Module {

src/GF/Source/SourceToGrammar.hs

@@ -112,7 +112,7 @@ transModDef x = case x of
         opens'   <- mapM transOpen opens 
         return (id', GM.ModWith mtyp' mstat' m' [] opens')
       MWithE extends m opens -> do
-        extends' <- liftM (map fst) $ mapM transIncludedExt extends
+        extends' <- mapM transIncludedExt extends
         m'       <- transIdent m
         opens'   <- mapM transOpen opens 
         return (id', GM.ModWith mtyp' mstat' m' extends' opens')