Overview
Comment: | [build][core] darg builder: use implicitly last token number if nothing is specified |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core | build | rg |
Files: | files | file ages | folders |
SHA3-256: |
2018bef28c69857354ece5570a6057ac |
User & Date: | olr on 2018-06-17 15:21:32 |
Other Links: | branch diff | manifest | tags |
Context
2018-06-17
| ||
15:26 | [fr] implicit last token -> merge rules check-in: d2d6ab1341 user: olr tags: fr, rg | |
15:21 | [build][core] darg builder: use implicitly last token number if nothing is specified check-in: 2018bef28c user: olr tags: core, build, rg | |
15:10 | [fr] conversion: regex rules -> graph rules check-in: 07539850a5 user: olr tags: fr, rg | |
Changes
Modified compile_rules_graph.py from [2d984fb6f6] to [41b10d39af].
︙ | ︙ | |||
129 130 131 132 133 134 135 | sCondition = "" # Action cAction = m.group("action") sAction = sAction[m.end():].strip() sAction = changeReferenceToken(sAction, dPos) if not m.group("start"): iStartAction = 1 | | | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | sCondition = "" # Action cAction = m.group("action") sAction = sAction[m.end():].strip() sAction = changeReferenceToken(sAction, dPos) if not m.group("start"): iStartAction = 1 iEndAction = 0 else: iStartAction = int(m.group("start")) iEndAction = int(m.group("end")[1:]) if m.group("end") else iStartAction if dPos: try: iStartAction = dPos[iStartAction] iEndAction = dPos[iEndAction] |
︙ | ︙ |
Modified gc_core/py/lang_core/gc_engine.py from [4c2d49e047] to [d26ce3d16f].
︙ | ︙ | |||
671 672 673 674 675 676 677 | for dNode in self._getNextMatchingNodes(dToken, dGraph, dGraph[0], bDebug): lPointer.append({"iToken": dToken["i"], "dNode": dNode}) # check if there is rules to check for each pointer for dPointer in lPointer: #if bDebug: # print("+", dPointer) if "<rules>" in dPointer["dNode"]: | | | | > | | 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 | for dNode in self._getNextMatchingNodes(dToken, dGraph, dGraph[0], bDebug): lPointer.append({"iToken": dToken["i"], "dNode": dNode}) # check if there is rules to check for each pointer for dPointer in lPointer: #if bDebug: # print("+", dPointer) if "<rules>" in dPointer["dNode"]: bHasChanged, errs = self._executeActions(dGraph, dPointer["dNode"]["<rules>"], dPointer["iToken"]-1, dToken["i"], dPriority, dOpt, sCountry, bShowRuleId, bDebug, bContext) dErr.update(errs) if bHasChanged: bChange = True return (bChange, dErr) def _executeActions (self, dGraph, dNode, nTokenOffset, nLastToken, dPriority, dOptions, sCountry, bShowRuleId, bDebug, bContext): "execute actions found in the DARG" dErrs = {} bChange = False for sLineId, nextNodeKey in dNode.items(): bCondMemo = None for sRuleId in dGraph[nextNodeKey]: try: if bDebug: print("ACTION:", sRuleId) print(dRule[sRuleId]) sOption, sFuncCond, cActionType, sWhat, *eAct = dRule[sRuleId] # action in lActions: [ condition, action type, replacement/suggestion/action[, iTokenStart, iTokenEnd[, nPriority, message, URL]] ] if not sOption or dOptions.get(sOption, False): bCondMemo = not sFuncCond or globals()[sFuncCond](self.lToken, nTokenOffset, sCountry, bCondMemo) if bCondMemo: if cActionType == "-": # grammar error nTokenErrorStart = nTokenOffset + eAct[0] nTokenErrorEnd = (nTokenOffset + eAct[1]) if eAct[1] else nLastToken nErrorStart = self.nOffset + self.lToken[nTokenErrorStart]["nStart"] nErrorEnd = self.nOffset + self.lToken[nTokenErrorEnd]["nEnd"] if nErrorStart not in dErrs or eAct[2] > dPriority[nErrorStart]: dErrs[nErrorStart] = self.createError(sWhat, nTokenOffset, nTokenErrorStart, nErrorStart, nErrorEnd, sLineId, sRuleId, True, eAct[3], eAct[4], bShowRuleId, "notype", bContext) dPriority[nErrorStart] = eAct[2] if bDebug: print("-", sRuleId, dErrs[nErrorStart]) elif cActionType == "~": # text processor nEndToken = (nTokenOffset + eAct[1]) if eAct[1] else nLastToken self._tagAndPrepareTokenForRewriting(sWhat, nTokenOffset + eAct[0], nEndToken, bDebug) if bDebug: print("~", sRuleId) bChange = True elif cActionType == "=": # disambiguation globals()[sWhat](self.lToken, nTokenOffset) if bDebug: |
︙ | ︙ |