Index: gc_core/js/lang_core/gc_engine.js ================================================================== --- gc_core/js/lang_core/gc_engine.js +++ gc_core/js/lang_core/gc_engine.js @@ -524,11 +524,11 @@ yield dPointer; } // JUMP // Warning! Recurssion! if (dNode.hasOwnProperty("<>")) { - let dPointer2 = { "iNode1": iNode1, "dNode": dGraph[dNode["<>"]], "bKeep": True }; + let dPointer2 = { "iNode1": iNode1, "dNode": dGraph[dNode["<>"]], "bKeep": true }; yield* this._getNextPointers(dToken, dGraph, dPointer2, bDebug); } } catch (e) { console.error(e); @@ -604,11 +604,11 @@ let nErrorEnd = this.nOffsetWithinParagraph + ((cEndLimit == ">") ? this.lToken[nTokenErrorEnd]["nEnd"] : this.lToken[nTokenErrorEnd]["nStart"]); if (!this.dError.has(nErrorStart) || nPriority > this.dErrorPriority.get(nErrorStart, -1)) { this.dError[nErrorStart] = this._createErrorFromTokens(sWhat, nTokenOffset, nLastToken, nTokenErrorStart, nErrorStart, nErrorEnd, sLineId, sRuleId, bCaseSvty, sMessage, sURL, bShowRuleId, sOption, bContext); this.dErrorPriority[nErrorStart] = nPriority; if (bDebug) { - console.log(" NEW_ERROR: {} {}: {}".format(sRuleId, sLineId, this.dError[nErrorStart])); + console.log(` NEW_ERROR: ${sRuleId} ${sLineId}: ${this.dError[nErrorStart]}`); } } } } else if (cActionType == "~") { @@ -616,25 +616,25 @@ let nTokenStart = (eAct[0] > 0) ? nTokenOffset + eAct[0] : nLastToken + eAct[0]; let nTokenEnd = (eAct[1] > 0) ? nTokenOffset + eAct[1] : nLastToken + eAct[1]; this._tagAndPrepareTokenForRewriting(sWhat, nTokenStart, nTokenEnd, nTokenOffset, nLastToken, eAct[2], bDebug); bChange = true; if (bDebug) { - console.log(" TEXT_PROCESSOR: " + sRuleId + " " + sLineId); - console.log(" " + this.lToken[nTokenStart]["sValue"] + " : " + this.lToken[nTokenEnd]["sValue"] + " > ", sWhat); + console.log(` TEXT_PROCESSOR: ${sRuleId} ${sLineId}`); + console.log(` ${this.lToken[nTokenStart]["sValue"]} : ${this.lToken[nTokenEnd]["sValue"]} > ${sWhat}`); } } else if (cActionType == "=") { // disambiguation oEvalFunc[sWhat](this.lToken, nTokenOffset, nLastToken); if (bDebug) { - console.log(" DISAMBIGUATOR: {} {} ({}) {}:{}".format(sRuleId, sLineId, sWhat, this.lToken[nTokenOffset+1]["sValue"], this.lToken[nLastToken]["sValue"])); + console.log(` DISAMBIGUATOR: ${sRuleId} ${sLineId} (${sWhat}) ${this.lToken[nTokenOffset+1]["sValue"]}:${this.lToken[nLastToken]["sValue"]}`); } } else if (cActionType == ">") { // we do nothing, this test is just a condition to apply all following actions if (bDebug) { - console.log(" COND_OK: " + sRuleId + " " + sLineId); + console.log(` COND_OK: ${sRuleId} ${sLineId}`); } } else if (cActionType == "/") { // Tag let nTokenStart = (eAct[0] > 0) ? nTokenOffset + eAct[0] : nLastToken + eAct[0]; @@ -645,12 +645,12 @@ } else { this.lToken[i]["tags"] = new Set(sWhat.split("|")); } } if (bDebug) { - console.log(" TAG: " + sRuleId + " " + sLineId); - console.log(" " + sWhat + " > " + this.lToken[nTokenStart]["sValue"] + " : " + this.lToken[nTokenEnd]["sValue"]); + console.log(` TAG: ${sRuleId} ${sLineId}`); + console.log(` ${sWhat} > ${this.lToken[nTokenStart]["sValue"]} : ${this.lToken[nTokenEnd]["sValue"]}`); } if (!this.dTags.has(sWhat)) { this.dTags.set(sWhat, [nTokenStart, nTokenStart]); } else { this.dTags.set(sWhat, [Math.min(nTokenStart, this.dTags.get(sWhat)[0]), Math.max(nTokenEnd, this.dTags.get(sWhat)[1])]); @@ -657,18 +657,18 @@ } } else if (cActionType == "%") { // immunity if (bDebug) { - console.log(" IMMUNITY:\n " + _rules_graph.dRule[sRuleId]);; + console.log(" IMMUNITY:\n " + _rules_graph.dRule[sRuleId]); } nTokenStart = (eAct[0] > 0) ? nTokenOffset + eAct[0] : nLastToken + eAct[0]; nTokenEnd = (eAct[1] > 0) ? nTokenOffset + eAct[1] : nLastToken + eAct[1]; if (nTokenEnd - nTokenStart == 0) { - this.lToken[nTokenStart]["bImmune"] = True + this.lToken[nTokenStart]["bImmune"] = true; let nErrorStart = this.nOffsetWithinParagraph + this.lToken[nTokenStart]["nStart"]; - if (nErrorStart in this.dError) { + if (this.dError.has(nErrorStart)) { this.dError.delete(nErrorStart); } } else { for (let i = nTokenStart; i <= nTokenEnd; i++) { this.lToken[i]["bImmune"] = true; @@ -682,11 +682,11 @@ console.log("# error: unknown action at " + sLineId); } } else if (cActionType == ">") { if (bDebug) { - console.log(" COND_BREAK: " + sRuleId + " " + sLineId); + console.log(` COND_BREAK: ${sRuleId} ${sLineId}`); } break; } } } @@ -733,11 +733,11 @@ } else if (sSugg == "_") { lSugg = []; } else { lSugg = this._expand(sSugg, nTokenOffset, nLastToken).split("|"); } - if (bCaseSvty && lSugg.length > 0 && this.lToken[iFirstToken]["sValue"].slice(0,1).isupper()) { + if (bCaseSvty && lSugg.length > 0 && this.lToken[iFirstToken]["sValue"].slice(0,1).gl_isUpperCase()) { lSugg = capitalizeArray(lSugg); } // Message let sMessage = (sMsg.startsWith("=")) ? oEvalFunc[sMsg.slice(1)](this.lToken, nTokenOffset, nLastToken) : this._expand(sMsg, nTokenOffset, nLastToken); if (bShowRuleId) { @@ -838,11 +838,11 @@ if (sWhat.startsWith("=")) { sWhat = oEvalFunc[sWhat.slice(1)](this.lToken, nTokenOffset, nLastToken); } else { sWhat = this._expand(sWhat, nTokenOffset, nLastToken); } - let bUppercase = bCaseSvty && this.lToken[nTokenRewriteStart]["sValue"].slice(0,1).isupper(); + let bUppercase = bCaseSvty && this.lToken[nTokenRewriteStart]["sValue"].slice(0,1).gl_isUpperCase(); if (nTokenRewriteEnd - nTokenRewriteStart == 0) { // one token if (bUppercase) { sWhat = sWhat.gl_toCapitalize(); } @@ -935,14 +935,13 @@ } } if (bDebug) { console.log(" TEXT REWRITED: " + this.sSentence); } - this.lToken.clear(); + this.lToken.length = 0; this.lToken = lNewToken; } - }; //////// Common functions