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

Make assertions more robust, in hopes of hunting down bugs.

Browse Source
This commit is contained in:
Chris Pressey 2018-02-06 09:52:01 +00:00
parent afd083052e
commit c12a76e106
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sixtypical/analyzer.py
View File

@ -176,13 +176,18 @@ class Analyzer(object):
(location.name, self.current_routine.name)
)
def assert_affected_within(self, name, affected, limited_to):
def assert_affected_within(self, name, affecting_type, limiting_type):
assert name in ('inputs', 'outputs', 'trashes')
affected = getattr(affecting_type, name)
limited_to = getattr(limiting_type, name)
overage = affected - limited_to
if not overage:
return
message = 'in %s: %s are %s but affects %s which exceeds it by: %s ' % (
message = 'in %s: %s for %s are %s\n\nbut %s affects %s\n\nwhich exceeds it by: %s ' % (
self.current_routine.name, name,
LocationRef.format_set(limited_to), LocationRef.format_set(affected), LocationRef.format_set(overage)
limiting_type, LocationRef.format_set(limited_to),
affecting_type, LocationRef.format_set(affected),
LocationRef.format_set(overage)
)
raise IncompatibleConstraintsError(message)
@ -390,9 +395,9 @@ class Analyzer(object):
if src.type == dest.type:
pass
elif isinstance(src.type, RoutineType) and isinstance(dest.type, VectorType):
self.assert_affected_within('inputs', src.type.inputs, dest.type.of_type.inputs)
self.assert_affected_within('outputs', src.type.outputs, dest.type.of_type.outputs)
self.assert_affected_within('trashes', src.type.trashes, dest.type.of_type.trashes)
self.assert_affected_within('inputs', src.type, dest.type.of_type)
self.assert_affected_within('outputs', src.type, dest.type.of_type)
self.assert_affected_within('trashes', src.type, dest.type.of_type)
else:
raise TypeMismatchError((src, dest))
else:
@ -451,8 +456,8 @@ class Analyzer(object):
# and that this routine's trashes and output constraints are a
# superset of the called routine's
current_type = self.current_routine.location.type
self.assert_affected_within('outputs', type_.outputs, current_type.outputs)
self.assert_affected_within('trashes', type_.trashes, current_type.trashes)
self.assert_affected_within('outputs', type_, current_type)
self.assert_affected_within('trashes', type_, current_type)
self.has_encountered_goto = True
elif opcode == 'trash':

6
src/sixtypical/model.py
View File

@ -23,9 +23,9 @@ class Type(object):
elif isinstance(self, VectorType):
self.of_type.backpatch_constraint_labels(resolver)
elif isinstance(self, RoutineType):
self.inputs = set([resolver(w) for w in self.inputs])
self.outputs = set([resolver(w) for w in self.outputs])
self.trashes = set([resolver(w) for w in self.trashes])
self.inputs = set([resolver(w) for w in self.inputs if isinstance(w, basestring)])
self.outputs = set([resolver(w) for w in self.outputs if isinstance(w, basestring)])
self.trashes = set([resolver(w) for w in self.trashes if isinstance(w, basestring)])
TYPE_BIT = Type('bit')