Grammalecte  Check-in [6544c2d607]

Overview
Comment:[core][fr] suggMasPlur: allow self suggestion
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | fr | core
Files: files | file ages | folders
SHA3-256: 6544c2d607be940ee50d4388d980d2f995134e2e5037eba8aa185b522916233d
User & Date: olr on 2021-01-05 16:39:18
Other Links: manifest | tags
Context
2021-01-05
22:33
[fr] faux positifs, ajustements, nouvelles règles check-in: cef897dc61 user: olr tags: trunk, fr
16:39
[core][fr] suggMasPlur: allow self suggestion check-in: 6544c2d607 user: olr tags: trunk, fr, core
15:53
[build][core] function info for tokens check-in: d82e5dd021 user: olr tags: trunk, core, build
Changes

Modified gc_lang/fr/modules-js/gce_suggestions.js from [9d19e0f955] to [e41e56dec1].

353
354
355
356
357
358
359
360

361
362
363
364
365
366
367
353
354
355
356
357
358
359

360
361
362
363
364
365
366
367







-
+







        if (!sMorph.includes(":V")) {
            // not a verb
            if (sMorph.includes(":m") || sMorph.includes(":e")) {
                aSugg.add(suggPlur(sFlex));
            } else {
                let sStem = cregex.getLemmaOfMorph(sMorph);
                if (mfsp.isMasForm(sStem)) {
                    aSugg.add(suggPlur(sStem));
                    aSugg.add(suggPlur(sStem, null, true));
                }
            }
        } else {
            // a verb
            let sVerb = cregex.getLemmaOfMorph(sMorph);
            if (conj.hasConj(sVerb, ":PQ", ":Q2")) {
                aSugg.add(conj.getConj(sVerb, ":PQ", ":Q2"));

Modified gc_lang/fr/modules/gce_suggestions.py from [40d55e0743] to [5245c9f027].

268
269
270
271
272
273
274
275

276
277
278
279
280
281
282
268
269
270
271
272
273
274

275
276
277
278
279
280
281
282







-
+







        if not ":V" in sMorph:
            # not a verb
            if ":m" in sMorph or ":e" in sMorph:
                aSugg.add(suggPlur(sFlex))
            else:
                sStem = cr.getLemmaOfMorph(sMorph)
                if mfsp.isMasForm(sStem):
                    aSugg.add(suggPlur(sStem))
                    aSugg.add(suggPlur(sStem, None, True))
        else:
            # a verb
            sVerb = cr.getLemmaOfMorph(sMorph)
            if conj.hasConj(sVerb, ":PQ", ":Q2"):
                aSugg.add(conj.getConj(sVerb, ":PQ", ":Q2"))
            elif conj.hasConj(sVerb, ":PQ", ":Q1"):
                sSugg = conj.getConj(sVerb, ":PQ", ":Q1")