Fix quoted slicing

auto_editor/lang/palet.py

@@ -1294,7 +1294,7 @@ def syn_class(env: Env, node: list) -> Any:
 def attr(env: Env, node: list) -> Any:
     guard_term(node, 3, 3)
 
-    if not isinstance(node[2], Sym):
+    if type(node[2]) is not Sym:
         raise MyError("@r: attribute must be an identifier")
 
     return my_eval(env, [node[2], node[1]])
@@ -1318,10 +1318,9 @@ def my_eval(env: Env, node: object) -> Any:
             raise MyError("Can't use edit methods if there's no input files")
         return edit_method(node.val, env["@filesetup"], env)
 
-    if isinstance(node, list):
+    if type(node) is list:
         if not node:
             raise MyError("Illegal () expression")
-
         if node[0] is list:  # Handle vector literal
             return [my_eval(env, item) for item in node[1]]
 
@@ -1394,7 +1393,7 @@ def my_eval(env: Env, node: object) -> Any:
     "symbol?": (is_symbol := Contract("symbol?", lambda v: type(v) is Sym)),
     "string?": is_str,
     "char?": (is_char := Contract("char?", lambda v: type(v) is Char)),
-    "vector?": (is_vector := Contract("vector?", lambda v: isinstance(v, list))),
+    "vector?": (is_vector := Contract("vector?", lambda v: type(v) is list)),
     "array?": (is_array := Contract("array?", lambda v: isinstance(v, np.ndarray))),
     "bool-array?": is_boolarr,
     "range?": (is_range := Contract("range?", lambda v: type(v) is range)),

auto_editor/lib/contracts.py

@@ -164,7 +164,7 @@ def lt_c(n: int | float | Fraction) -> Proc:
     return Proc(f"(</c {n})", lambda i: i < n, (1, 1), [is_real])
 
 
-def between_c(n: int | float | Fraction, m: int | float | Fraction) -> Proc:
+def between_c(n: Any, m: Any) -> Proc:
     if m > n:
         return Proc(
             f"(between/c {n} {m})", lambda i: is_real(i) and i <= m and i >= n, (1, 1)

auto_editor/lib/data_structs.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Iterator
 from fractions import Fraction
 from io import StringIO
 from typing import Any
@@ -105,11 +106,14 @@ def __init__(self, val: list):
     def __len__(self) -> int:
         return len(self.val)
 
-    def __getitem__(self, index: int) -> object:
-        return self.val[index]
+    def __getitem__(self, key: int | slice) -> Any:
+        if isinstance(key, slice):
+            return Quoted(self.val[key])
 
-    def __iter__(self) -> list:
-        return self.val
+        return self.val[key]
+
+    def __iter__(self) -> Iterator:
+        return self.val.__iter__()
 
     def __contains__(self, item: object) -> bool:
         return item in self.val

resources/scripts/scope.pal

@@ -57,5 +57,8 @@
 ))
 
 (assert (= (apply add1 #(4)) 5))
+(assert (= (apply add1 '(4)) 5))
 (assert (= (apply sub1 #(4)) 3))
 (assert (equal? (map add1 '(3 4 5)) '(4 5 6)))
+
+(assert (equal? ('(3 4 5 6) 0 4 2) '(3 5)))