@@ -20,11 +20,11 @@ if (s2 == "eux") { return "ils"; } if (s2 == "elle" || s2 == "elles") { // We don’t check if word exists in _dAnalyses, for it is assumed it has been done before - if (cr.mbNprMasNotFem(_dAnalyses._get(s1, ""))) { + if (cr.mbNprMasNotFem(_dAnalyses.gl_get(s1, ""))) { return "ils"; } // si épicène, indéterminable, mais OSEF, le féminin l’emporte return "elles"; } @@ -32,39 +32,39 @@ } function apposition (sWord1, sWord2) { // returns true if nom + nom (no agreement required) // We don’t check if word exists in _dAnalyses, for it is assumed it has been done before - return cr.mbNomNotAdj(_dAnalyses._get(sWord2, "")) && cr.mbPpasNomNotAdj(_dAnalyses._get(sWord1, "")); + return cr.mbNomNotAdj(_dAnalyses.gl_get(sWord2, "")) && cr.mbPpasNomNotAdj(_dAnalyses.gl_get(sWord1, "")); } function isAmbiguousNAV (sWord) { // words which are nom|adj and verb are ambiguous (except être and avoir) if (!_dAnalyses.has(sWord) && !_storeMorphFromFSA(sWord)) { return false; } - if (!cr.mbNomAdj(_dAnalyses._get(sWord, "")) || sWord == "est") { + if (!cr.mbNomAdj(_dAnalyses.gl_get(sWord, "")) || sWord == "est") { return false; } - if (cr.mbVconj(_dAnalyses._get(sWord, "")) && !cr.mbMG(_dAnalyses._get(sWord, ""))) { + if (cr.mbVconj(_dAnalyses.gl_get(sWord, "")) && !cr.mbMG(_dAnalyses.gl_get(sWord, ""))) { return true; } return false; } function isAmbiguousAndWrong (sWord1, sWord2, sReqMorphNA, sReqMorphConj) { //// use it if sWord1 won’t be a verb; word2 is assumed to be true via isAmbiguousNAV // We don’t check if word exists in _dAnalyses, for it is assumed it has been done before - let a2 = _dAnalyses._get(sWord2, null); + let a2 = _dAnalyses.gl_get(sWord2, null); if (!a2 || a2.length === 0) { return false; } if (cr.checkConjVerb(a2, sReqMorphConj)) { // verb word2 is ok return false; } - let a1 = _dAnalyses._get(sWord1, null); + let a1 = _dAnalyses.gl_get(sWord1, null); if (!a1 || a1.length === 0) { return false; } if (cr.checkAgreement(a1, a2) && (cr.mbAdj(a2) || cr.mbAdj(a1))) { return false; @@ -73,19 +73,19 @@ } function isVeryAmbiguousAndWrong (sWord1, sWord2, sReqMorphNA, sReqMorphConj, bLastHopeCond) { //// use it if sWord1 can be also a verb; word2 is assumed to be true via isAmbiguousNAV // We don’t check if word exists in _dAnalyses, for it is assumed it has been done before - let a2 = _dAnalyses._get(sWord2, null) + let a2 = _dAnalyses.gl_get(sWord2, null) if (!a2 || a2.length === 0) { return false; } if (cr.checkConjVerb(a2, sReqMorphConj)) { // verb word2 is ok return false; } - let a1 = _dAnalyses._get(sWord1, null); + let a1 = _dAnalyses.gl_get(sWord1, null); if (!a1 || a1.length === 0) { return false; } if (cr.checkAgreement(a1, a2) && (cr.mbAdj(a2) || cr.mbAdjNb(a1))) { return false; @@ -101,15 +101,15 @@ return false; } function checkAgreement (sWord1, sWord2) { // We don’t check if word exists in _dAnalyses, for it is assumed it has been done before - let a2 = _dAnalyses._get(sWord2, null) + let a2 = _dAnalyses.gl_get(sWord2, null) if (!a2 || a2.length === 0) { return true; } - let a1 = _dAnalyses._get(sWord1, null); + let a1 = _dAnalyses.gl_get(sWord1, null); if (!a1 || a1.length === 0) { return true; } return cr.checkAgreement(a1, a2); } @@ -116,11 +116,11 @@ function mbUnit (s) { if (/[µ\/⁰¹²³⁴⁵⁶⁷⁸⁹Ωℓ·]/.test(s)) { return true; } - if (s.length > 1 && s.length < 16 && s.slice(0, 1)._isLowerCase() && (!s.slice(1)._isLowerCase() || /[0-9]/.test(s))) { + if (s.length > 1 && s.length < 16 && s.slice(0, 1).gl_isLowerCase() && (!s.slice(1).gl_isLowerCase() || /[0-9]/.test(s))) { return true; } return false; } @@ -133,15 +133,15 @@ function isEndOfNG (dDA, s, iOffset) { if (_zEndOfNG1.test(s)) { return true; } - let m = _zEndOfNG2._exec2(s, ["$"]); + let m = _zEndOfNG2.gl_exec2(s, ["$"]); if (m && morphex(dDA, [iOffset+m.start[1], m[1]], ":[VR]", ":[NAQP]")) { return true; } - m = _zEndOfNG3._exec2(s, ["$"]); + m = _zEndOfNG3.gl_exec2(s, ["$"]); if (m && !morph(dDA, [iOffset+m.start[1], m[1]], ":[NA]", false)) { return true; } return false; } @@ -153,11 +153,11 @@ function isNextNotCOD (dDA, s, iOffset) { if (_zNextIsNotCOD1.test(s) || _zNextIsNotCOD2.test(s)) { return true; } - let m = _zNextIsNotCOD3._exec2(s, ["$"]); + let m = _zNextIsNotCOD3.gl_exec2(s, ["$"]); if (m && morphex(dDA, [iOffset+m.start[1], m[1]], ":[123][sp]", ":[DM]")) { return true; } return false; } @@ -168,11 +168,11 @@ function isNextVerb (dDA, s, iOffset) { if (_zNextIsVerb1.test(s)) { return true; } - let m = _zNextIsVerb2._exec2(s, ["$"]); + let m = _zNextIsVerb2.gl_exec2(s, ["$"]); if (m && morph(dDA, [iOffset+m.start[1], m[1]], ":[123][sp]", false)) { return true; } return false; }