diff --git a/lib/resource-1.0/abstract/Adverb.gf b/lib/resource-1.0/abstract/Adverb.gf index 9e301cfc6..57f5fa28b 100644 --- a/lib/resource-1.0/abstract/Adverb.gf +++ b/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 diff --git a/lib/resource-1.0/abstract/Cat.gf b/lib/resource-1.0/abstract/Cat.gf index 85e81e97d..ad04efaff 100644 --- a/lib/resource-1.0/abstract/Cat.gf +++ b/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]. diff --git a/lib/resource-1.0/abstract/Structural.gf b/lib/resource-1.0/abstract/Structural.gf index ea3fe0301..e765ad589 100644 --- a/lib/resource-1.0/abstract/Structural.gf +++ b/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 ** { diff --git a/lib/resource-1.0/abstract/Text.gf b/lib/resource-1.0/abstract/Text.gf index 7d4cca14a..2f35f48ac 100644 --- a/lib/resource-1.0/abstract/Text.gf +++ b/lib/resource-1.0/abstract/Text.gf @@ -1,6 +1,6 @@ --1 Texts -abstract Text = Cat ** { +abstract Text = Common ** { fun TEmpty : Text ; diff --git a/lib/resource-1.0/common/TextX.gf b/lib/resource-1.0/common/TextX.gf index 38b15fddd..a5ddebc54 100644 --- a/lib/resource-1.0/common/TextX.gf +++ b/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. diff --git a/src/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs index d36045158..96c4a1a9d 100644 --- a/src/GF/Compile/CheckGrammar.hs +++ b/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 "" diff --git a/src/GF/Compile/Rebuild.hs b/src/GF/Compile/Rebuild.hs index fd7d4cd88..452a485c8 100644 --- a/src/GF/Compile/Rebuild.hs +++ b/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 diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs index e8f372896..3f61247a5 100644 --- a/src/GF/Infra/Modules.hs +++ b/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 { diff --git a/src/GF/Source/SourceToGrammar.hs b/src/GF/Source/SourceToGrammar.hs index 4aa5b55a6..c77a9f47b 100644 --- a/src/GF/Source/SourceToGrammar.hs +++ b/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')