From 5de05d36dabb8bf39745568b138f033f29a9ee94 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 19 Dec 2007 10:50:17 +0000 Subject: [PATCH] more example languages --- lib/resource/Examples/Examples.gf | 8 +++++--- lib/resource/Examples/ExamplesDan.gf | 6 ++++++ lib/resource/Examples/ExamplesI.gf | 18 +++++++++--------- lib/resource/Examples/ExamplesNor.gf | 6 ++++++ lib/resource/Examples/ExamplesRus.gf | 6 ++++++ lib/resource/Examples/ExamplesSpa.gf | 6 ++++++ lib/resource/Examples/mkExx.gfs | 12 ++++++++++++ lib/resource/api/Constructors.gf | 26 +++++++++++++------------- lib/resource/romance/NounRomance.gf | 2 +- src/GF/Infra/ReadFiles.hs | 8 ++++---- 10 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 lib/resource/Examples/ExamplesDan.gf create mode 100644 lib/resource/Examples/ExamplesNor.gf create mode 100644 lib/resource/Examples/ExamplesRus.gf create mode 100644 lib/resource/Examples/ExamplesSpa.gf create mode 100644 lib/resource/Examples/mkExx.gfs diff --git a/lib/resource/Examples/Examples.gf b/lib/resource/Examples/Examples.gf index 1e020b2e0..b113fb050 100644 --- a/lib/resource/Examples/Examples.gf +++ b/lib/resource/Examples/Examples.gf @@ -1,10 +1,12 @@ abstract Examples = { +flags startcat = Ex ; + cat Ex ; fun - ex1, ex2, ex4, ex8, ex13, ex19, ex20, ex23, - ex3, ex5, ex6, ex7, ex10, ex12, ex14, ex15, ex16, ex24, ex25, ex26, ex27, - ex9, + ex01, ex02, ex04, ex08, ex13, ex19, ex20, ex23, + ex03, ex05, ex06, ex07, ex10, ex12, ex14, ex15, ex16, ex24, ex25, ex26, ex27, + ex09, ex11, ex17, ex18, ex21, ex22 : Ex ; } diff --git a/lib/resource/Examples/ExamplesDan.gf b/lib/resource/Examples/ExamplesDan.gf new file mode 100644 index 000000000..99400144c --- /dev/null +++ b/lib/resource/Examples/ExamplesDan.gf @@ -0,0 +1,6 @@ +--# -path=.:alltenses:prelude + +concrete ExamplesDan of Examples = ExamplesI with + (Syntax=SyntaxDan), + (Lang=LangDan) ; + diff --git a/lib/resource/Examples/ExamplesI.gf b/lib/resource/Examples/ExamplesI.gf index d3e51f342..1dbb7fb7d 100644 --- a/lib/resource/Examples/ExamplesI.gf +++ b/lib/resource/Examples/ExamplesI.gf @@ -3,47 +3,47 @@ incomplete concrete ExamplesI of Examples = open Syntax,Lang in { lincat Ex = Text ; lin - ex1 = mkText (UttS (UseCl TPres ASimul PPos (PredVP (UsePron he_Pron) + ex01 = mkText (UttS (UseCl TPres ASimul PPos (PredVP (UsePron he_Pron) (AdvVP (UseV sing_V) (AdAdv almost_AdA (PositAdvAdj correct_A)))))); - ex2 = mkText (UttAdv (SubjS when_Subj (ConjS and_Conj (BaseS (UseCl TPast ASimul PPos + ex02 = mkText (UttAdv (SubjS when_Subj (ConjS and_Conj (BaseS (UseCl TPast ASimul PPos (PredVP everybody_NP (UseComp (CompAP (ConjAP and_Conj (BaseAP (PositA young_A) (PositA beautiful_A))))))) (UseCl TPast ASimul PPos (PredVP everything_NP (ComplVA become_VA (PositA probable_AS)))))))) ; - ex3 = mkText (UseCl TPres ASimul PPos (CleftNP (PredetNP only_Predet + ex03 = mkText (UseCl TPres ASimul PPos (CleftNP (PredetNP only_Predet (DetCN (DetPl ( IndefArt) (NumDigits n2_Digits) NoOrd) (UseN woman_N))) (UseRCl TCond ASimul PPos (RelSlash IdRP (AdvSlash (SlashPrep (PredVP (UsePron i_Pron) (ComplVV want_VV (PassV2 see_V2))) with_Prep) (PrepNP in_Prep (DetCN (DetSg (DefArt) NoOrd) (UseN rain_N)))))))) ; - ex4 = mkText (UttNP (DetCN someSg_Det (RelCN (UseN day_N) (UseRCl TFut ASimul PPos + ex04 = mkText (UttNP (DetCN someSg_Det (RelCN (UseN day_N) (UseRCl TFut ASimul PPos (RelCl (ExistNP (AdvNP (DetCN (DetSg ( IndefArt) NoOrd) (UseN peace_N)) (PrepNP on_Prep (DetCN (DetSg ( IndefArt) NoOrd) (UseN earth_N)))))))))) ; - ex5 = mkText (UseCl TPres ASimul PPos (PredVP (UsePron they_Pron) (AdvVP + ex05 = mkText (UseCl TPres ASimul PPos (PredVP (UsePron they_Pron) (AdvVP (ProgrVP (UseV play_V)) (ComparAdvAdjS less_CAdv clever_A (UseCl TPres ASimul PPos (GenericCl (UseV think_V))))))) ; - ex6 = mkText (UseCl TPres ASimul PPos (CleftAdv (AdvSC (EmbedVP (AdVVP always_AdV + ex06 = mkText (UseCl TPres ASimul PPos (CleftAdv (AdvSC (EmbedVP (AdVVP always_AdV (UseV stop_V)))) (UseCl TPres ASimul PPos (PredVP (UsePron we_Pron) (ComplV2 beg_V2V (UsePron youPl_Pron)))))) ; - ex7 = mkText (UseCl TCond ASimul PNeg (PredVP (UsePron i_Pron) (ComplV3 give_V3 + ex07 = mkText (UseCl TCond ASimul PNeg (PredVP (UsePron i_Pron) (ComplV3 give_V3 (DetCN (DetPl ( IndefArt) (AdNum (AdnCAdv more_CAdv) (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))))) NoOrd) (UseN star_N)) (DetCN (DetSg ( this_Quant) NoOrd) (UseN restaurant_N))))) ; - ex8 = mkText (UttImpSg PPos (ImpVP (ComplV2A paint_V2A (DetCN (DetSg ( DefArt) + ex08 = mkText (UttImpSg PPos (ImpVP (ComplV2A paint_V2A (DetCN (DetSg ( DefArt) NoOrd) (UseN earth_N)) (DConjAP both7and_DConj (BaseAP (ComparA small_A (DetCN (DetSg ( DefArt) NoOrd) (UseN sun_N))) (ComparA big_A (DetCN (DetSg ( DefArt) NoOrd) (UseN moon_N ))))))) ) ; - ex9 = mkText (UseCl TPres ASimul PPos (PredVP everybody_NP (ComplVQ wonder_VQ + ex09 = mkText (UseCl TPres ASimul PPos (PredVP everybody_NP (ComplVQ wonder_VQ (UseQCl TPres ASimul PPos (QuestSlash whatSg_IP (SlashV2 (UsePron youSg_Pron)love_V2)))))) ; diff --git a/lib/resource/Examples/ExamplesNor.gf b/lib/resource/Examples/ExamplesNor.gf new file mode 100644 index 000000000..2840498d0 --- /dev/null +++ b/lib/resource/Examples/ExamplesNor.gf @@ -0,0 +1,6 @@ +--# -path=.:alltenses:prelude + +concrete ExamplesNor of Examples = ExamplesI with + (Syntax=SyntaxNor), + (Lang=LangNor) ; + diff --git a/lib/resource/Examples/ExamplesRus.gf b/lib/resource/Examples/ExamplesRus.gf new file mode 100644 index 000000000..e17301bea --- /dev/null +++ b/lib/resource/Examples/ExamplesRus.gf @@ -0,0 +1,6 @@ +--# -path=.:alltenses:prelude + +concrete ExamplesRus of Examples = ExamplesI with + (Syntax=SyntaxRus), + (Lang=LangRus) ** {flags coding=utf8} ; + diff --git a/lib/resource/Examples/ExamplesSpa.gf b/lib/resource/Examples/ExamplesSpa.gf new file mode 100644 index 000000000..794951643 --- /dev/null +++ b/lib/resource/Examples/ExamplesSpa.gf @@ -0,0 +1,6 @@ +--# -path=.:alltenses:prelude + +concrete ExamplesSpa of Examples = ExamplesI with + (Syntax=SyntaxSpa), + (Lang=LangSpa) ; + diff --git a/lib/resource/Examples/mkExx.gfs b/lib/resource/Examples/mkExx.gfs new file mode 100644 index 000000000..1db3293a1 --- /dev/null +++ b/lib/resource/Examples/mkExx.gfs @@ -0,0 +1,12 @@ +i ExamplesDan.gf +i ExamplesEng.gf +i ExamplesFin.gf +i ExamplesFre.gf +i ExamplesGer.gf +i ExamplesIta.gf +i ExamplesNor.gf +i ExamplesRus.gf +i ExamplesSpa.gf +i ExamplesSwe.gf +pm -printer=gfcc | wf examples.gfcc +gt | tb | wf examples.txt diff --git a/lib/resource/api/Constructors.gf b/lib/resource/api/Constructors.gf index ff51032a1..ffc710166 100644 --- a/lib/resource/api/Constructors.gf +++ b/lib/resource/api/Constructors.gf @@ -526,19 +526,19 @@ incomplete resource Constructors = open Grammar in { -- See $Numeral$ for the full set of constructors, and use the category -- $Digits$ for other numbers from one million. - n1_Digits : Digits ; -- 1. one - n2_Digits : Digits ; -- 2. two - n3_Digits : Digits ; -- 3. three - n4_Digits : Digits ; -- 4. four - n5_Digits : Digits ; -- 5. five - n6_Digits : Digits ; -- 6. six - n7_Digits : Digits ; -- 7. seven - n8_Digits : Digits ; -- 8. eight - n9_Digits : Digits ; -- 9. nine - n10_Digits : Digits ; -- 10. ten - n20_Digits : Digits ; -- 11. twenty - n100_Digits : Digits ; -- 12. hundred - n1000_Digits : Digits ; -- 13. thousand + n1_Digits : Digits ; -- 1. 1 + n2_Digits : Digits ; -- 2. 2 + n3_Digits : Digits ; -- 3. 3 + n4_Digits : Digits ; -- 4. 4 + n5_Digits : Digits ; -- 5. 5 + n6_Digits : Digits ; -- 6. 6 + n7_Digits : Digits ; -- 7. 7 + n8_Digits : Digits ; -- 8. 8 + n9_Digits : Digits ; -- 9. 9 + n10_Digits : Digits ; -- 10. 10 + n20_Digits : Digits ; -- 11. 20 + n100_Digits : Digits ; -- 12. 100 + n1000_Digits : Digits ; -- 13. 1,000 diff --git a/lib/resource/romance/NounRomance.gf b/lib/resource/romance/NounRomance.gf index 8b2526610..609676e60 100644 --- a/lib/resource/romance/NounRomance.gf +++ b/lib/resource/romance/NounRomance.gf @@ -10,7 +10,7 @@ incomplete concrete NounRomance of Noun = n = det.n in { s = \\c => let cs = npform2case c in - prepCase cs ++ det.s ! g ! cs ++ cn.s ! n ; + det.s ! g ! cs ++ cn.s ! n ; a = agrP3 g n ; hasClit = False } ; diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs index fa3298158..3f25466e5 100644 --- a/src/GF/Infra/ReadFiles.hs +++ b/src/GF/Infra/ReadFiles.hs @@ -91,12 +91,12 @@ selectFormat opts env (p,f) = do mtgfc <- getModTime $ gfcFile pf mtgf <- getModTime $ gfFile pf let stat = case (rtenv,mtenv,mtgfc,mtgf) of - (_,Just tenv,_,_) | fromComp -> (CSEnv, Just tenv) +-- (_,Just tenv,_,_) | fromComp -> (CSEnv, Just tenv) (_,_,Just tgfc,_) | fromComp -> (CSRead,Just tgfc) - (Just tenv,_,_,Just tgf) | laterModTime tenv tgf -> (CSEnvR,Just tenv) - (_,Just tenv,_,Just tgf) | laterModTime tenv tgf -> (CSEnv, Just tenv) +-- (Just tenv,_,_,Just tgf) | laterModTime tenv tgf -> (CSEnvR,Just tenv) +-- (_,Just tenv,_,Just tgf) | laterModTime tenv tgf -> (CSEnv, Just tenv) (_,_,Just tgfc,Just tgf) | laterModTime tgfc tgf -> (CSRead,Just tgfc) - (_,Just tenv,_,Nothing) -> (CSEnv,Just tenv) -- source does not exist +-- (_,Just tenv,_,Nothing) -> (CSEnv,Just tenv) -- source does not exist (_,_,_, Nothing) -> (CSRead,Nothing) -- source does not exist _ -> (CSComp,Nothing) return $ (f, (p,stat))