From 111d883dacd3c74a62e3b8e3068da4d006300056 Mon Sep 17 00:00:00 2001 From: odanoburu Date: Thu, 3 Jan 2019 12:11:35 -0200 Subject: [PATCH] (Por) don't use IrregBeschPor in {All,Lang}Por for faster compilation (although it is no problem now, as the module grows it might slow things down) --- src/portuguese/ConstructionPor.gf | 4 ++-- src/portuguese/DiffPor.gf | 2 +- src/portuguese/IdiomPor.gf | 2 +- src/portuguese/IrregBeschPor.gf | 2 +- src/portuguese/LexiconPor.gf | 20 ++++++++++++++------ src/portuguese/StructuralPor.gf | 12 +++++------- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/portuguese/ConstructionPor.gf b/src/portuguese/ConstructionPor.gf index 752337b43..1a1cad140 100644 --- a/src/portuguese/ConstructionPor.gf +++ b/src/portuguese/ConstructionPor.gf @@ -2,7 +2,7 @@ concrete ConstructionPor of Construction = CatPor ** open SyntaxPor, SymbolicPor, ParadigmsPor, BeschPor, - (L = LexiconPor), (B = IrregBeschPor), (R = ResPor), + (L = LexiconPor), (B = DiffPor), (R = ResPor), (S = SyntaxPor), (C = CommonRomance), CommonRomance, Prelude in { flags coding=utf8 ; @@ -24,7 +24,7 @@ lin how_far_QCl x = mkQCl (lin IAdv (ss "a que distância")) (mkCl x B.estar_V) ; -- some more things - weather_adjCl ap = mkCl (mkVP (mkVA B.fazer_V) (lin AP ap)) ; + weather_adjCl ap = mkCl (mkVP (mkVA (mkV (fazer_Besch "fazer"))) (lin AP ap)) ; is_right_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "certo")) ; is_wrong_VP = mkVP (mkVA B.estar_V) (mkAP (mkA "errado")) ; diff --git a/src/portuguese/DiffPor.gf b/src/portuguese/DiffPor.gf index 16cd4d118..d2e80ee4c 100644 --- a/src/portuguese/DiffPor.gf +++ b/src/portuguese/DiffPor.gf @@ -1,4 +1,4 @@ ---# -path=.:../romance:../abstract:../common:prelude +--# -path=.:../romance:../abstract:../common:../prelude instance DiffPor of DiffRomance - [partAgr,vpAgrSubj,vpAgrClits] = open CommonRomance, PhonoPor, BeschPor, Prelude in { diff --git a/src/portuguese/IdiomPor.gf b/src/portuguese/IdiomPor.gf index d33d8b366..8191b6b60 100644 --- a/src/portuguese/IdiomPor.gf +++ b/src/portuguese/IdiomPor.gf @@ -1,5 +1,5 @@ concrete IdiomPor of Idiom = CatPor ** - open (P = ParamX), MorphoPor, ParadigmsPor, BeschPor, (B = IrregBeschPor), Prelude in { + open (P = ParamX), MorphoPor, ParadigmsPor, BeschPor, (B = DiffPor), Prelude in { flags optimize=all_subs ; diff --git a/src/portuguese/IrregBeschPor.gf b/src/portuguese/IrregBeschPor.gf index 21c8c72da..d720b859e 100644 --- a/src/portuguese/IrregBeschPor.gf +++ b/src/portuguese/IrregBeschPor.gf @@ -357,4 +357,4 @@ flags optimize=noexpand ; porvir_V = mkV (vir_Besch "porvir") ; sobrevir_V = mkV (vir_Besch "sobrevir") ; -} ; \ No newline at end of file +} ; diff --git a/src/portuguese/LexiconPor.gf b/src/portuguese/LexiconPor.gf index 02e60f144..8ddc28cd9 100644 --- a/src/portuguese/LexiconPor.gf +++ b/src/portuguese/LexiconPor.gf @@ -1,7 +1,7 @@ ---# -path=.:../romance:../common:../abstract:../../prelude +--# -path=.:../romance:../common:../abstract:../prelude concrete LexiconPor of Lexicon = CatPor ** open - (M=MorphoPor), ParadigmsPor, BeschPor, Prelude, (D = DiffPor), (S = StructuralPor) in { + (M=MorphoPor), ParadigmsPor, BeschPor, Prelude, (D = DiffPor) in { flags optimize=values ; @@ -9,7 +9,7 @@ flags lin easy_A2V = mkA2V (mkA "fácil") dative genitive ; - married_A2 = mkA2 (mkA "casado") S.with_Prep ; + married_A2 = mkA2 (mkA "casado") (mkPrep "com") ; probable_AS = mkAS (prefA (mkA "provável" "provavelmente")) ; fun_AV = mkAV (mkA "divertido") genitive ; -- A @@ -276,7 +276,7 @@ lin hate_V2 = mkV2 (mkV (odiar_Besch "odiar")) ; hear_V2 = mkV2 (mkV "ouvir") ; hit_V2 = mkV2 (mkV "bater") ; - hold_V2 = mkV2 (mkV (ter_Besch "ter")) ; + hold_V2 = mkV2 ter_V ; hunt_V2 = mkV2 (mkV "caçar") ; kill_V2 = mkV2 (mkV "matar") ; know_V2 = mkV2 (mkV "conhecer") ; @@ -319,11 +319,11 @@ lin send_V3 = mkV3 (mkV "enviar") dative ; -- mandar talk_V3 = mkV3 (mkV "falar") dative genitive ; become_VA = reflV (mkV "tornar") ; - know_VQ = mkVQ (mkV "saber") ; + know_VQ = mkVQ saber_V ; wonder_VQ = mkVQ (reflV (mkV "perguntar")) ; fear_VS = mkVS (mkV "temer") ; hope_VS = mkVS (mkV "esperar") ; - know_VS = mkVS (mkV "saber") ; + know_VS = mkVS saber_V ; say_VS = mkVS (mkV (dizer_Besch "dizer")) ; -- V blow_V = mkV "assoprar" ; @@ -361,4 +361,12 @@ lin walk_V = mkV "caminhar" ; -- interj alas_Interj = ss "infelizmente" ; + + oper + saber_V : V ; + saber_V = mkV (saber_Besch "saber") ; + + ter_V : V ; + ter_V = mkV (ter_Besch "ter") ; + } ; diff --git a/src/portuguese/StructuralPor.gf b/src/portuguese/StructuralPor.gf index 22ed8b681..7f708faf0 100644 --- a/src/portuguese/StructuralPor.gf +++ b/src/portuguese/StructuralPor.gf @@ -1,15 +1,13 @@ +--# -path=.:../romance:../common:../abstract:../prelude concrete StructuralPor of Structural = CatPor ** open PhonoPor, MorphoPor, ParadigmsPor, BeschPor, DiffPor, - MakeStructuralPor, (X = ConstructX), (B=IrregBeschPor) + MakeStructuralPor, (X = ConstructX), (B=LexiconPor) , Prelude in { flags optimize=all ; coding=utf8 ; lin - -- have_V3 - -- have_not_V3 - --- Prons i_Pron = mkPronoun @@ -65,7 +63,7 @@ concrete StructuralPor of Structural = CatPor ** by8agent_Prep = mkPrep [] ablative ; -- por by8means_Prep = mkPrep [] ablative ; -- por can8know_VV = mkVV B.saber_V ; - can_VV = mkVV B.poder_V ; + can_VV = mkVV (mkV (poder_Besch "poder")) ; during_Prep = mkPrep "durante" ; either7or_DConj = {s1,s2 = "ou" ; n = Sg} ; everybody_NP = makeNP "todos" Masc Pl ; @@ -138,7 +136,7 @@ concrete StructuralPor of Structural = CatPor ** to_Prep = complDat ; under_Prep = mkPrep "embaixo" ; very_AdA = ss "muito" ; - want_VV = mkVV B.querer_V ; + want_VV = mkVV (mkV (querer_Besch "querer")) ; whatSg_IP = {s = \\c => prepCase c ++ "que" ; a = aagr Masc Sg} ; whatPl_IP = {s = \\c => prepCase c ++ "que" ; a = aagr Masc Pl} ; --- when_IAdv = ss "quando" ; @@ -166,4 +164,4 @@ concrete StructuralPor of Structural = CatPor ** that_Subj = {s = "que" ; m = Conjunct} ; lin language_title_Utt = ss "português" ; -} +} ;