6502/SixtyPical
1
0
Fork 0
mirror of https://github.com/catseye/SixtyPical.git synced 2024-11-29 18:49:22 +00:00
Code Issues Projects Releases Wiki Activity

Analyze the range in the for loop. All unit tests pass again.

Browse Source
This commit is contained in:
Chris Pressey 2018-03-13 17:44:44 +00:00
parent 7a3b52dc1e
commit 9a9db83fc6
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/sixtypical/analyzer.py
View File

@ -208,6 +208,15 @@ class Context(object):
(bottom, _) = self._range[ref] (bottom, _) = self._range[ref]
self._range[ref] = (bottom, top) self._range[ref] = (bottom, top)
def set_bottom_of_range(self, ref, bottom):
self.assert_meaningful(ref)
(top, _) = self._range[ref]
self._range[ref] = (bottom, top)
def set_range(self, ref, bottom, top):
self.assert_meaningful(ref)
self._range[ref] = (bottom, top)
def get_top_of_range(self, ref): def get_top_of_range(self, ref):
if isinstance(ref, ConstantRef): if isinstance(ref, ConstantRef):
return ref.value return ref.value
@ -215,6 +224,20 @@ class Context(object):
(_, top) = self._range[ref] (_, top) = self._range[ref]
return top return top
def get_bottom_of_range(self, ref):
if isinstance(ref, ConstantRef):
return ref.value
self.assert_meaningful(ref)
(bottom, _) = self._range[ref]
return bottom
def get_range(self, ref):
if isinstance(ref, ConstantRef):
return (ref.value, ref.value)
self.assert_meaningful(ref)
(bottom, top) = self._range[ref]
return bottom, top
def copy_range(self, src, dest): def copy_range(self, src, dest):
self.assert_meaningful(src) self.assert_meaningful(src)
if src in self._range: if src in self._range:
@ -628,10 +651,27 @@ class Analyzer(object):
context.assert_meaningful(instr.src) context.assert_meaningful(instr.src)
def analyze_for(self, instr, context): def analyze_for(self, instr, context):
# TODO: find the range of the loop variable in context, make sure it fits context.assert_meaningful(instr.dest)
bottom, top = context.get_range(instr.dest)
if instr.direction > 0:
if top >= instr.final:
raise RangeExceededError(self.routine, "Top of range of {} is {} but must be lower than {}".format(
instr.dest, top, instr.final
))
top = instr.final
if instr.direction < 0:
if bottom <= instr.final:
raise RangeExceededError(self.routine, "Bottom of range of {} is {} but must be higher than {}".format(
instr.dest, bottom, instr.final
))
bottom = instr.final
subcontext = context.clone() subcontext = context.clone()
subcontext.set_range(instr.dest, bottom, top)
subcontext.set_unwriteable(instr.dest) subcontext.set_unwriteable(instr.dest)
self.analyze_block(instr.block, subcontext) self.analyze_block(instr.block, subcontext)
# TODO: at the end of the loop, we know the new range of the loop variable context.set_range(instr.dest, instr.final, instr.final)