mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
now ago_Prep is postposition in English
This commit is contained in:
@@ -1262,9 +1262,8 @@ lin agnosia_N = variants {};
|
||||
lin agnostic_A = variants {};
|
||||
lin agnostic_N = mkN014a "агностик";
|
||||
lin agnosticism_N = mkN011 "агностицизъм";
|
||||
lin ago_A = variants {};
|
||||
lin ago_Adv = variants {};
|
||||
lin ago_Prep = variants {};
|
||||
lin ago_Prep = mkPrep "преди" Acc;
|
||||
lin agog_A = variants {};
|
||||
lin agon_N = variants {};
|
||||
lin agonadal_A = variants {};
|
||||
|
||||
@@ -9,7 +9,7 @@ concrete AdverbEng of Adverb = CatEng ** open ResEng, Prelude in {
|
||||
s = cadv.s ++ a.s ! AAdv ++ cadv.p ++ s.s
|
||||
} ;
|
||||
|
||||
PrepNP prep np = {s = prep.s ++ np.s ! NPAcc} ;
|
||||
PrepNP prep np = {s = preOrPost prep.isPre prep.s (np.s ! NPAcc)} ;
|
||||
|
||||
AdAdv = cc2 ;
|
||||
PositAdAAdj a = {s = a.s ! AAdv} ;
|
||||
|
||||
@@ -87,7 +87,7 @@ concrete CatEng of Cat = CommonX - [Pol] ** open ResEng, Prelude in {
|
||||
---b Conj = {s : Str ; n : Number} ;
|
||||
---b DConj = {s1,s2 : Str ; n : Number} ;
|
||||
Subj = {s : Str} ;
|
||||
Prep = {s : Str} ;
|
||||
Prep = {s : Str; isPre : Bool} ;
|
||||
|
||||
-- Open lexical classes, e.g. Lexicon
|
||||
|
||||
|
||||
@@ -1250,9 +1250,8 @@ lin agnosia_N = mkN "agnosia" ;
|
||||
lin agnostic_A = compoundA (mkA "agnostic");
|
||||
lin agnostic_N = mkN human (mkN "agnostic" "agnostics");
|
||||
lin agnosticism_N = mkN "agnosticism" ;
|
||||
lin ago_A = mkA "ago" ;
|
||||
lin ago_Adv = mkAdv "ago";
|
||||
lin ago_Prep = mkPrep "ago";
|
||||
lin ago_Prep = mkPost "ago";
|
||||
lin agog_A = compoundA (mkA "agog");
|
||||
lin agon_N = mkN "agon" ;
|
||||
lin agonadal_A = mkA "agonadal" ;
|
||||
|
||||
@@ -1247,7 +1247,6 @@ fun agnosia_N : N;
|
||||
fun agnostic_A : A;
|
||||
fun agnostic_N : N;
|
||||
fun agnosticism_N : N;
|
||||
fun ago_A : A;
|
||||
fun ago_Adv : Adv;
|
||||
fun ago_Prep : Prep ;
|
||||
fun agog_A : A;
|
||||
|
||||
@@ -202,6 +202,7 @@ oper
|
||||
-- build $PP$s in the resource API, just requires a string.
|
||||
|
||||
mkPrep : Str -> Prep ; -- e.g. "in front of"
|
||||
mkPost : Str -> Prep ; -- e.g. "ago"
|
||||
noPrep : Prep ; -- no preposition
|
||||
|
||||
-- (These two functions are synonyms.)
|
||||
@@ -486,7 +487,8 @@ mkInterj : Str -> Interj
|
||||
mkAdA x = lin AdA (ss x) ;
|
||||
mkAdN x = lin AdN (ss x) ;
|
||||
|
||||
mkPrep p = lin Prep (ss p) ;
|
||||
mkPrep p = lin Prep {s=p; isPre=True} ;
|
||||
mkPost p = lin Prep {s=p; isPre=False} ;
|
||||
noPrep = mkPrep [] ;
|
||||
|
||||
mk5V a b c d e = lin V (mkVerb a b c d e ** {s1 = []}) ;
|
||||
|
||||
Reference in New Issue
Block a user