Merge branch 'master' into scroll-to-stack-end

Author: skogsbaer

package-lock.json

@@ -288,6 +288,7 @@ checkWithOutputAux yes 1 test-data/testLiteral1.py
 checkWithOutputAux yes 0 test-data/testForwardTypeInRecord.py
 checkWithOutputAux yes 0 test-data/testForwardTypeInRecord2.py
 checkWithOutputAux yes 0 test-data/testUnionOfUnion.py
+checkWithOutputAux yes 1 test-data/testRecordTypes.py
 
 function is_min_version()
 {

python/fileTests

@@ -254,14 +254,15 @@ def __init__(self, mod, properlyImported):
                 if name and name[0] != '_':
                   d[name] = getattr(mod, name)
 
-def prepareLib(onlyCheckRunnable):
+def prepareLib(onlyCheckRunnable, enableTypeChecking):
     libDefs = None
     mod = INSTALLED_MODULE_NAME
     verbose('Attempting to import ' + mod)
     wypp = importlib.import_module(mod)
     libDefs = Lib(wypp, True)
     verbose('Successfully imported module ' + mod + ' from file ' + wypp.__file__)
     libDefs.initModule(enableChecks=not onlyCheckRunnable,
+                       enableTypeChecking=enableTypeChecking,
                        quiet=onlyCheckRunnable)
     return libDefs
 
@@ -534,7 +535,7 @@ def main(globals, argList=None):
     if not args.checkRunnable and (not args.quiet or args.verbose):
         printWelcomeString(fileToRun, version, useUntypy=args.checkTypes)
 
-    libDefs = prepareLib(onlyCheckRunnable=args.checkRunnable)
+    libDefs = prepareLib(onlyCheckRunnable=args.checkRunnable, enableTypeChecking=args.checkTypes)
 
     globals['__name__'] = '__wypp__'
     sys.modules['__wypp__'] = sys.modules['__main__']

python/src/runner.py

@@ -141,7 +141,10 @@ def _setattr(obj, k, v):
 def record(cls=None, mutable=False):
     def wrap(cls):
         newCls = dataclasses.dataclass(cls, frozen=not mutable)
-        return _patchDataClass(newCls, mutable)
+        if _typeCheckingEnabled:
+            return _patchDataClass(newCls, mutable)
+        else:
+            return newCls
     # See if we're being called as @record or @record().
     if cls is None:
         # We're called with parens.
@@ -155,17 +158,20 @@ def wrap(cls):
 _die = False
 
 def setDieOnCheckFailures(b):
+    global _die
     _die = b
 
 def _dieOnCheckFailures():
     return _die
 
 _testCount = {'total': 0, 'failing': 0}
 _checksEnabled = True
+_typeCheckingEnabled = False
 
-def initModule(enableChecks=True, quiet=False):
-    global _checksEnabled
+def initModule(enableChecks=True, enableTypeChecking=True, quiet=False):
+    global _checksEnabled, _typeCheckingEnabled
     _checksEnabled = enableChecks
+    _typeCheckingEnabled = enableTypeChecking
     resetTestCount()
 
 def resetTestCount():

python/src/writeYourProgram.py

@@ -0,0 +1,12 @@
+Traceback (most recent call last):
+  File "test-data/testRecordTypes.py", line 8, in <module>
+    p = Point(1, '5')
+WyppTypeError: got value of wrong type
+given:    '5'
+expected: value of type int
+
+context: record constructor Point(x: int, y: int) -> Self
+                                             ^^^
+declared at: test-data/testRecordTypes.py:4
+caused by: test-data/testRecordTypes.py:8
+  | p = Point(1, '5')

python/test-data/testRecordTypes.err

@@ -0,0 +1,12 @@
+Traceback (most recent call last):
+  File "test-data/testRecordTypes.py", line 8, in <module>
+    p = Point(1, '5')
+WyppTypeError: got value of wrong type
+given:    '5'
+expected: value of type int
+
+context: record constructor Point(x: int, y: int) -> Self
+                                             ^^^
+declared at: test-data/testRecordTypes.py:3
+caused by: test-data/testRecordTypes.py:8
+  | p = Point(1, '5')

python/test-data/testRecordTypes.err-3.12

@@ -0,0 +1,8 @@
+from wypp import *
+
+@record
+class Point:
+    x: int
+    y: int
+
+p = Point(1, '5')

python/test-data/testRecordTypes.out

@@ -4,6 +4,7 @@
 import traceback
 import dataclasses
 
+initModule()
 setDieOnCheckFailures(True)
 
 @record

python/test-data/testRecordTypes.py

@@ -16,6 +16,7 @@ def eprint(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
 type_name_regex = re.compile("<class '(?:__main__\\.)?(.*)'>")
+function_str_regex = re.compile(r"^(<function .+) at .+>")
 import_regex = re.compile(r"^(?:[^'\"]+\s)?import[\s*]")
 
 # Frame objects:
@@ -26,10 +27,11 @@ def eprint(*args, **kwargs):
     float: "float",
     bool: "bool",
     str: "str",
-    type(None): "none"
+    type(None): "none",
+    type: "type",
+    types.FunctionType: "function"
 }
 HEAP_TYPES = {
-    type: "type",
     list: "list",
     tuple: "tuple",
     dict: "dict",
@@ -112,6 +114,18 @@ def format(self):
             "type": self.type_str,
             "value": self.value
         }
+        if type(d["value"]) == type:
+            type_name = str(d["value"])
+            search_result = type_name_regex.search(type_name)
+            if search_result is not None:
+                type_name = f"<class '{search_result.group(1)}'>"
+            d["value"] = type_name
+        elif inspect.isfunction(d["value"]):
+            function_desc = str(d["value"])
+            search_result = function_str_regex.search(function_desc)
+            if search_result is not None:
+                function_desc = f"{search_result.group(1)}>"
+            d["value"] = function_desc
         if self.variable_name is not None:
             d["name"] = self.variable_name
         return d
@@ -200,11 +214,6 @@ def store(self, address, value):
                 stored_value[key_id] = prim_value
                 if prim_value.is_ref():
                     inner_values.append(v)
-        elif value_type == type:
-            stored_value = str(value)
-            search_result = type_name_regex.search(stored_value)
-            if search_result is not None:
-                stored_value = f"<class '{search_result.group(1)}'>"
         elif inspect.isgenerator(value):
             stored_value = {}
         else: