Merge branch 'russtoku-main'

dev/python/sandbox.py

@@ -1,3 +1,5 @@
+# Should be able to evaluate all of these.
+
 def add(a, b):
     return a + b
 
@@ -49,6 +51,63 @@ def fn_with_multiline_str():
 
 fn_with_multiline_str()
 
+import csv
+from datetime import datetime
+
+
+# Class definition
+#   - from https://docs.python.org/3/tutorial/classes.html
+class Dog:
+
+    def __init__(self, name):
+        self.name = name
+        self.tricks = []
+
+    def add_trick(self, trick):
+        self.tricks.append(trick)
+
+d = Dog('Fido')
+e = Dog('Buddy')
+d.add_trick('roll_over')
+e.add_trick('play dead')
+d.tricks
+e.tricks
+
+
+# Class definition with decorator
+#   - from https://docs.python.org/3.10/tutorial/classes.html
+from dataclasses import dataclass
+
+@dataclass
+class Employee:
+    name: str
+    dept: str
+    salary: int
+
+john = Employee('john', 'computer lab', 1000)
+john.dept
+john.salary
+
+
+# Function definition with decorator
+#   - https://docs.python.org/3.8/library/functools.html?highlight=decorator#functools.cached_property
+from functools import lru_cache
+
+@lru_cache(maxsize=None)
+def fib(n):
+    if n < 2:
+        return n
+    return fib(n-1) + fib(n-2)
+
+[fib(n) for n in range(16)]
+# [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610]
+
+fib.cache_info()
+# CacheInfo(hits=28, misses=16, maxsize=None, currsize=16)
+
+
+# Asyncio samples
+#   - Add '-m asyncio' to the python command to evaluate these.
 
 """
 async def slow_fn():
@@ -68,7 +127,3 @@ async def capture():
 await capture()
 result
 """
-
-
-import csv
-from datetime import datetime

fnl/conjure/client/python/stdio.fnl

@@ -38,13 +38,21 @@
 ; "current form" and not be surprised that it wasn't what you thought.
 (fn form-node?
   [node]
-  (or (= "expression_statement" (node:type))
-      (= "import_statement" (node:type))
-      (= "import_from_statement" (node:type))
-      (= "with_statement" (node:type))
-      (= "function_definition" (node:type))
-      (= "for_statement" (node:type))
-      (= "call" (node:type))))
+  (log.dbg "form-node?: node:type =" (node:type))
+  (log.dbg "form-node?: node:parent =" (node:parent))
+  (let [parent (node:parent)]
+    (if (= "expression_statement" (node:type)) true
+        (= "import_statement" (node:type)) true
+        (= "import_from_statement" (node:type)) true
+        (= "with_statement" (node:type)) true
+        (= "decorated_definition" (node:type)) true
+        (= "for_statement" (node:type)) true
+        (= "call" (node:type)) true
+        (and (= "class_definition" (node:type))
+              (not (= "decorated_definition" (parent:type)))) true
+        (and (= "function_definition" (node:type))
+             (not (= "decorated_definition" (parent:type)))) true
+        false)))
 
 (fn with-repl-or-warn [f opts]
   (let [repl (state :repl)]