diff --git a/lib/resource/Make.hs b/lib/resource/Make.hs index 6de938e24..c230b14e6 100644 --- a/lib/resource/Make.hs +++ b/lib/resource/Make.hs @@ -52,7 +52,7 @@ langs = map fst langsCoding langsLang = langs `except` ["Ara"] -- languages for which to compile Try -langsAPI = langsLang `except` ["Ara","Bul","Cat","Hin","Ina","Rus","Tha"] +langsAPI = langsLang `except` ["Ara","Bul","Hin","Ina","Rus","Tha"] -- languages for which to compile Mathematical langsMath = langsAPI diff --git a/lib/resource/catalan/IdiomCat.gf b/lib/resource/catalan/IdiomCat.gf index 193cd3b49..5b82047aa 100644 --- a/lib/resource/catalan/IdiomCat.gf +++ b/lib/resource/catalan/IdiomCat.gf @@ -21,4 +21,32 @@ concrete IdiomCat of Idiom = CatCat ** ) (predV (verbV (estar_54 "estar"))) ; +----AR, for completeness + + CleftNP np rs = mkClause [] True (agrP3 Masc Sg) + (insertComplement (\\_ => rs.s ! Indic ! np.a) + (insertComplement (\\_ => np.s ! Ton rs.c) (predV copula))) ; + + + ExistIP ip = { + s = \\t,a,p,_ => + ip.s ! Nom ++ + (mkClause [] True + (agrP3 Masc Sg) + (insertClit2 "hi" (insertComplement (\\_ => ip.s ! Acc) (predV haver_V)))) + .s ! DDir ! t ! a ! p ! Indic + } ; + + ImpPl1 vpr = let vp = useVP vpr in {s = + (mkImperative False P1 vp).s ! Pos ! {n = Pl ; g = Masc} --- fem + } ; + + CleftAdv ad s = mkClause [] True (agrP3 Masc Sg) + (insertComplement (\\_ => conjThat ++ s.s ! Indic) + (insertComplement (\\_ => ad.s) (predV copula))) ; + + + + + } diff --git a/lib/resource/mathematical/MathematicalCat.gf b/lib/resource/mathematical/MathematicalCat.gf new file mode 100644 index 000000000..36d6985f1 --- /dev/null +++ b/lib/resource/mathematical/MathematicalCat.gf @@ -0,0 +1,26 @@ +--# -path=.:present:prelude + +concrete MathematicalCat of Mathematical = + NounCat - [ComplN2], --- to avoid ambiguity +-- VerbCat, + AdjectiveCat, + AdverbCat, + NumeralCat, +-- SentenceCat, + QuestionCat, + RelativeCat, + ConjunctionCat, + PhraseCat, + TextX - [Tense,TPres,TPast,TFut,TCond], + IdiomCat, + StructuralCat, + + SymbolCat, + PredicationCat, -- - [predV3,predV2], --- gf bug + + LexiconCat + ** { + +flags startcat = Phr ; + +} ; diff --git a/lib/resource/mathematical/PredicationCat.gf b/lib/resource/mathematical/PredicationCat.gf new file mode 100644 index 000000000..95fd70cc0 --- /dev/null +++ b/lib/resource/mathematical/PredicationCat.gf @@ -0,0 +1,4 @@ +concrete PredicationCat of Predication = CatCat ** PredicationI with + (Syntax = SyntaxCat), + (Lang = LangCat) ; + diff --git a/lib/resource/mathematical/SymbolCat.gf b/lib/resource/mathematical/SymbolCat.gf new file mode 100644 index 000000000..09faff744 --- /dev/null +++ b/lib/resource/mathematical/SymbolCat.gf @@ -0,0 +1,2 @@ +concrete SymbolCat of Symbol = CatCat ** SymbolRomance with + (ResRomance = ResCat) ; diff --git a/lib/resource/mathematical/SymbolicCat.gf b/lib/resource/mathematical/SymbolicCat.gf new file mode 100644 index 000000000..de79ec2ba --- /dev/null +++ b/lib/resource/mathematical/SymbolicCat.gf @@ -0,0 +1,5 @@ +--# -path=.:present:mathematical:prelude + +resource SymbolicCat = Symbolic with + (Symbol = SymbolCat), + (Grammar = GrammarCat) ; diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index 5d2b1b408..46bf7a619 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -33,8 +33,8 @@ import qualified Data.ByteString.Char8 as BS import Debug.Trace ---- -- when developing, swap commenting ---traceD s t = trace s t -traceD s t = t +traceD s t = trace s t +--traceD s t = t -- the main function: generate PGF from GF.