mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-23 01:52:50 -06:00
fixed naming conflicts in resource
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
|
||||
flags optimize=noexpand ;
|
||||
|
||||
param
|
||||
Prep = P_de | P_a ;
|
||||
Prepos = P_de | P_a ;
|
||||
VType = VHabere | VRefl ;
|
||||
|
||||
oper
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
--# -path=.:../romance:../common:../abstract:../../prelude
|
||||
|
||||
concrete LexiconSpa of Lexicon = CatSpa ** open
|
||||
MorphoSpa, ParadigmsSpa, BeschSpa in {
|
||||
(M=MorphoSpa), ParadigmsSpa, BeschSpa in {
|
||||
|
||||
flags
|
||||
optimize=values ;
|
||||
@@ -223,8 +223,8 @@ lin
|
||||
stop_V = regV "parar" ;
|
||||
jump_V = regV "saltar" ;
|
||||
|
||||
left_Ord = mkOrd (regA "izquierda") ;
|
||||
right_Ord = mkOrd (regA "derecha") ;
|
||||
left_Ord = M.mkOrd (regA "izquierda") ;
|
||||
right_Ord = M.mkOrd (regA "derecha") ;
|
||||
far_Adv = mkAdv "lejos" ; ----?
|
||||
correct_A = regA "correcto" ;
|
||||
dry_A = regA "seco" ;
|
||||
|
||||
@@ -150,7 +150,7 @@ lin
|
||||
Masc Sg P3 ;
|
||||
|
||||
oper
|
||||
etConj : {s : Str ; n : Number} = {s = pre {
|
||||
etConj : {s : Str ; n : MorphoSpa.Number} = {s = pre {
|
||||
"y" ;
|
||||
"y" / strs {"ya" ; "ye" ; "yo" ; "yu"} ;
|
||||
"e" / strs {"i" ; "hi" ; "y"}
|
||||
|
||||
Reference in New Issue
Block a user