Merge branch 'master' into progflow-fixes

skogsbaer · web-flow · commit 53b25af701ea · 2024-11-22T12:53:45.000+01:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,13 @@
 # Write Your Python Program - CHANGELOG
 
+* ? (?)
+  * Fix bug with union of unions
+* 1.2.1 (2024-11-05)
+  * Fix assets for visualization
+* 1.2.0 (2024-11-04)
+  * Support for visualization
+  * Fix handling of lazy annotations in records
+  * Fix output of execution fails but some tests were successful
 * 1.1.0 (2024-10-02)
   * Improve invocation on windows, always use cmd.exe
   * Fixed bugs #132, #133, #134, and #135
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Write Your Python Program!",
 	"description": "A user friendly python environment for beginners",
 	"license": "See license in LICENSE",
-	"version": "1.1.0",
+	"version": "1.2.1",
 	"publisher": "StefanWehr",
 	"icon": "icon.png",
 	"engines": {
diff --git a/python/deps/untypy/untypy/impl/union.py b/python/deps/untypy/untypy/impl/union.py
@@ -71,7 +71,7 @@ def describe(self) -> str:
     def base_type(self) -> list[Any]:
         out = []
         for checker in self.inner:
-            out.append(checker.base_type())
+            out.extend(checker.base_type())
         return out
 
 
diff --git a/python/fileTests b/python/fileTests
@@ -287,6 +287,7 @@ checkWithOutputAux yes 0 test-data/testUnion3.py
 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
 
 function is_min_version()
 {
diff --git a/python/src/runner.py b/python/src/runner.py
@@ -1,4 +1,3 @@
-from __future__ import annotations as anns
 import sys
 import os
 import os.path
@@ -320,7 +319,7 @@ def runCode(fileToRun, globals, args, useUntypy=True, extraDirs=None):
 
     with RunSetup(localDir):
         codeTxt = readFile(fileToRun)
-        flags = 0 | anns.compiler_flag
+        flags = 0
         if useUntypy:
             verbose(f'finding modules imported by {fileToRun}')
             importedMods = findImportedModules([localDir] + extraDirs, fileToRun)
diff --git a/python/test-data/fileWithRecursiveTypes.py b/python/test-data/fileWithRecursiveTypes.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 class C:
     def foo(self: C, d: D) -> C:
         return C
diff --git a/python/test-data/testClassRecursion.py b/python/test-data/testClassRecursion.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from wypp import *
 
 class C:
diff --git a/python/test-data/testHintParentheses1.err b/python/test-data/testHintParentheses1.err
@@ -1,10 +1,10 @@
 Traceback (most recent call last):
-  File "test-data/testHintParentheses1.py", line 4, in <module>
+  File "test-data/testHintParentheses1.py", line 5, in <module>
     def foo(l: list(int)) -> int:
 WyppAttributeError: Type annotation of function 'foo' could not be resolved:
 'type' object is not iterable
 
 def foo(l: list(int)) -> int:                    
     return ^^^^^^^^^ - Did you mean: 'list[int]'?
 
-declared at: test-data/testHintParentheses1.py:4
+declared at: test-data/testHintParentheses1.py:5
diff --git a/python/test-data/testHintParentheses1.py b/python/test-data/testHintParentheses1.py
@@ -1,7 +1,8 @@
+from __future__ import annotations
 from wypp import *
 # See https://github.com/skogsbaer/write-your-python-program/issues/61
 
 def foo(l: list(int)) -> int:
     return len(l)
 
-check(foo([1,2,3]), 3)
+check(foo([1,2,3]), 3)
diff --git a/python/test-data/testHintParentheses3.err b/python/test-data/testHintParentheses3.err
@@ -1,10 +1,10 @@
 Traceback (most recent call last):
-  File "test-data/testHintParentheses3.py", line 5, in <module>
+  File "test-data/testHintParentheses3.py", line 6, in <module>
     def foo() -> Union(list, str):
 WyppAttributeError: Type annotation of function 'foo' could not be resolved:
 Cannot call Union like a function. Did you mean Union[list, str]?
 
 def foo() -> Union(list, str):                                   
     pass     ^^^^^^^^^^^^^^^^ - Did you mean: 'Union[list, str]'?
 
-declared at: test-data/testHintParentheses3.py:5
+declared at: test-data/testHintParentheses3.py:6
diff --git a/python/test-data/testHintParentheses3.py b/python/test-data/testHintParentheses3.py
@@ -1,6 +1,7 @@
+from __future__ import annotations
 from wypp import *
 # See https://github.com/skogsbaer/write-your-python-program/issues/61
 
 # Tests 'return' 
 def foo() -> Union(list, str):
-    pass
+    pass
diff --git a/python/test-data/testIterator3.py b/python/test-data/testIterator3.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Iterable
 
 def myRange(n: int) -> Iterator[int]:
diff --git a/python/test-data/testRecordSetTypeForwardRef.err b/python/test-data/testRecordSetTypeForwardRef.err
@@ -1,12 +1,12 @@
 Traceback (most recent call last):
-  File "test-data/testRecordSetTypeForwardRef.py", line 14, in <module>
+  File "test-data/testRecordSetTypeForwardRef.py", line 15, in <module>
     m()
-  File "test-data/testRecordSetTypeForwardRef.py", line 12, in m
+  File "test-data/testRecordSetTypeForwardRef.py", line 13, in m
     r.x = "hello"
 WyppTypeError: got value of wrong type
 given:    'hello'
 expected: value of type A
 
-declared at: test-data/testRecordSetTypeForwardRef.py:4
-caused by: test-data/testRecordSetTypeForwardRef.py:12
+declared at: test-data/testRecordSetTypeForwardRef.py:5
+caused by: test-data/testRecordSetTypeForwardRef.py:13
   |     r.x = "hello"
diff --git a/python/test-data/testRecordSetTypeForwardRef.err-3.12 b/python/test-data/testRecordSetTypeForwardRef.err-3.12
@@ -1,12 +1,12 @@
 Traceback (most recent call last):
-  File "test-data/testRecordSetTypeForwardRef.py", line 14, in <module>
+  File "test-data/testRecordSetTypeForwardRef.py", line 15, in <module>
     m()
-  File "test-data/testRecordSetTypeForwardRef.py", line 12, in m
+  File "test-data/testRecordSetTypeForwardRef.py", line 13, in m
     r.x = "hello"
 WyppTypeError: got value of wrong type
 given:    'hello'
 expected: value of type A
 
-declared at: test-data/testRecordSetTypeForwardRef.py:3
-caused by: test-data/testRecordSetTypeForwardRef.py:12
+declared at: test-data/testRecordSetTypeForwardRef.py:4
+caused by: test-data/testRecordSetTypeForwardRef.py:13
   |     r.x = "hello"
diff --git a/python/test-data/testRecordSetTypeForwardRef.py b/python/test-data/testRecordSetTypeForwardRef.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from wypp import *
 
 @record(mutable=True)
diff --git a/python/test-data/testTypesProtos6.err b/python/test-data/testTypesProtos6.err
@@ -1,23 +1,23 @@
 Traceback (most recent call last):
-  File "test-data/testTypesProtos6.py", line 56, in <module>
+  File "test-data/testTypesProtos6.py", line 57, in <module>
     print(computeTotalSize(root))
-  File "test-data/testTypesProtos6.py", line 49, in computeTotalSize
+  File "test-data/testTypesProtos6.py", line 50, in computeTotalSize
     fs.accept(visitor)
-  File "test-data/testTypesProtos6.py", line 18, in accept
+  File "test-data/testTypesProtos6.py", line 19, in accept
     visitor.visitDirectory(self)
-  File "test-data/testTypesProtos6.py", line 40, in visitDirectory
+  File "test-data/testTypesProtos6.py", line 41, in visitDirectory
     c.accept(self)
-  File "test-data/testTypesProtos6.py", line 27, in accept
+  File "test-data/testTypesProtos6.py", line 28, in accept
     visitor.visitFile(self)
 WyppTypeError: TotalSizeVisitor does not implement parent FileSystemVisitor
 given:    <__wypp__.TotalSizeVisitor object at 0x00>
 expected: value of type FileSystemVisitor
 
-declared at: test-data/testTypesProtos6.py:35
-declared at: test-data/testTypesProtos6.py:32
-caused by: test-data/testTypesProtos6.py:35
+declared at: test-data/testTypesProtos6.py:36
+declared at: test-data/testTypesProtos6.py:33
+caused by: test-data/testTypesProtos6.py:36
   | class TotalSizeVisitor(FileSystemVisitor):
-caused by: test-data/testTypesProtos6.py:41
+caused by: test-data/testTypesProtos6.py:42
   |     def visitFile(self, file: str):
 
 Argument file of method visitFile violates the type declared by the parent FileSystemVisitor.
@@ -28,7 +28,7 @@ expected: value of type str
 
 context: visitFile(self: Self, file: str) -> None
                                      ^^^
-declared at: test-data/testTypesProtos6.py:41
-declared at: test-data/testTypesProtos6.py:32
-caused by: test-data/testTypesProtos6.py:41
+declared at: test-data/testTypesProtos6.py:42
+declared at: test-data/testTypesProtos6.py:33
+caused by: test-data/testTypesProtos6.py:42
   |     def visitFile(self, file: str):
diff --git a/python/test-data/testTypesProtos6.py b/python/test-data/testTypesProtos6.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from wypp import *
 
 class FileSystemEntry:
diff --git a/python/test-data/testTypesProtos7.err b/python/test-data/testTypesProtos7.err
@@ -1,23 +1,23 @@
 Traceback (most recent call last):
-  File "test-data/testTypesProtos7.py", line 75, in <module>
+  File "test-data/testTypesProtos7.py", line 76, in <module>
     print(computeTotalSize(root))
-  File "test-data/testTypesProtos7.py", line 68, in computeTotalSize
+  File "test-data/testTypesProtos7.py", line 69, in computeTotalSize
     fs.accept(visitor)
-  File "test-data/testTypesProtos7.py", line 35, in accept
+  File "test-data/testTypesProtos7.py", line 36, in accept
     visitor.visitDirectory(self)
-  File "test-data/testTypesProtos7.py", line 59, in visitDirectory
+  File "test-data/testTypesProtos7.py", line 60, in visitDirectory
     c.accept(self)
-  File "test-data/testTypesProtos7.py", line 46, in accept
+  File "test-data/testTypesProtos7.py", line 47, in accept
     visitor.visitFile(self)
 WyppTypeError: TotalSizeVisitor does not implement parent FileSystemVisitor
 given:    <__wypp__.TotalSizeVisitor object at 0x00>
 expected: value of type FileSystemVisitor
 
-declared at: test-data/testTypesProtos7.py:54
-declared at: test-data/testTypesProtos7.py:51
-caused by: test-data/testTypesProtos7.py:54
+declared at: test-data/testTypesProtos7.py:55
+declared at: test-data/testTypesProtos7.py:52
+caused by: test-data/testTypesProtos7.py:55
   | class TotalSizeVisitor(FileSystemVisitor):
-caused by: test-data/testTypesProtos7.py:60
+caused by: test-data/testTypesProtos7.py:61
   |     def visitFile(self, f: str):
 
 Argument f of method visitFile violates the type declared for file in parent FileSystemVisitor.
@@ -27,7 +27,7 @@ given:    File('notes.txt')
 expected: value of type str
 
 context: visitFile(self: Self, f: File) -> None
-declared at: test-data/testTypesProtos7.py:60
-declared at: test-data/testTypesProtos7.py:51
-caused by: test-data/testTypesProtos7.py:60
+declared at: test-data/testTypesProtos7.py:61
+declared at: test-data/testTypesProtos7.py:52
+caused by: test-data/testTypesProtos7.py:61
   |     def visitFile(self, f: str):
diff --git a/python/test-data/testTypesProtos7.py b/python/test-data/testTypesProtos7.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from abc import ABC, abstractmethod
 from wypp import *
 
diff --git a/python/test-data/testUnionOfUnion.err b/python/test-data/testUnionOfUnion.err
diff --git a/python/test-data/testUnionOfUnion.out b/python/test-data/testUnionOfUnion.out
@@ -0,0 +1,3 @@
+pizza: Napoli
+noodles: Penne
+beer: Export
diff --git a/python/test-data/testUnionOfUnion.py b/python/test-data/testUnionOfUnion.py
@@ -0,0 +1,31 @@
+from wypp import *
+
+@record
+class Pizza:
+    nameP: str
+
+@record
+class Noodles:
+    nameN: str
+
+type Food = Union[Pizza, Noodles]
+
+@record
+class Beer:
+    nameB: str
+
+type All = Union[Food, Beer]
+
+def foo(a: All):
+    if isinstance(a, Pizza):
+        print(f'pizza: {a.nameP}')
+    elif isinstance(a, Noodles):
+        print(f'noodles: {a.nameN}')
+    elif isinstance(a, Beer):
+        print(f'beer: {a.nameB}')
+    else:
+        impossible()
+
+foo(Pizza('Napoli'))
+foo(Noodles('Penne'))
+foo(Beer('Export'))
diff --git a/python/test-data/wrong-caused-by.err b/python/test-data/wrong-caused-by.err
@@ -1,12 +1,12 @@
 Traceback (most recent call last):
-  File "test-data/wrong-caused-by.py", line 30, in <module>
+  File "test-data/wrong-caused-by.py", line 31, in <module>
     mainStreetM.turnIntoStreet(redCarM)
 WyppTypeError: got value of wrong type
 given:    CarM(licensePlate='OG PY 123', color='rot')
 expected: value of type Car
 
 context: turnIntoStreet(self: Self, car: Car) -> None
                                          ^^^
-declared at: test-data/wrong-caused-by.py:9
-caused by: test-data/wrong-caused-by.py:30
+declared at: test-data/wrong-caused-by.py:10
+caused by: test-data/wrong-caused-by.py:31
   | mainStreetM.turnIntoStreet(redCarM)
diff --git a/python/test-data/wrong-caused-by.py b/python/test-data/wrong-caused-by.py
@@ -1,3 +1,4 @@
+from __future__ import annotations
 from wypp import *
 
 @record(mutable=True)
diff --git a/pytrace-generator/main.py b/pytrace-generator/main.py
@@ -430,7 +430,7 @@ def run_script(self, filename, script_str):
     exit(1)
 
 filename = os.path.abspath(sys.argv[1])
-with open(filename, "r") as f:
+with open(filename, "r", encoding="utf-8") as f:
     script_str = f.read()
 
 # Add a 'pass' at the end to also get the last trace step

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ checkWithOutputAux yes 0 test-data/testUnion3.py`
`287`	`287`	`checkWithOutputAux yes 1 test-data/testLiteral1.py`
`288`	`288`	`checkWithOutputAux yes 0 test-data/testForwardTypeInRecord.py`
`289`	`289`	`checkWithOutputAux yes 0 test-data/testForwardTypeInRecord2.py`
	`290`	`+checkWithOutputAux yes 0 test-data/testUnionOfUnion.py`
`290`	`291`
`291`	`292`	`function is_min_version()`
`292`	`293`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`class C:`
`2`	`4`	`def foo(self: C, d: D) -> C:`
`3`	`5`	`return C`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from __future__ import annotations`
`1`	`2`	`from wypp import *`
`2`	`3`
`3`	`4`	`class C:`