forked from GitHub/gf-rgl
fix conflicts
This commit is contained in:
@@ -1,3 +1,16 @@
|
|||||||
--# -path=.:../basque:../common:../abstract:../prelude
|
--# -path=.:../basque:../common:../abstract:../prelude
|
||||||
|
|
||||||
resource TryEus = SyntaxEus, LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj] ;
|
resource TryEus = SyntaxEus-[mkVoc], LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj,mkVoc] **
|
||||||
|
open (P = ParadigmsEus) in {
|
||||||
|
|
||||||
|
oper
|
||||||
|
mkAdv = overload SyntaxEus {
|
||||||
|
mkAdv : Str -> Adv = P.mkAdv ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
mkVoc = overload {
|
||||||
|
mkVoc : NP -> Voc = SyntaxEus.mkVoc ;
|
||||||
|
mkVoc : Str -> Voc = P.mkVoc ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user