xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues4 Pull Requests Projects1 Wiki Activity

compiling more regexes

Browse Source
This commit is contained in:
Philip Sargent 2023-01-28 21:17:16 +00:00
parent 0d9d307490
commit 03fa5f5548
1 changed files with 18 additions and 11 deletions

29
parsers/survex.py

@ -201,8 +201,12 @@ class LoadingSurvex:
# python regex flags (?i) means case-insentitive, (?s) means . matches newline too # python regex flags (?i) means case-insentitive, (?s) means . matches newline too
# see https://docs.python.org/3/library/re.html # see https://docs.python.org/3/library/re.html
rx_begin = re.compile(r"(?i)begin") rx_begin = re.compile(r"(?i)begin")
rx_begin2 = re.compile("(?i)begin$")
rx_end = re.compile(r"(?i)end$") rx_end = re.compile(r"(?i)end$")
rx_end2 = re.compile("(?i)end$")
rx_title = re.compile(r"(?i)title$") rx_title = re.compile(r"(?i)title$")
rx_title2 = re.compile("(?i)title$")
rx_ref = re.compile(r"(?i)ref$") rx_ref = re.compile(r"(?i)ref$")
rx_data = re.compile(r"(?i)data$") rx_data = re.compile(r"(?i)data$")
rx_flags = re.compile(r"(?i)flags$") rx_flags = re.compile(r"(?i)flags$")
@ -263,7 +267,7 @@ class LoadingSurvex:
unitsstack = [] unitsstack = []
legsnumberstack = [] legsnumberstack = []
slengthstack = [] slengthstack = []
personexpedstack = [] teamexpedstack = []
stackbegin = [] stackbegin = []
flagsstack = [] flagsstack = []
datastack = [] datastack = []
@ -293,7 +297,7 @@ class LoadingSurvex:
currentsurvexfile = None currentsurvexfile = None
currentcave = None currentcave = None
caverndate = None caverndate = None
currentpersonexped = [] currentteamexped = []
pending = [] pending = []
def __init__(self): def __init__(self):
@ -362,7 +366,7 @@ class LoadingSurvex:
personexpedition = GetPersonExpeditionNameLookup(expo).get(tm.lower()) personexpedition = GetPersonExpeditionNameLookup(expo).get(tm.lower())
if personexpedition: if personexpedition:
put_person_on_trip(survexblock, personexpedition, tm) put_person_on_trip(survexblock, personexpedition, tm)
self.currentpersonexped.append(personexpedition) # used in push/pop block code self.currentteamexped.append(personexpedition) # used in push/pop block code
elif known_foreigner(tm): # note, not using .lower() elif known_foreigner(tm): # note, not using .lower()
message = f"- *team {expo.year} '{tm}' known foreigner on *team {survexblock.survexfile.path} ({survexblock}) in '{line}'" message = f"- *team {expo.year} '{tm}' known foreigner on *team {survexblock.survexfile.path} ({survexblock}) in '{line}'"
print(self.insp + message) print(self.insp + message)
@ -519,7 +523,7 @@ class LoadingSurvex:
pe = GetPersonExpeditionNameLookup(expo).get(tm.lower()) pe = GetPersonExpeditionNameLookup(expo).get(tm.lower())
if pe: if pe:
put_person_on_trip(survexblock, pe, tm) put_person_on_trip(survexblock, pe, tm)
self.currentpersonexped.append(pe) self.currentteamexped.append(pe)
else: else:
message = f"! *team {year} '{tm}' FAIL personexpedition lookup on *date {survexblock.survexfile.path} ({survexblock}) " message = f"! *team {year} '{tm}' FAIL personexpedition lookup on *date {survexblock.survexfile.path} ({survexblock}) "
print(self.insp + message) print(self.insp + message)
@ -546,7 +550,7 @@ class LoadingSurvex:
pr.personexpedition = pe pr.personexpedition = pe
pr.person = pr.personexpedition.person pr.person = pr.personexpedition.person
pr.save() pr.save()
self.currentpersonexped.append(pe) # used in push/pop block code self.currentteamexped.append(pe) # used in push/pop block code
elif known_foreigner(pr.personname): # note, not using .lower() elif known_foreigner(pr.personname): # note, not using .lower()
message = f"- *team {expo.year} '{pr.personname}' known foreigner on *date {survexblock.survexfile.path} ({survexblock}) in '{line}'" message = f"- *team {expo.year} '{pr.personname}' known foreigner on *date {survexblock.survexfile.path} ({survexblock}) in '{line}'"
print(self.insp + message) print(self.insp + message)
@ -1411,13 +1415,13 @@ class LoadingSurvex:
self.unitsstack.append((self.units, self.unitsfactor)) self.unitsstack.append((self.units, self.unitsfactor))
self.legsnumberstack.append(self.legsnumber) self.legsnumberstack.append(self.legsnumber)
self.slengthstack.append(self.slength) self.slengthstack.append(self.slength)
self.personexpedstack.append(self.currentpersonexped) # just one person?! self.teamexpedstack.append(self.currentteamexped) # just one person?!
pushblock() pushblock()
# PUSH state ++++++++++++++ # PUSH state ++++++++++++++
self.legsnumber = 0 self.legsnumber = 0
self.slength = 0.0 self.slength = 0.0
self.units = "metres" self.units = "metres"
self.currentpersonexped = [] self.currentteamexped = []
printbegin() printbegin()
newsurvexblock = SurvexBlock( newsurvexblock = SurvexBlock(
name=blkid, name=blkid,
@ -1456,7 +1460,7 @@ class LoadingSurvex:
raise raise
# POP state ++++++++++++++ # POP state ++++++++++++++
popblock() popblock()
self.currentpersonexped = self.personexpedstack.pop() # just one person?! self.currentteamexped = self.teamexpedstack.pop() # just one person?!
self.legsnumber = self.legsnumberstack.pop() self.legsnumber = self.legsnumberstack.pop()
self.units, self.unitsfactor = self.unitsstack.pop() self.units, self.unitsfactor = self.unitsstack.pop()
self.slength = self.slengthstack.pop() self.slength = self.slengthstack.pop()
@ -1617,7 +1621,8 @@ class LoadingSurvex:
print(message) print(message)
print(message, file=sys.stderr) print(message, file=sys.stderr)
stash_data_issue(parser="survex", message=message, url=None, sb=(path)) stash_data_issue(parser="survex", message=message, url=None, sb=(path))
elif re.match("(?i)begin$", cmd): elif self.rx_begin2.match(cmd):
#elif re.match("(?i)begin$", cmd):
self.depthbegin += 1 self.depthbegin += 1
depth = " " * self.depthbegin depth = " " * self.depthbegin
if args: if args:
@ -1627,7 +1632,8 @@ class LoadingSurvex:
self.stackbegin.append(pushargs.lower()) self.stackbegin.append(pushargs.lower())
flinear.write(f" {self.depthbegin:2} {depth} *begin {args}\n") flinear.write(f" {self.depthbegin:2} {depth} *begin {args}\n")
pass pass
elif re.match("(?i)end$", cmd): elif self.rx_end2.match(cmd):
# elif re.match("(?i)end$", cmd):
depth = " " * self.depthbegin depth = " " * self.depthbegin
flinear.write(f" {self.depthbegin:2} {depth} *end {args}\n") flinear.write(f" {self.depthbegin:2} {depth} *end {args}\n")
if not args: if not args:
@ -1644,7 +1650,8 @@ class LoadingSurvex:
self.depthbegin -= 1 self.depthbegin -= 1
pass pass
elif re.match("(?i)title$", cmd): elif self.rx_title2.match(cmd):
# elif re.match("(?i)title$", cmd):
depth = " " * self.depthbegin depth = " " * self.depthbegin
flinear.write(f" {self.depthbegin:2} {depth} *title {args}\n") flinear.write(f" {self.depthbegin:2} {depth} *title {args}\n")
pass pass