GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-07-01 19:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Por) several minor updates (#49)

Browse Source 
* fix linearization of either/or

* (Por) minor updates
- correction in Lexicon
- documentation in Morpho
- rm variants from Structural

* (Por) correct references to extinct opers

* (Por) rm Spa remnants

* (Abs) rm reference to Extra in Structural -- use Extend instead

* (Por) ExtendPor
- use Extend instead of Extra in All
- use Extend funs in Extra whenever possible

* trigger CI

* (Por) Diff
- sort opers
- rm old commented code
- tidy things up
- no semantic changes

* (Por) add IrregBesch module with verbs using Besch paradigms
- Besch :
  - use hack to prevent runtime failure with glue in in vars output
  - rm paradigm numbers
- add IrregBeschPor, verbs that use only bescherelle paradigms
  - use them in Construction, Structural, Idiom, Extra
- Diff and Paradigms had (almost) the same oper (verboV/verbBeschH),
  so combine them into one and use it

* (Por) update functions to use new Irreg suffix and resolve name conflicts
This commit is contained in:
bruno cuconato
2018-05-24 11:24:39 +00:00
committed by Inari Listenmaa
parent fe0b7c13fe
commit 9bd63b9d8d
19 changed files with 1067 additions and 1429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/portuguese/ExtraPor.gf
+14 -26
View File
@@ -1,18 +1,20 @@
-- the Extra* modules are to be deprecated in favour of the Extend*
-- module.
concrete ExtraPor of ExtraPorAbs = ExtraRomancePor **
open CommonRomance, PhonoPor, MorphoPor, ParadigmsPor, ParamX, ResPor, BeschPor, (I = IrregPor), (S = StructuralPor),
open CommonRomance, PhonoPor, MorphoPor, ParadigmsPor, ParamX, ResPor, BeschPor, (B = IrregBeschPor), (E = ExtendPor),
Prelude in {
flags coding=utf8 ;
lin
--- Prons
i8fem_Pron = pronAgr S.i_Pron Fem Sg P1 ;
youSg8fem_Pron = pronAgr S.youSg_Pron Fem Sg P3 ;
we8fem_Pron = pronAgr S.we_Pron Fem Pl P1 ;
youPl8fem_Pron = pronAgr S.youPl_Pron Fem Pl P3 ;
youPolPl_Pron = S.youPol_Pron ** pronLin "vós" "vos" "vos" "vós" ;
youPol8fem_Pron = pronAgr S.youPol_Pron Fem Sg P2 ;
youPolPl8fem_Pron = pronAgr youPolPl_Pron Fem Pl P2 ;
they8fem_Pron = mkPronFrom S.they_Pron "elas" "as" "lhes" "elas" Fem Pl P3 ;
i8fem_Pron = E.iFem_Pron ;
youSg8fem_Pron = E.youFem_Pron ;
we8fem_Pron = E.weFem_Pron ;
youPl8fem_Pron = E.youPlFem_Pron ;
youPolPl_Pron = E.youPolPl_Pron ;
youPol8fem_Pron = E.youPolFem_Pron ;
youPolPl8fem_Pron = E.youPolPlFem_Pron ;
they8fem_Pron = E.theyFem_Pron ;
these8fem_NP = makeNP ["estas"] Fem Pl ;
@@ -37,24 +39,10 @@ concrete ExtraPor of ExtraPorAbs = ExtraRomancePor **
} ;
-- ExtraRomance.PassVPSlash uses estar
PassVPSlash_ser vps =
let auxvp = predV copula
in
insertComplement (\\a => let agr = complAgr a in vps.s.s ! VPart agr.g agr.n) {
s = auxvp.s ;
agr = auxvp.agr ;
neg = vps.neg ;
clit1 = vps.clit1 ;
clit2 = vps.clit2 ;
clit3 = vps.clit3 ;
isNeg = vps.isNeg ;
comp = vps.comp ;
ext = vps.ext
} ;
PassVPSlash_ser = E.PassVPSlash ;
ExistsNP np =
mkClause [] True False np.a (insertComplement (\\_ => (np.s ! Nom).ton) (predV (mkV "existir"))) ;
ExistsNP = E.ExistsNP ;
UseComp_estar comp = insertComplement comp.s (predV I.estar_V) ;
UseComp_estar comp = insertComplement comp.s (predV B.estar_V) ;
}