GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-24 02:12:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

checking name conflicts; some RGs don't work now

Browse Source
This commit is contained in:
aarne
2007-06-17 21:56:27 +00:00
parent adf0f8e83e
commit 3adf824e8e
13 changed files with 101 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/resource-1.0/english/CatEng.gf
View File

@@ -12,29 +12,29 @@ concrete CatEng of Cat = CommonX ** open ResEng, Prelude in {
-- Sentence
Cl = {s : Tense => Anteriority => CPolarity => Order => Str} ;
Cl = {s : ResEng.Tense => Anteriority => CPolarity => Order => Str} ;
Slash = {
s : Tense => Anteriority => CPolarity => Order => Str ;
s : ResEng.Tense => Anteriority => CPolarity => Order => Str ;
c2 : Str
} ;
Imp = {s : CPolarity => ImpForm => Str} ;
-- Question
QCl = {s : Tense => Anteriority => CPolarity => QForm => Str} ;
QCl = {s : ResEng.Tense => Anteriority => CPolarity => QForm => Str} ;
IP = {s : Case => Str ; n : Number} ;
IComp = {s : Str} ;
IDet = {s : Str ; n : Number} ;
-- Relative
RCl = {s : Tense => Anteriority => CPolarity => Agr => Str ; c : Case} ;
RCl = {s : ResEng.Tense => Anteriority => CPolarity => Agr => Str ; c : Case} ;
RP = {s : RCase => Str ; a : RAgr} ;
-- Verb
VP = {
s : Tense => Anteriority => CPolarity => Order => Agr => {fin, inf : Str} ;
s : ResEng.Tense => Anteriority => CPolarity => Order => Agr => {fin, inf : Str} ;
prp : Str ; -- present participle
inf : Str ; -- infinitive
ad : Str ;

34
lib/resource-1.0/english/LexiconEng.gf
View File

@@ -302,34 +302,34 @@ lin
wing_N = regN "wing" ;
worm_N = regN "worm" ;
year_N = regN "year" ;
blow_V = blow_V ;
blow_V = IrregEng.blow_V ;
breathe_V = dirV2 (regV "breathe") ;
burn_V = burn_V ;
dig_V = dig_V ;
fall_V = fall_V ;
burn_V = IrregEng.burn_V ;
dig_V = IrregEng.dig_V ;
fall_V = IrregEng.fall_V ;
float_V = regV "float" ;
flow_V = regV "flow" ;
fly_V = fly_V ;
freeze_V = freeze_V ;
fly_V = IrregEng.fly_V ;
freeze_V = IrregEng.freeze_V ;
give_V3 = dirV3 give_V toP ;
laugh_V = regV "laugh" ;
lie_V = lie_V ;
lie_V = IrregEng.lie_V ;
play_V = regV "play" ;
sew_V = sew_V ;
sing_V = sing_V ;
sit_V = sit_V ;
sew_V = IrregEng.sew_V ;
sing_V = IrregEng.sing_V ;
sit_V = IrregEng.sit_V ;
smell_V = regV "smell" ;
spit_V = spit_V ;
stand_V = stand_V ;
swell_V = swell_V ;
swim_V = swim_V ;
think_V = think_V ;
spit_V = IrregEng.spit_V ;
stand_V = IrregEng.stand_V ;
swell_V = IrregEng.swell_V ;
swim_V = IrregEng.swim_V ;
think_V = IrregEng.think_V ;
turn_V = regV "turn" ;
vomit_V = regV "vomit" ;
bite_V2 = dirV2 bite_V ;
bite_V2 = dirV2 IrregEng.bite_V ;
count_V2 = dirV2 (regV "count") ;
cut_V2 = dirV2 cut_V ;
cut_V2 = dirV2 IrregEng.cut_V ;
fear_V2 = dirV2 (regV "fear") ;
fight_V2 = dirV2 fight_V ;
hit_V2 = dirV2 hit_V ;