Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it a little faster, and remove undefined behavior I mentioned on Messenger #4

Open
wants to merge 2 commits into
base: test-gen
Choose a base branch
from
Open

Make it a little faster, and remove undefined behavior I mentioned on Messenger #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b49d3
Pre-compile regular expressions
danielf Jun 4, 2019
ce3867b
Deletes undefined behavior (even if works properly with standard impl…
danielf Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions __env/input_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ def err(message):
print colors.BOLD + colors.FAIL + "ERROR" + colors.ENDC + ": " + message
exit(1)

VAR_NAME = "[a-zA-Z0-9_]+"
NUMBER = "-?[0-9]+([.][0-9]+)?(e[0-9]+)?"
INTERVAL = "\s*([\[\(][^,]+),([^,]+[\]\)])\s*";
VAR_NAME_RE = re.compile("[a-zA-Z0-9_]+")
NUMBER_RE = re.compile("-?[0-9]+([.][0-9]+)?(e[0-9]+)?")
INTERVAL = "\s*([\[\(][^,]+),([^,]+[\]\)])\s*"

class Scope:
def __init__(self):
self.vars = {}

def is_number(self, expr):
return re.match(NUMBER, expr)
return NUMBER_RE.match(expr)

def dependencies(self, expr):
return [x for x in re.findall(VAR_NAME, expr) if not self.is_number(x)]
return [x for x in VAR_NAME_RE.findall(expr) if not self.is_number(x)]

def evaluate(self, expr):
deps = self.dependencies(expr)
Expand Down Expand Up @@ -58,19 +58,22 @@ def toposort(self):
if degree[vname] == 0:
order.append(vname)

for vname in order:
inx = 0
while inx < len(order):
vname = order[inx]
for dep in rev_deps[vname]:
degree[dep] -= 1
if not degree[dep]:
order.append(dep)
inx += 1

if len(order) != len(self.vars):
err("Variable dependencies are cyclic")
return order

class Number:
TYPES = [ "int", "ll", "double" ]
SPEC = "#([\w\s]+)(int|ll|double)" + INTERVAL
SPEC_RE = re.compile("#([\w\s]+)(int|ll|double)" + INTERVAL)

def __init__(self, scope, name, num_type, lower_bound, upper_bound):
assert num_type in self.TYPES
Expand Down Expand Up @@ -117,7 +120,7 @@ def value(self):

class NumberVector:
TYPES = [ "ints", "lls", "doubles" ]
SPEC = "#([\w\s]+)(ints|lls|doubles)(.+)" + INTERVAL
SPEC_RE = re.compile("#([\w\s]+)(ints|lls|doubles)(.+)" + INTERVAL)

def __init__(self, scope, name, vec_type, length, lower_bound, upper_bound):
assert vec_type in self.TYPES
Expand Down Expand Up @@ -151,7 +154,7 @@ def main():
layout.append(line)
continue

ns = re.match(Number.SPEC, line)
ns = Number.SPEC_RE.match(line)
if ns:
names, vtype, lower, upper = ns.groups()
for vname in filter(None, names.split(" ")):
Expand All @@ -160,7 +163,7 @@ def main():
scope.vars[vname] = Number(scope, vname, vtype, lower, upper)
continue

nv = re.match(NumberVector.SPEC, line)
nv = NumberVector.SPEC_RE.match(line)
if nv:
names, vtype, length, lower, upper = nv.groups()
for vname in filter(None, names.split(" ")):
Expand All @@ -177,7 +180,7 @@ def main():

output = []
for line in layout:
vnames = re.findall(VAR_NAME, line)
vnames = VAR_NAME_RE.findall(line)

nospec = filter(lambda vn: vn not in scope.vars, vnames)
if nospec:
Expand Down