mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-14 07:19:31 -06:00
new words in DictionaryFin and rules in ExtensionsFin ; some fun's in Dictionary commented out with ----*
This commit is contained in:
@@ -66,8 +66,8 @@ lin
|
||||
|
||||
monthAdv m = SyntaxFin.mkAdv in_Prep (mkNP m) ;
|
||||
yearAdv y = SyntaxFin.mkAdv (prePrep nominative "vuonna") y ;
|
||||
---- dayMonthAdv d m = ParadigmsFin.mkAdv (d.s ! R.NPCase R.Nom ++ BIND ++ "." ++ m.s ! R.NCase R.Sg R.Part) ;
|
||||
---- monthYearAdv m y = SyntaxFin.mkAdv in_Prep (mkNP (mkNP m) (SyntaxFin.mkAdv (casePrep nominative) y)) ;
|
||||
dayMonthAdv d m = ParadigmsFin.mkAdv ((mkUtt d).s ++ BIND ++ "." ++ (mkUtt (mkNP m)).s) ;
|
||||
monthYearAdv m y = SyntaxFin.mkAdv in_Prep (mkNP (mkNP m) (SyntaxFin.mkAdv (casePrep nominative) y)) ;
|
||||
---- dayMonthYearAdv d m y =
|
||||
---- lin Adv {s = d.s ! R.NPCase R.Nom ++ BIND ++ "." ++ m.s ! R.NCase R.Sg R.Part ++ y.s ! R.NPCase R.Nom} ;
|
||||
|
||||
@@ -84,6 +84,10 @@ lin InLanguage l = SyntaxFin.mkAdv (mkPrep translative) (mkNP l) ;
|
||||
lin
|
||||
weekdayN w = w.noun ;
|
||||
monthN m = m ;
|
||||
|
||||
weekdayPN w = mkPN w.noun ;
|
||||
monthPN m = mkPN m ;
|
||||
|
||||
languageNP l = mkNP l ;
|
||||
languageCN l = mkCN l ;
|
||||
|
||||
|
||||
@@ -3126,7 +3126,7 @@ fun approx_PN : PN ;
|
||||
fun approximate_A : A ;
|
||||
fun approximate_V : V ;
|
||||
fun approximate_V2 : V2 ;
|
||||
fun approximately_A : A ;
|
||||
fun approximately_Adv : Adv ;
|
||||
fun approximation_N : N ;
|
||||
fun appurtenance_N : N ;
|
||||
fun apr_PN : PN ;
|
||||
@@ -13307,7 +13307,7 @@ fun cougar_N : N ;
|
||||
fun cough_N : N ;
|
||||
fun cough_V : V ;
|
||||
fun cough_up_V2 : V2 ;
|
||||
fun could_N : N ;
|
||||
----* fun could_N : N ;
|
||||
fun coulisse_N : N ;
|
||||
fun coulomb_N : N ;
|
||||
fun coulter_N : N ;
|
||||
@@ -20185,7 +20185,7 @@ fun expectable_A : A ;
|
||||
fun expectancy_N : N ;
|
||||
fun expectant_A : A ;
|
||||
fun expectation_N : N ;
|
||||
fun expectations_N : N ;
|
||||
----* fun expectations_N : N ;
|
||||
fun expected_A : A ;
|
||||
fun expectedness_N : N ;
|
||||
fun expectorant_N : N ;
|
||||
@@ -23748,7 +23748,7 @@ fun gesticulation_N : N ;
|
||||
fun gestural_A : A ;
|
||||
fun gesture_N : N ;
|
||||
fun gesture_V : V ;
|
||||
fun get_N : N ;
|
||||
----* fun get_N : N ;
|
||||
fun get_V2 : V2 ;
|
||||
fun get_V2V : V2V ;
|
||||
fun get_VV : VV ;
|
||||
@@ -34480,7 +34480,7 @@ fun masque_N : N ;
|
||||
fun masquerade_N : N ;
|
||||
fun masquerade_V : V ;
|
||||
fun masquerader_N : N ;
|
||||
fun mass_A : A ;
|
||||
----* fun mass_A : A ;
|
||||
fun mass_N : N ;
|
||||
fun mass_V : V ;
|
||||
fun mass_V2 : V2 ;
|
||||
@@ -37828,7 +37828,7 @@ fun newtonian_A : A ;
|
||||
fun newtonian_N : N ;
|
||||
fun newtown_PN : PN ;
|
||||
fun next_A : A ;
|
||||
fun next_N : N ;
|
||||
----* fun next_N : N ;
|
||||
fun next_Prep : Prep ;
|
||||
fun next_to_Prep : Prep ;
|
||||
fun nexus_N : N ;
|
||||
@@ -61819,7 +61819,7 @@ fun untidy_A : A ;
|
||||
fun untie_V : V ;
|
||||
fun untie_V2 : V2 ;
|
||||
fun untied_A : A ;
|
||||
fun until_Adv : Adv ;
|
||||
----* fun until_Adv : Adv ;
|
||||
fun until_Prep : Prep ;
|
||||
fun until_Subj : Subj ;
|
||||
fun untilled_A : A ;
|
||||
@@ -63951,7 +63951,7 @@ fun when_Subj : Subj ;
|
||||
fun whence_Adv : Adv ;
|
||||
fun whencesoever_A : A ;
|
||||
fun whenever_Adv : Adv ;
|
||||
fun where_Adv : Adv ;
|
||||
----* fun where_Adv : Adv ;
|
||||
fun where_IAdv : IAdv ;
|
||||
fun where_Subj : Subj ;
|
||||
fun where_as_Prep : Prep ;
|
||||
@@ -64699,7 +64699,7 @@ fun worshipful_A : A ;
|
||||
fun worshipper_N : N ;
|
||||
fun worst_A : A ;
|
||||
fun worst_Adv : Adv ;
|
||||
fun worst_N : N ;
|
||||
----* fun worst_N : N ;
|
||||
fun worst_V2 : V2 ;
|
||||
fun worsted_N : N ;
|
||||
fun wort_N : N ;
|
||||
@@ -64714,7 +64714,7 @@ fun worthwhile_A : A ;
|
||||
fun worthwhileness_N : N ;
|
||||
fun worthy_A : A ;
|
||||
fun worthy_N : N ;
|
||||
fun would_N : N ;
|
||||
----* fun would_N : N ;
|
||||
fun would_be_A : A ;
|
||||
fun wound_N : N ;
|
||||
fun wound_V2 : V2 ;
|
||||
|
||||
@@ -3141,7 +3141,7 @@ lin approx_PN = mkPN "Approx";
|
||||
lin approximate_A = compoundA (mkA "approximate");
|
||||
lin approximate_V = mkV "approximate" "approximates" "approximated" "approximated" "approximating";
|
||||
lin approximate_V2 = mkV2 (mkV "approximate" "approximates" "approximated" "approximated" "approximating");
|
||||
lin approximately_A = mkA "approximately" ;
|
||||
lin approximately_Adv = mkAdv "approximately" ;
|
||||
lin approximation_N = mkN "approximation" "approximations";
|
||||
lin appurtenance_N = mkN "appurtenance" "appurtenances";
|
||||
lin apr_PN = mkPN "Apr";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,11 @@ lin
|
||||
s = \\_ => (snoun2nounSep {s = \\f => noun.s ! 10 ++ BIND ++ adj.s ! Posit ! sAN f ; h = adj.h}).s
|
||||
} ;
|
||||
|
||||
---- PastPartAP vp = {s = \\_,nf => (sverb2verbSep v).s ! PastPartPass (AN nf)} ;
|
||||
PresPartAP vp = { ---- many things can go wrong here...
|
||||
s = \\bool,nform =>
|
||||
vp.s2 ! True ! Pos ! agrP3 Sg ++ vp.adv ! Pos ++ vp.ext ++
|
||||
(sverb2verbSep vp.s).s ! PresPartAct (AN nform)
|
||||
} ;
|
||||
|
||||
PredVPosv np vp = mkCl np vp ; ----
|
||||
|
||||
|
||||
Reference in New Issue
Block a user