Overview
| Comment: | [build] small code cleaning |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk | build |
| Files: | files | file ages | folders |
| SHA3-256: |
4b89ce903f09248d4f0f1891edb3d957 |
| User & Date: | olr on 2019-06-28 16:09:38 |
| Other Links: | manifest | tags |
Context
|
2019-06-29
| ||
| 12:35 | [fr] ajustements check-in: 06e22da9e3 user: olr tags: trunk, fr | |
|
2019-06-28
| ||
| 16:09 | [build] small code cleaning check-in: 4b89ce903f user: olr tags: trunk, build | |
| 16:08 | [fr] ajustements check-in: 102f7dca03 user: olr tags: trunk, fr | |
Changes
Modified compile_rules_graph.py from [541133edef] to [7acb0bcde8].
| ︙ | ︙ | |||
71 72 73 74 75 76 77 |
sCode = re.sub(r">1", 'lToken[nLastToken+1]["sValue"]', sCode)
sCode = re.sub(r"<1", 'lToken[nTokenOffset]["sValue"]', sCode)
return sCode
def genTokenLines (sTokenLine, dDef):
"tokenize a string and return a list of lines of tokens"
| < | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 |
sCode = re.sub(r">1", 'lToken[nLastToken+1]["sValue"]', sCode)
sCode = re.sub(r"<1", 'lToken[nTokenOffset]["sValue"]', sCode)
return sCode
def genTokenLines (sTokenLine, dDef):
"tokenize a string and return a list of lines of tokens"
lTokenLines = []
for sToken in sTokenLine.split():
# replace merger characters by spaces
if "␣" in sToken:
sToken = sToken.replace("␣", " ")
# optional token?
bNullPossible = sToken.startswith("?") and sToken.endswith("¿")
if bNullPossible:
sToken = sToken[1:-1]
|
| ︙ | ︙ | |||
202 203 204 205 206 207 208 |
if m:
sOption = m.group(1)
sAction = sAction[m.end():].strip()
if nPriority == -1:
nPriority = dOptPriority.get(sOption, 4)
# valid action?
| | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 |
if m:
sOption = m.group(1)
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(" # Error. No action found at: ", sActionId)
return None
# Condition
sCondition = sAction[:m.start()].strip()
if sCondition:
|
| ︙ | ︙ | |||
359 360 361 362 363 364 365 |
exit()
iActionBlock = 1
nPriority = int(m.group(2)[1:]) if m.group(2) else -1
else:
print("Syntax error in rule group: ", sLine, " -- line:", i)
exit()
elif re.search("^ +<<- ", sLine) or (sLine.startswith(" ") and not sLine.startswith(" ||")) \
| | | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 |
exit()
iActionBlock = 1
nPriority = int(m.group(2)[1:]) if m.group(2) else -1
else:
print("Syntax error in rule group: ", sLine, " -- line:", i)
exit()
elif re.search("^ +<<- ", sLine) or (sLine.startswith(" ") and not sLine.startswith(" ||")) \
or re.search("^ +#", sLine) or re.search(r"[-=~/!>](?:-?\d\.?(?::\.?-?\d+|)|)>> ", sLine) :
# actions
sActions += " " + sLine.strip()
elif re.match("[ ]*$", sLine):
# empty line to end merging
if not lTokenLine:
continue
if not sActions:
|
| ︙ | ︙ |