Ite -> If

algorand · Feb 5, 2020 · 7c99fba · 7c99fba
1 parent 7e7fb86
commit 7c99fba
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/docs/control_structures.rst b/docs/control_structures.rst
@@ -1,2 +1,6 @@
-Control Structures
-==================
+.. _conditionals:
+
+Conditionals
+============
+
+
diff --git a/examples/split.py b/examples/split.py
@@ -29,8 +29,9 @@
                   Txn.receiver() == Global.zero_address(),
                   Txn.first_valid() == tmpl_timeout)
 
-split = split_core.And(Ite(Global.group_size() == Int(2),
-                           split_transfer,
-                           split_close))
+split = And(split_core,
+            If(Global.group_size() == Int(2),
+               split_transfer,
+               split_close))
 
 print(split.teal())
diff --git a/pyteal/ops.py b/pyteal/ops.py
@@ -719,7 +719,7 @@ def type_of(self):
         return type_of_field[self.field]
 
 
-class Ite(NaryExpr):
+class If(NaryExpr):
 
     #default constructor
     def __init__(self, arg0:Expr, arg1:Expr, arg2:Expr):
@@ -740,7 +740,7 @@ def __teal__(self):
         return ret
 
     def __str__(self):
-        return "(Ite {} {} {})".format(self.args[0], self.args[1], self.args[2])
+        return "(If {} {} {})".format(self.args[0], self.args[1], self.args[2])
 
     def type_of(self):
         return self.args[1].type_of()
@@ -984,13 +984,13 @@ def __init__(self, *argv):
         self.args = argv        
 
     def __teal__(self):
-        # converting cond to ite first
-        def make_ite(conds):
+        # converting cond to if first
+        def make_if(conds):
             if len(conds) == 0:
                 return Err()
             else:
                 e = conds[0]
-                return Ite(e[0], e[1], make_ite(conds[1:]))
+                return If(e[0], e[1], make_if(conds[1:]))
 
         desugared = make_ite(self.args)
         return desugared.__teal__() 

diff --git a/tests/compile_test.py b/tests/compile_test.py
@@ -160,9 +160,9 @@ def test_split():
                       Txn.first_valid() > tmpl_timeout)
 
     split = And(split_core,
-                Ite(Global.group_size() == Int(2),
-                    split_transfer,
-                    split_close))
+                If(Global.group_size() == Int(2),
+                   split_transfer,
+                   split_close))
 
     target = """txn TypeEnum
 int 1

diff --git a/tests/test_ops.py b/tests/test_ops.py
@@ -231,14 +231,14 @@ def test_gtxn():
     Gtxn.tx_id(1)
 
 
-def test_ite():
-    Ite(Int(0), Txn.sender(), Txn.receiver())
+def test_if():
+    If(Int(0), Txn.sender(), Txn.receiver())
 
     with pytest.raises(TealTypeError):
-        Ite(Int(0), Txn.amount(), Txn.sender())
+        If(Int(0), Txn.amount(), Txn.sender())
 
     with pytest.raises(TealTypeError):
-        Ite(Txn.sender(), Int(1), Int(0))
+        If(Txn.sender(), Int(1), Int(0))
 
 
 def test_itob():