Remove complex number type

Author: WyattBlue

auto_editor/cmds/test.py

@@ -560,15 +560,12 @@ def cases(*cases: tuple[str, object]) -> None:
             ("238.5", 238.5),
             ("-34", -34),
             ("-98.3", -98.3),
-            ("+3i", 3j),
             ("3sec", 90),
             ("-3sec", -90),
             ("0.2sec", 6),
             ("(+ 4 3)", 7),
             ("(+ 4 3 2)", 9),
             ("(+ 10.5 3)", 13.5),
-            ("(+ 3+4i -2-2i)", 1 + 2j),
-            ("(+ 3+4i -2-2i 5)", 6 + 2j),
             ("(- 4 3)", 1),
             ("(- 3)", -3),
             ("(- 10.5 3)", 7.5),
@@ -591,7 +588,6 @@ def cases(*cases: tuple[str, object]) -> None:
             ("(int? #t)", False),
             ("(int? #f)", False),
             ("(int? 4/5)", False),
-            ("(int? 0+2i)", False),
             ('(int? "hello")', False),
             ('(int? "3")', False),
             ("(float? -23.4)", True),
@@ -605,7 +601,6 @@ def cases(*cases: tuple[str, object]) -> None:
             ('(define apple "Red Wood") apple', "Red Wood"),
             ("(= 1 1.0)", True),
             ("(= 1 2)", False),
-            ("(= 2+3i 2+3i 2+3i)", True),
             ("(= 1)", True),
             ("(+)", 0),
             ("(*)", 1),
@@ -614,7 +609,6 @@ def cases(*cases: tuple[str, object]) -> None:
             ('(if #f mango "Hi")', "Hi"),
             ('{if (= [+ 3 4] 7) "yes" "no"}', "yes"),
             ("((if #t + -) 3 4)", 7),
-            ("((if #t + oops) 3+3i 4-2i)", 7 + 1j),
             ("((if #f + -) 3 4)", -1),
             ("(when (positive? 3) 17)", 17),
             ("(string)", ""),

auto_editor/lang/palet.py

@@ -148,7 +148,7 @@ def number(self) -> Token:
                 token = SEC
             elif unit == "dB":
                 token = DB
-            elif unit != "i" and unit != "%":
+            elif unit != "%":
                 return Token(
                     VAL,
                     Sym(result + unit, self.lineno, self.column),
@@ -157,9 +157,7 @@ def number(self) -> Token:
                 )
 
         try:
-            if unit == "i":
-                return Token(VAL, complex(result + "j"), self.lineno, self.column)
-            elif unit == "%":
+            if unit == "%":
                 return Token(VAL, float(result) / 100, self.lineno, self.column)
             elif "/" in result:
                 return Token(token, Fraction(result), self.lineno, self.column)

auto_editor/lang/stdenv.py

@@ -19,7 +19,7 @@
     import numpy as np
     from numpy.typing import NDArray
 
-    Number = int | float | complex | Fraction
+    Number = int | float | Fraction
     BoolList = NDArray[np.bool_]
     Node = tuple
 
@@ -835,9 +835,6 @@ def _xor(*vals: Any) -> bool | BoolList:
         return reduce(lambda a, b: a ^ b, vals)
 
     def number_to_string(val: Number) -> str:
-        if isinstance(val, complex):
-            join = "" if val.imag < 0 else "+"
-            return f"{val.real}{join}{val.imag}i"
         return f"{val}"
 
     def string_to_number(val) -> float:
@@ -989,7 +986,6 @@ def change_file_ext(a: str, ext: str) -> str:
         "int?": is_int,
         "float?": is_float,
         "frac?": is_frac,
-        "complex?": Contract("complex?", lambda v: type(v) is complex),
         "nat?": is_nat,
         "nat1?": is_nat1,
         "threshold?": is_threshold,
@@ -1044,8 +1040,6 @@ def change_file_ext(a: str, ext: str) -> str:
         "div": Proc("div", int_div, (2, None), is_int),
         "add1": Proc("add1", lambda z: z + 1, (1, 1), is_num),
         "sub1": Proc("sub1", lambda z: z - 1, (1, 1), is_num),
-        "real-part": Proc("real-part", lambda v: v.real, (1, 1), is_num),
-        "imag-part": Proc("imag-part", lambda v: v.imag, (1, 1), is_num),
         # reals
         "pow": Proc("pow", pow, (2, 2), is_real),
         "abs": Proc("abs", abs, (1, 1), is_real),

auto_editor/lib/contracts.py

@@ -46,7 +46,7 @@ def check_contract(c: object, val: object) -> bool:
         return val is True
     if c is False:
         return val is False
-    if type(c) in (int, float, float64, Fraction, complex, str, Sym):
+    if type(c) in (int, float, float64, Fraction, str, Sym):
         return val == c
     raise MyError(f"Invalid contract, got: {print_str(c)}")
 
@@ -164,18 +164,16 @@ def is_contract(c: object) -> bool:
         return True
     if c is True or c is False:
         return True
-    return type(c) in (int, float, Fraction, complex, str, Sym)
+    return type(c) in (int, float, Fraction, str, Sym)
 
 
 is_bool = Contract("bool?", lambda v: type(v) is bool)
 is_int = Contract("int?", lambda v: type(v) is int)
 is_nat = Contract("nat?", lambda v: type(v) is int and v > -1)
 is_nat1 = Contract("nat1?", lambda v: type(v) is int and v > 0)
 int_not_zero = Contract("(or/c (not/c 0) int?)", lambda v: v != 0 and is_int(v))
-is_num = Contract(
-    "number?", lambda v: type(v) in (int, float, float64, Fraction, complex)
-)
 is_real = Contract("real?", lambda v: type(v) in (int, float, float64, Fraction))
+is_num = is_real
 is_float = Contract("float?", lambda v: type(v) in (float, float64))
 is_frac = Contract("frac?", lambda v: type(v) is Fraction)
 is_str = Contract("string?", lambda v: type(v) is str)

auto_editor/lib/data_structs.py

@@ -182,9 +182,6 @@ def display_str(val: object) -> str:
         return f"{val}"
     if type(val) is range:
         return "#<range>"
-    if type(val) is complex:
-        join = "" if val.imag < 0 else "+"
-        return f"{val.real}{join}{val.imag}i"
     if type(val) is np.bool_:
         return "1" if val else "0"
     if type(val) is np.float64 or type(val) is np.float32:

docs/doc.pal

@@ -283,7 +283,6 @@
         (pred "frac?"
             (text "Returns "#t" if "'v" is a fraction (a rational number), "#f" otherwise.")
         )
-        (pred "complex?" (text "Returns "#t" if "'v" is an complex number, "#f" otherwise."))
         (pred "nat?"
             (text "Returns "#t" if "'v" is an integer and "'v" is >= 0, "#f" otherwise.")
         )
@@ -358,8 +357,6 @@
         (proc "abs" '((x real?) real?) (text "Returns the absolute value of "'x"."))
         (proc "max" '((x real?) ... real?) (text "Returns largest value of the "'x"s."))
         (proc "min" '((x real?) ... real?) (text "Returns smallest value of the "'x"s."))
-        (proc "real-part" '((z number?) real?) (text "Returns the real part of "'z"."))
-        (proc "imag-part" '((z number?) real?) (text "Returns the imaginary part of "'z"."))
         (proc "round" '((x real?) int?)
             (text
                 "Returns the closest integer to "'x" resolving ties in favor of even numbers."