diff --git a/interp.py b/interp.py index 0165fe8..7b0aaea 100644 --- a/interp.py +++ b/interp.py @@ -6,26 +6,20 @@ class Bool: def __init__(self, value): - self._value = value + self.value = value def __repr__(self): - return "Bool(%s)" % (self._value) - - def value(self): - return self._value + return "Bool(%s)" % (self.value) def verb_ToText(self, args): return Text(self._value) class Text: def __init__(self, value): - self._value = value + self.value = value def __repr__(self): - return "Text('%s')" % (self._value) - - def value(self): - return self._value + return "Text('%s')" % (self.value) def verb_Append(self, args): args_count = len(args) @@ -34,7 +28,7 @@ appendix = args[0] if appendix.__class__ != Text: raise InterpreterError("Invalid argument type %s, expected Text" % (appendix.__class__.__name__)) - return Text(self.value() + " " + appendix.value()) + return Text(self.value + " " + appendix.value) def verb_Equals(self, args): args_count = len(args) @@ -43,7 +37,7 @@ compare = args[0] if compare.__class__ != Text: raise InterpreterError("Invalid argument type %s, expected Text" % (appendix.__class__.__name__)) - return Bool(self.value() == compare.value()) + return Bool(self.value == compare.value) class Module_System: def verb_Print(self, args): @@ -53,7 +47,7 @@ line = args[0] if line.__class__ != Text: raise InterpreterError("Invalid argument type %s, expected Text" % (line.__class__.__name__)) - print(line.value()) + print(line.value) def verb_Read(self, args): try: @@ -111,7 +105,7 @@ test = self.run_statement(ast.test) if test.__class__ != Bool: raise InterpreterError("Test condition didn't return a boolean") - if test.value(): + if test.value: ret = self.run_statement(ast.success) else: ret = self.run_statement(ast.failure)