GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-22 11:19:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes in DictEng and ParseEng

Browse Source
This commit is contained in:
kr.angelov
2012-05-07 21:40:14 +00:00
parent ed6a53609b
commit 38ed063405
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/english/DictEng.gf
View File

@@ -7956,7 +7956,7 @@ lin corps_diplomatique_N = mkN "corps diplomatique" "IRREG";
lin corpse_N = mkN "corpse" "corpses";
lin corpulence_N = mkN "corpulence" ;
lin corpulent_A = compoundA (mkA "corpulent");
lin corpus_N = mkN "corpus" "corpi" {- FIXME: guessed plural form -};
lin corpus_N = mkN "corpus" "corpora";
lin corpuscle_N = mkN "corpuscle" "corpuscles";
lin corral_N = mkN "corral" "corrals";
lin corral_V2 = mkV2 (mkV "corral" "corrals" "corralled" "corralled" "corralling");
@@ -27772,7 +27772,6 @@ lin point_V2 = mkV2 (mkV "point" "points" "pointed" "pointed" "pointing");
lin point_blank_A = compoundA (mkA "point - blank");
lin point_blank_Adv = mkAdv "point - blank";
lin point_duty_N = mkN "point - duty" ;
lin pointed_A = compoundA (mkA "pointed");
lin pointer_N = mkN "pointer" "pointers";
lin pointless_A = compoundA (mkA "pointless");
lin pointsman_N = mkN "pointsman" "pointsmen" {- FIXME: guessed plural form -};
@@ -42153,7 +42152,8 @@ lin whang_N = mkN "whang" "whangs";
lin whang_V2 = mkV2 (mkV "whang" "whangs" "whanged" "whanged" "whanging");
lin wharf_N = mkN "wharf" "wharfs";
lin wharfage_N = mkN "wharfage" ;
lin what_A = compoundA (mkA "what");
lin whatPl_IP = mkIP "what" "what" "what's" plural ;
lin whatSg_IP = mkIP "what" "what" "what's" singular ;
lin what_for_N = mkN "what - for" ;
lin whate'er_A = compoundA (mkA "whate'er");
lin whatever_A = compoundA (mkA "whatever");
@@ -42316,6 +42316,8 @@ lin whiz_N = mkN "whiz" ;
lin whiz_V = mkV "whiz" "IRREG" "IRREG" "IRREG" "IRREG";
lin whizz_kid_N = mkN "whizz - kid" "whizz - kids";
lin who_N = mkN "who" ;
lin whoPl_IP = mkIP "who" "whom" "whose" plural ;
lin whoSg_IP = mkIP "who" "whom" "whose" singular ;
lin whodunit_N = mkN "whodunit" "whodunits";
lin whole_A = compoundA (mkA "whole");
lin whole_N = mkN "whole" "wholes";

6
lib/src/english/DictEngAbs.gf
View File

@@ -27723,7 +27723,6 @@ fun point_V2 : V2;
fun point_blank_A : A;
fun point_blank_Adv : Adv;
fun point_duty_N : N;
fun pointed_A : A;
fun pointer_N : N;
fun pointless_A : A;
fun pointsman_N : N;
@@ -42086,7 +42085,8 @@ fun whang_N : N;
fun whang_V2 : V2;
fun wharf_N : N;
fun wharfage_N : N;
fun what_A : A;
fun whatPl_IP : IP;
fun whatSg_IP : IP;
fun what_for_N : N;
fun whate'er_A : A;
fun whatever_A : A;
@@ -42249,6 +42249,8 @@ fun whiz_N : N;
fun whiz_V : V;
fun whizz_kid_N : N;
fun who_N : N;
fun whoPl_IP : IP;
fun whoSg_IP : IP;
fun whodunit_N : N;
fun whole_A : A;
fun whole_N : N;

5
lib/src/english/ParseEng.gf
View File

@@ -5,9 +5,9 @@ concrete ParseEng of ParseEngAbs =
NounEng,
AdjectiveEng,
NumeralEng,
SymbolEng,
SymbolEng [PN, Symb, MkSymb, SymbPN],
ConjunctionEng,
VerbEng - [SlashV2V, PassV2],
VerbEng - [SlashV2V, PassV2, UseCopula],
AdverbEng,
PhraseEng,
SentenceEng,
@@ -29,6 +29,7 @@ lin
ourself_NP = regNP "ourself" plural ;
yourselfPl_NP = regNP "yourself" plural ;
themself_NP = regNP "themself" plural ;
themselves_NP = regNP "themselves" plural ;
CompoundCN num noun cn = {
s = \\n,c => num.s ! Nom ++ noun.s ! num.n ! Nom ++ cn.s ! n ! c ;

5
lib/src/english/ParseEngAbs.gf
View File

@@ -4,9 +4,9 @@ abstract ParseEngAbs =
Noun,
Adjective,
Numeral,
Symbol,
Symbol [PN, Symb, String, MkSymb, SymbPN],
Conjunction,
Verb - [SlashV2V, PassV2],
Verb - [SlashV2V, PassV2, UseCopula],
Adverb,
Phrase,
Sentence,
@@ -28,6 +28,7 @@ fun CompoundCN : Num -> N -> CN -> CN ;
ourself_NP : NP ;
yourselfPl_NP : NP ;
themself_NP : NP ;
themselves_NP : NP ;
OrdCompar : A -> Ord ;
PositAdVAdj : A -> AdV ;