__str__ formatting

pyteal/ast/abi/type.py

@@ -142,6 +142,16 @@ def _set_with_computed_type(self, value: "ComputedValue") -> Expr:
             )
         return value.store_into(self)
 
+    def __str__(self) -> str:
+        at = self.type_spec().annotation_type()
+
+        # Check if the type is the same as the annotation type
+        # This suggests it is not generic and we can just use the class name
+        if type(self) is at:
+            return self.__class__.__name__
+
+        return str(at)
+
 
 BaseType.__module__ = "pyteal"
 

pyteal/ast/binaryexpr.py

@@ -46,7 +46,9 @@ def __teal__(self, options: "CompileOptions"):
         )
 
     def __str__(self):
-        return "({} {} {})".format(self.op, self.argLeft, self.argRight)
+        return "({} {} {})".format(
+            str(self.op).title().replace("_", ""), self.argLeft, self.argRight
+        )
 
     def type_of(self):
         return self.outputType

pyteal/ast/int.py

@@ -33,7 +33,7 @@ def __teal__(self, options: "CompileOptions"):
         return TealBlock.FromOp(options, op)
 
     def __str__(self):
-        return "(Int: {})".format(self.value)
+        return "(Int {})".format(self.value)
 
     def type_of(self):
         return TealType.uint64
@@ -59,7 +59,7 @@ def __teal__(self, options: "CompileOptions"):
         return TealBlock.FromOp(options, op)
 
     def __str__(self):
-        return "(IntEnum: {})".format(self.name)
+        return "(IntEnum {})".format(self.name)
 
     def type_of(self):
         return TealType.uint64

pyteal/ast/methodsig.py

@@ -33,7 +33,7 @@ def __teal__(self, options: "CompileOptions"):
         return TealBlock.FromOp(options, op)
 
     def __str__(self) -> str:
-        return "(method: {})".format(self.methodName)
+        return "(MethodSignature '{}')".format(self.methodName)
 
     def type_of(self) -> TealType:
         return TealType.bytes

pyteal/ast/naryexpr.py

@@ -48,7 +48,7 @@ def __teal__(self, options: "CompileOptions"):
         return start, end
 
     def __str__(self):
-        ret_str = "(" + str(self.op)
+        ret_str = "(" + str(self.op).title().replace("_", "")
         for a in self.args:
             ret_str += " " + a.__str__()
         ret_str += ")"

pyteal/ast/unaryexpr.py

@@ -31,7 +31,7 @@ def __teal__(self, options: "CompileOptions"):
         return TealBlock.FromOp(options, TealOp(self, self.op), self.arg)
 
     def __str__(self):
-        return "({} {})".format(self.op, self.arg)
+        return "({} {})".format(str(self.op).title().replace("_", ""), self.arg)
 
     def type_of(self):
         return self.outputType