mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
Merge branch 'polish' into polish-inari-update
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
mkN : Str -> N ; -- One argument: singular nominative
|
mkN : Str -> N ; -- One argument: singular nominative
|
||||||
mkN : Str -> Gender -> N ;-- Two arguments: singular nom, gender
|
mkN : Str -> Gender -> N ;-- Two arguments: singular nom, gender
|
||||||
mkN : Str -> Str -> N -- Two arguments: sgnom, sggen
|
mkN : Str -> Str -> N -- Two arguments: sgnom, sggen
|
||||||
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
mkA2 : A -> Str -> ComplCase -> A2 ;
|
mkA2 : A -> Str -> ComplCase -> A2 ;
|
||||||
@@ -92,7 +93,6 @@
|
|||||||
_ + "nie" => Neut ;
|
_ + "nie" => Neut ;
|
||||||
_ => Masc Inanimate
|
_ => Masc Inanimate
|
||||||
} in mkNGender sgnom sggen gender ;
|
} in mkNGender sgnom sggen gender ;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
mkNGender = overload {
|
mkNGender = overload {
|
||||||
@@ -104,7 +104,6 @@
|
|||||||
mkNGender : Str -> Str -> Gender -> N = \sgnom,sggen,gender ->
|
mkNGender : Str -> Str -> Gender -> N = \sgnom,sggen,gender ->
|
||||||
let ntable : SubstForm => Str = guess_paradigm sgnom in
|
let ntable : SubstForm => Str = guess_paradigm sgnom in
|
||||||
lin N (NM.mkN ntable gender) ;
|
lin N (NM.mkN ntable gender) ;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
guess_paradigm = overload {
|
guess_paradigm = overload {
|
||||||
@@ -146,7 +145,8 @@
|
|||||||
<_,_ + "ego"> => NM.mkNTable0589 sgnom ; -- Alternative: mkNTable0966
|
<_,_ + "ego"> => NM.mkNTable0589 sgnom ; -- Alternative: mkNTable0966
|
||||||
<_,_> => guess_paradigm_basic sgnom};
|
<_,_> => guess_paradigm_basic sgnom};
|
||||||
-- 1 string
|
-- 1 string
|
||||||
guess_paradigm : (sgnom : Str) -> SubstForm => Str = \sgnom -> guess_paradigm_basic sgnom } ;
|
guess_paradigm : (sgnom : Str) -> SubstForm => Str = guess_paradigm_basic
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
-- Basic 1-str fall-back guesser
|
-- Basic 1-str fall-back guesser
|
||||||
@@ -381,7 +381,6 @@
|
|||||||
_ + "a" => NM.mkNTable0021 sgnom ;
|
_ + "a" => NM.mkNTable0021 sgnom ;
|
||||||
-- NB: Covered in 2-string, including all alternatives: mkNTable0308,mkNTable0364,mkNTable0644,mkNTable0701,mkNTable1022,mkNTable0013,mkNTable0014,mkNTable0020,mkNTable0021,mkNTable0055,mkNTable0060,mkNTable0073,mkNTable0088,mkNTable0099,mkNTable0100,mkNTable0110,mkNTable0159,mkNTable0161,mkNTable0175,mkNTable0189,mkNTable0253,mkNTable0254,mkNTable0274,mkNTable0283,mkNTable0287,mkNTable0300,mkNTable0302,mkNTable0352,mkNTable0382,mkNTable0411,mkNTable0501,mkNTable0504,mkNTable0530,mkNTable0546,mkNTable0565,mkNTable0576,mkNTable0580,mkNTable0614,mkNTable0630,mkNTable0702,mkNTable0721,mkNTable0727,mkNTable0755,mkNTable0760,mkNTable0921,mkNTable0950,mkNTable0990,mkNTable1045
|
-- NB: Covered in 2-string, including all alternatives: mkNTable0308,mkNTable0364,mkNTable0644,mkNTable0701,mkNTable1022,mkNTable0013,mkNTable0014,mkNTable0020,mkNTable0021,mkNTable0055,mkNTable0060,mkNTable0073,mkNTable0088,mkNTable0099,mkNTable0100,mkNTable0110,mkNTable0159,mkNTable0161,mkNTable0175,mkNTable0189,mkNTable0253,mkNTable0254,mkNTable0274,mkNTable0283,mkNTable0287,mkNTable0300,mkNTable0302,mkNTable0352,mkNTable0382,mkNTable0411,mkNTable0501,mkNTable0504,mkNTable0530,mkNTable0546,mkNTable0565,mkNTable0576,mkNTable0580,mkNTable0614,mkNTable0630,mkNTable0702,mkNTable0721,mkNTable0727,mkNTable0755,mkNTable0760,mkNTable0921,mkNTable0950,mkNTable0990,mkNTable1045
|
||||||
_ => NM.mkNTable0171 sgnom -- Alternatives: mkNTable0000,mkNTable0001,mkNTable0002,mkNTable0003,mkNTable0010,mkNTable0015,mkNTable0028,mkNTable0037,mkNTable0043,mkNTable0044,mkNTable0053,mkNTable0064,mkNTable0067,mkNTable0075,mkNTable0091,mkNTable0096,mkNTable0111,mkNTable0117,mkNTable0118,mkNTable0129,mkNTable0131,mkNTable0168,mkNTable0171,mkNTable0173,mkNTable0176,mkNTable0181,mkNTable0191,mkNTable0197,mkNTable0213,mkNTable0243,mkNTable0244,mkNTable0247,mkNTable0248,mkNTable0271,mkNTable0281,mkNTable0282,mkNTable0286,mkNTable0304,mkNTable0309,mkNTable0312,mkNTable0315,mkNTable0324,mkNTable0333,mkNTable0338,mkNTable0348,mkNTable0350,mkNTable0365,mkNTable0373,mkNTable0375,mkNTable0428,mkNTable0444,mkNTable0467,mkNTable0495,mkNTable0497,mkNTable0500,mkNTable0503,mkNTable0514,mkNTable0516,mkNTable0518,mkNTable0519,mkNTable0523,mkNTable0539,mkNTable0542,mkNTable0550,mkNTable0552,mkNTable0570,mkNTable0578,mkNTable0583,mkNTable0589,mkNTable0648,mkNTable0662,mkNTable0691,mkNTable0696,mkNTable0717,mkNTable0773,mkNTable0803,mkNTable0826,mkNTable0828,mkNTable0859,mkNTable0868,mkNTable0869,mkNTable0944,mkNTable0964,mkNTable0965,mkNTable0966,mkNTable0970,mkNTable0981,mkNTable0991,mkNTable0995
|
_ => NM.mkNTable0171 sgnom -- Alternatives: mkNTable0000,mkNTable0001,mkNTable0002,mkNTable0003,mkNTable0010,mkNTable0015,mkNTable0028,mkNTable0037,mkNTable0043,mkNTable0044,mkNTable0053,mkNTable0064,mkNTable0067,mkNTable0075,mkNTable0091,mkNTable0096,mkNTable0111,mkNTable0117,mkNTable0118,mkNTable0129,mkNTable0131,mkNTable0168,mkNTable0171,mkNTable0173,mkNTable0176,mkNTable0181,mkNTable0191,mkNTable0197,mkNTable0213,mkNTable0243,mkNTable0244,mkNTable0247,mkNTable0248,mkNTable0271,mkNTable0281,mkNTable0282,mkNTable0286,mkNTable0304,mkNTable0309,mkNTable0312,mkNTable0315,mkNTable0324,mkNTable0333,mkNTable0338,mkNTable0348,mkNTable0350,mkNTable0365,mkNTable0373,mkNTable0375,mkNTable0428,mkNTable0444,mkNTable0467,mkNTable0495,mkNTable0497,mkNTable0500,mkNTable0503,mkNTable0514,mkNTable0516,mkNTable0518,mkNTable0519,mkNTable0523,mkNTable0539,mkNTable0542,mkNTable0550,mkNTable0552,mkNTable0570,mkNTable0578,mkNTable0583,mkNTable0589,mkNTable0648,mkNTable0662,mkNTable0691,mkNTable0696,mkNTable0717,mkNTable0773,mkNTable0803,mkNTable0826,mkNTable0828,mkNTable0859,mkNTable0868,mkNTable0869,mkNTable0944,mkNTable0964,mkNTable0965,mkNTable0966,mkNTable0970,mkNTable0981,mkNTable0991,mkNTable0995
|
||||||
};
|
} ;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user