Overview
Comment: | [build] add tests to text processor actions to prevent weird bugs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | build |
Files: | files | file ages | folders |
SHA3-256: |
7542272427235bcfbbbf62f6ff1ae207 |
User & Date: | olr on 2019-08-20 16:31:28 |
Other Links: | manifest | tags |
Context
2019-08-21
| ||
07:04 | [server] code clarity, +version 1.3.1 check-in: 137cf12feb user: olr tags: trunk, server, v1.3.1 | |
2019-08-20
| ||
16:31 | [build] add tests to text processor actions to prevent weird bugs check-in: 7542272427 user: olr tags: trunk, build | |
13:00 | [cli] show Python version check-in: 57bb3560a3 user: olr tags: trunk, cli | |
Changes
Modified compile_rules_graph.py from [f3a97c6217] to [b81c4ccc24].
︙ | ︙ | |||
234 235 236 237 238 239 240 | sAction = sAction[m.end():].strip() if nPriority == -1: nPriority = dOptPriority.get(sOption, 4) # valid action? m = re.search(r"(?P<action>[-=~/!>])(?P<start>-?\d+\.?|)(?P<end>:\.?-?\d+|)(?P<casing>:|)>>", sAction) if not m: | | | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | sAction = sAction[m.end():].strip() if nPriority == -1: nPriority = dOptPriority.get(sOption, 4) # valid action? m = re.search(r"(?P<action>[-=~/!>])(?P<start>-?\d+\.?|)(?P<end>:\.?-?\d+|)(?P<casing>:|)>>", sAction) if not m: print("\n# Error. No action found at: ", sActionId) return None # Condition sCondition = sAction[:m.start()].strip() if sCondition: sCondition = changeReferenceToken(sCondition, dPos) sCondition = createFunction("cond", sCondition) |
︙ | ︙ | |||
260 261 262 263 264 265 266 | cStartLimit = "<" cEndLimit = ">" if not m.group("start"): iStartAction = 1 iEndAction = 0 else: if cAction != "-" and (m.group("start").endswith(".") or m.group("end").startswith(":.")): | | | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | cStartLimit = "<" cEndLimit = ">" if not m.group("start"): iStartAction = 1 iEndAction = 0 else: if cAction != "-" and (m.group("start").endswith(".") or m.group("end").startswith(":.")): print("\n# Error. Wrong selection on tokens.", sActionId) return None if m.group("start").endswith("."): cStartLimit = ">" iStartAction = int(m.group("start").rstrip(".")) if not m.group("end"): iEndAction = iStartAction else: |
︙ | ︙ | |||
286 287 288 289 290 291 292 | if cAction == "-": ## error iMsg = sAction.find(" # ") if iMsg == -1: sMsg = "# Error. Error message not found." sURL = "" | | | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | if cAction == "-": ## error iMsg = sAction.find(" # ") if iMsg == -1: sMsg = "# Error. Error message not found." sURL = "" print("\n" + sMsg + " Action id: " + sActionId) else: sMsg = sAction[iMsg+3:].strip() sAction = sAction[:iMsg].strip() sURL = "" mURL = re.search("[|] *(https?://.*)", sMsg) if mURL: sURL = mURL.group(1).strip() |
︙ | ︙ | |||
309 310 311 312 313 314 315 | checkTokenNumbers(sAction, sActionId, nToken) if cAction == ">": ## no action, break loop if condition is False return [sOption, sCondition, cAction, ""] if not sAction and cAction != "!": | | | > > > > > > > | | | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 | checkTokenNumbers(sAction, sActionId, nToken) if cAction == ">": ## no action, break loop if condition is False return [sOption, sCondition, cAction, ""] if not sAction and cAction != "!": print("\n# Error in action at line <" + sActionId + ">: This action is empty.") if sAction[0:1] != "=" and cAction != "=": checkIfThereIsCode(sAction, sActionId) if cAction == "-": ## error detected --> suggestion if sAction[0:1] == "=": sAction = createFunction("sugg", sAction, True) elif sAction.startswith('"') and sAction.endswith('"'): sAction = sAction[1:-1] if not sMsg: print("\n# Error in action at line <" + sActionId + ">: The message is empty.") return [sOption, sCondition, cAction, sAction, iStartAction, iEndAction, cStartLimit, cEndLimit, bCaseSensitivity, nPriority, sMsg, sURL] if cAction == "~": ## text processor if sAction[0:1] == "=": sAction = createFunction("tp", sAction, True) elif sAction.startswith('"') and sAction.endswith('"'): sAction = sAction[1:-1] elif sAction not in "␣*_": nToken = sAction.count("|") + 1 if iStartAction > 0 and iEndAction > 0: if (iEndAction - iStartAction + 1) != nToken: print("\n# Error in action at line <" + sActionId + ">: numbers of modified tokens modified.") elif iStartAction < 0 or iEndAction < 0 and iStartAction != iEndAction: print("\n# Warning in action at line <" + sActionName + ">: rewriting with possible token position modified.") return [sOption, sCondition, cAction, sAction, iStartAction, iEndAction, bCaseSensitivity] if cAction in "!/": ## tags return [sOption, sCondition, cAction, sAction, iStartAction, iEndAction] if cAction == "=": ## disambiguator if "define(" in sAction and not re.search(r"define\(\\-?\d+ *, *\[.*\] *\)", sAction): print("\n# Error in action at line <" + sActionId + ">: second argument for <define> must be a list of strings") sAction = createFunction("da", sAction) return [sOption, sCondition, cAction, sAction] print("\n# Unknown action.", sActionId) return None def make (lRule, sLang, dDef, dDecl, dOptPriority): "compile rules, returns a dictionary of values" # for clarity purpose, don’t create any file here |
︙ | ︙ |