(Por) several minor updates (#49)

* 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
+4 -4
View File
@@ -1,5 +1,5 @@
concrete IdiomPor of Idiom = CatPor **
open (P = ParamX), MorphoPor, ParadigmsPor, BeschPor, Prelude in {
open (P = ParamX), MorphoPor, ParadigmsPor, BeschPor, (B = IrregBeschPor), Prelude in {
flags optimize=all_subs ;
@@ -20,11 +20,11 @@ concrete IdiomPor of Idiom = CatPor **
ExistNP np =
mkClause [] True False (agrP3 Masc Sg)
(insertComplement (\\_ => (np.s ! Acc).ton) (predV (mkV (haver_2 "haver")))) ;
(insertComplement (\\_ => (np.s ! Acc).ton) (predV B.haver_V)) ;
ExistIP ip = {
s = \\t,a,p,_ =>
ip.s ! Nom ++
(mkClause [] True False (agrP3 Masc Sg) (predV (mkV (haver_2 "haver")))).s ! DDir ! t ! a ! p ! Indic
(mkClause [] True False (agrP3 Masc Sg) (predV B.haver_V)).s ! DDir ! t ! a ! p ! Indic
} ;
ProgrVP vp =
@@ -36,7 +36,7 @@ concrete IdiomPor of Idiom = CatPor **
in
vp.s.s ! VGer ++ clpr.p1 ++ obj
)
(predV (mkV (estar_10 "estar"))) ;
(predV B.estar_V) ;
ImpPl1 vp = {s =
mkImperative False P1 vp ! RPos ! Masc ! Pl ; --- fem