From 41ab809c8881f0f3a910ed4ea06a1923bcf2161d Mon Sep 17 00:00:00 2001 From: Aarne Ranta Date: Mon, 21 Aug 2017 21:36:03 +0300 Subject: [PATCH] added full Lexicon and some new languages to the LibraryBrowser grammar --- src/api/libraryBrowser/LibraryBrowser.gf | 13 +++++++---- src/api/libraryBrowser/LibraryBrowserAPI.gf | 6 ++--- src/api/libraryBrowser/LibraryBrowserBul.gf | 25 ++++++++++++++++++++ src/api/libraryBrowser/LibraryBrowserChi.gf | 25 ++++++++++++++++++++ src/api/libraryBrowser/LibraryBrowserDut.gf | 26 +++------------------ src/api/libraryBrowser/LibraryBrowserEng.gf | 16 +++++++------ src/api/libraryBrowser/LibraryBrowserSpa.gf | 25 ++++++++++++++++++++ src/api/libraryBrowser/LibraryBrowserSwe.gf | 25 ++++++++++++++++++++ 8 files changed, 123 insertions(+), 38 deletions(-) create mode 100644 src/api/libraryBrowser/LibraryBrowserBul.gf create mode 100644 src/api/libraryBrowser/LibraryBrowserChi.gf create mode 100644 src/api/libraryBrowser/LibraryBrowserSpa.gf create mode 100644 src/api/libraryBrowser/LibraryBrowserSwe.gf diff --git a/src/api/libraryBrowser/LibraryBrowser.gf b/src/api/libraryBrowser/LibraryBrowser.gf index 2405a330e..b53d2f00f 100644 --- a/src/api/libraryBrowser/LibraryBrowser.gf +++ b/src/api/libraryBrowser/LibraryBrowser.gf @@ -1,10 +1,12 @@ abstract LibraryBrowser = Grammar - [ - n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8, - UseCopula, - UsePron, IndefArt, DefArt, Use2N3, Use3N3 +-- n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8, + UseCopula +-- ,UsePron, IndefArt, DefArt, Use2N3, Use3N3 ], - Lexicon [ + Lexicon +{- AR 21/8/2017 removing almost all the restrictions + [ N, man_N, woman_N, house_N, N2, brother_N2, N3, distance_N3, @@ -21,7 +23,8 @@ abstract LibraryBrowser = V2A, paint_V2A, V2S, answer_V2S, V2Q, ask_V2Q - ] + ] +-} ** { flags startcat = Utt ; diff --git a/src/api/libraryBrowser/LibraryBrowserAPI.gf b/src/api/libraryBrowser/LibraryBrowserAPI.gf index 53371fb96..2bd59799a 100644 --- a/src/api/libraryBrowser/LibraryBrowserAPI.gf +++ b/src/api/libraryBrowser/LibraryBrowserAPI.gf @@ -121,7 +121,7 @@ lin D_6 = mkTerm "n6_Dig" ; lin D_7 = mkTerm "n7_Dig" ; lin D_8 = mkTerm "n8_Dig" ; lin D_9 = mkTerm "n9_Dig" ; ---lin DefArt = mkTerm "the_Quant" ; +lin DefArt = mkTerm "the_Quant" ; lin DetCN det_1 cn_2 = mkTerm "mkNP" (flatIfTerm det_1) (flatIfTerm cn_2) ; lin DetNP det_1 = mkTerm "mkNP" det_1 ; lin DetQuant quant_1 num_2 = mkFlat (mkTerm "mkDet" quant_1 num_2) ; @@ -144,7 +144,7 @@ lin IdetQuant iquant_1 num_2 = mkTerm "mkIDet" iquant_1 num_2 ; lin ImpPl1 vp_1 = mkTerm "lets_Utt" vp_1 ; lin ImpVP vp_1 = mkTerm "mkImp" vp_1 ; lin ImpersCl vp_1 = mkTerm "mkCl" vp_1 ; ---lin IndefArt = mkTerm "a_Quant" ; +lin IndefArt = mkTerm "a_Quant" ; lin MassNP cn_1 = mkTerm "mkNP" cn_1 ; lin NoPConj = mkTerm (hide "NoPConj") ; lin NoVoc = mkTerm (hide "NoVoc") ; @@ -222,7 +222,7 @@ lin UseComparA a_1 = mkTerm "mkAP" a_1 ; lin UseN n_1 = mkFlat (mkTerm "mkCN" n_1) ; lin UseN2 n2_1 = mkTerm "mkCN" n2_1 ; lin UsePN pn_1 = mkTerm "mkNP" pn_1 ; ---lin UsePron pron_1 = mkTerm "mkNP" pron_1 ; +lin UsePron pron_1 = mkTerm "mkNP" pron_1 ; lin UseQCl temp_1 pol_2 qcl_3 = mkTerm "mkQS" (flatTerm temp_1) pol_2 qcl_3 ; lin UseRCl temp_1 pol_2 rcl_3 = mkTerm "mkRS" (flatTerm temp_1) pol_2 rcl_3 ; lin UseSlash temp_1 pol_2 clslash_3 = mkTerm "mkSSlash" temp_1 pol_2 clslash_3 ; diff --git a/src/api/libraryBrowser/LibraryBrowserBul.gf b/src/api/libraryBrowser/LibraryBrowserBul.gf new file mode 100644 index 000000000..f2b9f1e7e --- /dev/null +++ b/src/api/libraryBrowser/LibraryBrowserBul.gf @@ -0,0 +1,25 @@ +--# -path=.:alltenses + +concrete LibraryBrowserBul of LibraryBrowser = + GrammarBul - [ + UseCopula + ], + LexiconBul + ** open (S = SyntaxBul) in { + + lin + i_NP = S.i_NP ; + you_NP = S.you_NP ; + he_NP = S.he_NP ; + she_NP = S.she_NP ; + we_NP = S.we_NP ; + youPl_NP = S.youPl_NP ; + youPol_NP = S.youPol_NP ; + they_NP = S.they_NP ; + + a_Det = S.mkDet S.a_Quant ; + the_Det = S.mkDet S.the_Quant ; + aPl_Det = S.mkDet S.a_Quant S.plNum ; + thePl_Det = S.mkDet S.the_Quant S.plNum ; +} + diff --git a/src/api/libraryBrowser/LibraryBrowserChi.gf b/src/api/libraryBrowser/LibraryBrowserChi.gf new file mode 100644 index 000000000..b8eb1568b --- /dev/null +++ b/src/api/libraryBrowser/LibraryBrowserChi.gf @@ -0,0 +1,25 @@ +--# -path=.:alltenses + +concrete LibraryBrowserChi of LibraryBrowser = + GrammarChi - [ + UseCopula + ], + LexiconChi + ** open (S = SyntaxChi) in { + + lin + i_NP = S.i_NP ; + you_NP = S.you_NP ; + he_NP = S.he_NP ; + she_NP = S.she_NP ; + we_NP = S.we_NP ; + youPl_NP = S.youPl_NP ; + youPol_NP = S.youPol_NP ; + they_NP = S.they_NP ; + + a_Det = S.mkDet S.a_Quant ; + the_Det = S.mkDet S.the_Quant ; + aPl_Det = S.mkDet S.a_Quant S.plNum ; + thePl_Det = S.mkDet S.the_Quant S.plNum ; +} + diff --git a/src/api/libraryBrowser/LibraryBrowserDut.gf b/src/api/libraryBrowser/LibraryBrowserDut.gf index f0d987daa..eda59aafa 100644 --- a/src/api/libraryBrowser/LibraryBrowserDut.gf +++ b/src/api/libraryBrowser/LibraryBrowserDut.gf @@ -2,30 +2,10 @@ concrete LibraryBrowserDut of LibraryBrowser = GrammarDut - [ - n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8, - UseCopula, - UsePron, IndefArt, DefArt, Use2N3, Use3N3 + UseCopula ], - LexiconDut [ - N, man_N, woman_N, house_N, - N2, brother_N2, - N3, distance_N3, - PN, john_PN, paris_PN, - A, old_A, young_A, red_A, - A2, married_A2, - V, sleep_V, walk_V, - V2, love_V2, - V3, give_V3, - VA, become_VA, - VS, know_VS, - VQ, wonder_VQ, - V2V, beg_V2V, - V2A, paint_V2A, - V2S, answer_V2S, - V2Q, ask_V2Q - ] - ** open (S = SyntaxDut) in { - flags startcat = Utt ; + LexiconDut + ** open (S = SyntaxDut) in { lin i_NP = S.i_NP ; diff --git a/src/api/libraryBrowser/LibraryBrowserEng.gf b/src/api/libraryBrowser/LibraryBrowserEng.gf index a09084a48..8ebee1827 100644 --- a/src/api/libraryBrowser/LibraryBrowserEng.gf +++ b/src/api/libraryBrowser/LibraryBrowserEng.gf @@ -2,11 +2,13 @@ concrete LibraryBrowserEng of LibraryBrowser = GrammarEng - [ - n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8, - UseCopula, - UsePron, IndefArt, DefArt, Use2N3, Use3N3 +--- n2,n3,n4,n5,n6,n7,n8,D_0,D_1,D_2,D_3,D_4,D_5,D_6,D_7,D_8, + UseCopula +--- ,UsePron, IndefArt, DefArt, Use2N3, Use3N3 ], - LexiconEng [ + LexiconEng +{- + [ N, man_N, woman_N, house_N, N2, brother_N2, N3, distance_N3, @@ -23,10 +25,10 @@ concrete LibraryBrowserEng of LibraryBrowser = V2A, paint_V2A, V2S, answer_V2S, V2Q, ask_V2Q - ] + ] +-} ** open (S = SyntaxEng) in { - flags startcat = Utt ; - + lin i_NP = S.i_NP ; you_NP = S.you_NP ; diff --git a/src/api/libraryBrowser/LibraryBrowserSpa.gf b/src/api/libraryBrowser/LibraryBrowserSpa.gf new file mode 100644 index 000000000..03838403a --- /dev/null +++ b/src/api/libraryBrowser/LibraryBrowserSpa.gf @@ -0,0 +1,25 @@ +--# -path=.:alltenses + +concrete LibraryBrowserSpa of LibraryBrowser = + GrammarSpa - [ + UseCopula + ], + LexiconSpa + ** open (S = SyntaxSpa) in { + + lin + i_NP = S.i_NP ; + you_NP = S.you_NP ; + he_NP = S.he_NP ; + she_NP = S.she_NP ; + we_NP = S.we_NP ; + youPl_NP = S.youPl_NP ; + youPol_NP = S.youPol_NP ; + they_NP = S.they_NP ; + + a_Det = S.mkDet S.a_Quant ; + the_Det = S.mkDet S.the_Quant ; + aPl_Det = S.mkDet S.a_Quant S.plNum ; + thePl_Det = S.mkDet S.the_Quant S.plNum ; +} + diff --git a/src/api/libraryBrowser/LibraryBrowserSwe.gf b/src/api/libraryBrowser/LibraryBrowserSwe.gf new file mode 100644 index 000000000..4f66808b9 --- /dev/null +++ b/src/api/libraryBrowser/LibraryBrowserSwe.gf @@ -0,0 +1,25 @@ +--# -path=.:alltenses + +concrete LibraryBrowserSwe of LibraryBrowser = + GrammarSwe - [ + UseCopula + ], + LexiconSwe + ** open (S = SyntaxSwe) in { + + lin + i_NP = S.i_NP ; + you_NP = S.you_NP ; + he_NP = S.he_NP ; + she_NP = S.she_NP ; + we_NP = S.we_NP ; + youPl_NP = S.youPl_NP ; + youPol_NP = S.youPol_NP ; + they_NP = S.they_NP ; + + a_Det = S.mkDet S.a_Quant ; + the_Det = S.mkDet S.the_Quant ; + aPl_Det = S.mkDet S.a_Quant S.plNum ; + thePl_Det = S.mkDet S.the_Quant S.plNum ; +} +