Merge pull request #191 from skogsbaer/sw/fixes-2025-10-29

skogsbaer · web-flow · commit 7d55f9a93fdf · 2025-11-07T16:23:21.000+01:00
Improve startup
diff --git a/python/code/wypp/ansi.py b/python/code/wypp/ansi.py
@@ -23,7 +23,7 @@ def color(s, color):
     return color + s + RESET
 
 def green(s):
-    return color(s, GREEN)
+    return color(s, GREEN + BOLD)
 
 def red(s):
     return color(s, RED + BOLD)
diff --git a/python/code/wypp/interactive.py b/python/code/wypp/interactive.py
@@ -8,18 +8,6 @@
 from constants import *
 from myLogging import *
 from exceptionHandler import handleCurrentException
-import i18n
-
-def prepareInteractive(reset=True):
-    print()
-    if reset:
-        if os.name == 'nt':
-            # clear the terminal
-            os.system('cls')
-        else:
-            # On linux & mac use ANSI Sequence for this
-            print('\033[2J\033[H')
-
 
 HISTORY_SIZE = 1000
 
@@ -48,11 +36,12 @@ def enterInteractive(userDefs: dict, checkTypes: bool, loadingFailed: bool):
     historyFile = getHistoryFilePath()
     try:
         import readline
+    except:
+        readline = None
+    if readline:
         readline.parse_and_bind('tab: complete')
         if historyFile and os.path.exists(historyFile):
             readline.read_history_file(historyFile)
-    except:
-        pass
     try:
         consoleClass(locals=userDefs).interact(banner="", exitmsg='')
     finally:
diff --git a/python/code/wypp/records.py b/python/code/wypp/records.py
@@ -17,13 +17,6 @@ def init(enableTypeChecking=True):
     global _typeCheckingEnabled
     _typeCheckingEnabled = enableTypeChecking
 
-def _collectDataClassAttributes(cls):
-    result = dict()
-    for c in cls.mro():
-        if hasattr(c, '__kind') and c.__kind == 'record' and hasattr(c, '__annotations__'):
-            result = c.__annotations__ | result
-    return result
-
 def _checkRecordAttr(cls: typing.Any,
                      ns: myTypeguard.Namespaces,
                      name: str,
@@ -48,11 +41,8 @@ def _patchDataClass(cls, mutable: bool, ns: myTypeguard.Namespaces):
     fieldNames = [f.name for f in dataclasses.fields(cls)]
     setattr(cls, EQ_ATTRS_ATTR, fieldNames)
 
-    if hasattr(cls, '__annotations__'):
-        # add annotions for type checked constructor.
-        cls.__kind = 'record'
-        cls.__init__.__annotations__ = _collectDataClassAttributes(cls)
-        cls.__init__ = typecheck.wrapTypecheckRecordConstructor(cls, ns)
+    cls.__kind = 'record'
+    cls.__init__ = typecheck.wrapTypecheckRecordConstructor(cls, ns)
 
     if mutable:
         # prevent new fields being added
diff --git a/python/code/wypp/runner.py b/python/code/wypp/runner.py
@@ -33,7 +33,7 @@ def pythonVersionOk(v):
 import runCode
 import exceptionHandler
 import cmdlineArgs
-
+import ansi
 
 def printWelcomeString(file, version, doTypecheck):
     cwd = os.getcwd() + "/"
@@ -44,8 +44,10 @@ def printWelcomeString(file, version, doTypecheck):
     tycheck = ''
     if not doTypecheck:
         tycheck = ', no typechecking'
-    printStderr(i18n.tr('=== WELCOME to ') + '"Write Your Python Program" ' +
-                '(%sPython %s, %s%s) ===' % (versionStr, pythonVersion, file, tycheck))
+    msg = i18n.tr('=== WELCOME to ') + '"Write Your Python Program" ' + \
+          '(%sPython %s, %s%s) ===' % (versionStr, pythonVersion, file, tycheck)
+    fullMsg = (10 * '\n') + ansi.green(msg) + '\n'
+    printStderr(fullMsg)
 
 def main(globals, argList=None):
     (args, restArgs) = cmdlineArgs.parseCmdlineArgs(argList)
@@ -70,8 +72,6 @@ def main(globals, argList=None):
 
     isInteractive = args.interactive
     version = versionMod.readVersion()
-    if isInteractive:
-        interactive.prepareInteractive(reset=not args.noClear)
 
     if fileToRun is None:
         return
diff --git a/python/file-test-data/basics/recursive2_ok.err b/python/file-test-data/basics/recursive2_ok.err
diff --git a/python/file-test-data/basics/recursive2_ok.out b/python/file-test-data/basics/recursive2_ok.out
@@ -0,0 +1 @@
+Kinzig
diff --git a/python/file-test-data/basics/recursive2_ok.py b/python/file-test-data/basics/recursive2_ok.py
@@ -0,0 +1,38 @@
+from __future__ import annotations
+from wypp import *
+
+# Ein Flussabschnitt ist entweder
+# - ein Bach mit Namen und Quelle, oder
+# - ein Zusammenfluss eines Haupt- und Nebenflussabschnitts an einem bestimmten Ort.
+
+@record
+class Creek:
+    origin: str
+    name: str
+
+@record
+class Confluence:
+    location: str
+    mainStem: RiverSection
+    tributary: RiverSection
+
+type RiverSection = Union[Creek, Confluence]
+
+kinzig1 = Creek('Loßburg', 'Kinzig')
+gutach = Creek('Schönwald', 'Gutach')
+kinzig2 = Confluence('Hausach', kinzig1, gutach)
+schutter1 = Creek('Schweighausen', 'Schutter')
+heidengraben = Creek('Lahr', 'Heidengraben')
+schutter2 = Confluence('Lahr', schutter1, heidengraben)
+kinzig3 = Confluence('Kehl', kinzig2, schutter2)
+
+# Name eines Flussabschnitts bestimmen
+# Eingabe: den Flussabschnitt (Typ: RiverSection)
+# Ergebnis: der Name (Typ: str)
+def riverName(r: RiverSection) -> str:
+    if isinstance(r, Creek):
+        return r.name
+    elif isinstance(r, Confluence):
+        return riverName(r.mainStem)
+
+print(riverName(kinzig3))
diff --git a/python/file-test-data/basics/recursive_ok.err b/python/file-test-data/basics/recursive_ok.err
diff --git a/python/file-test-data/basics/recursive_ok.out b/python/file-test-data/basics/recursive_ok.out
@@ -0,0 +1 @@
+Kinzig
diff --git a/python/file-test-data/basics/recursive_ok.py b/python/file-test-data/basics/recursive_ok.py
@@ -0,0 +1,37 @@
+from wypp import *
+
+# Ein Flussabschnitt ist entweder
+# - ein Bach mit Namen und Quelle, oder
+# - ein Zusammenfluss eines Haupt- und Nebenflussabschnitts an einem bestimmten Ort.
+
+@record
+class Creek:
+    origin: str
+    name: str
+
+@record
+class Confluence:
+    location: str
+    mainStem: RiverSection
+    tributary: RiverSection
+
+type RiverSection = Union[Creek, Confluence]
+
+kinzig1 = Creek('Loßburg', 'Kinzig')
+gutach = Creek('Schönwald', 'Gutach')
+kinzig2 = Confluence('Hausach', kinzig1, gutach)
+schutter1 = Creek('Schweighausen', 'Schutter')
+heidengraben = Creek('Lahr', 'Heidengraben')
+schutter2 = Confluence('Lahr', schutter1, heidengraben)
+kinzig3 = Confluence('Kehl', kinzig2, schutter2)
+
+# Name eines Flussabschnitts bestimmen
+# Eingabe: den Flussabschnitt (Typ: RiverSection)
+# Ergebnis: der Name (Typ: str)
+def riverName(r: RiverSection) -> str:
+    if isinstance(r, Creek):
+        return r.name
+    elif isinstance(r, Confluence):
+        return riverName(r.mainStem)
+
+print(riverName(kinzig3))
diff --git a/python/file-test-data/basics/recursive_old_fail.err b/python/file-test-data/basics/recursive_old_fail.err
@@ -0,0 +1,6 @@
+Traceback (most recent call last):
+  File "file-test-data/basics/recursive_old_fail.py", line 13, in <module>
+    class Confluence:
+  File "file-test-data/basics/recursive_old_fail.py", line 15, in Confluence
+    mainStem: RiverSection
+NameError: name 'RiverSection' is not defined
diff --git a/python/file-test-data/basics/recursive_old_fail.out b/python/file-test-data/basics/recursive_old_fail.out
diff --git a/python/file-test-data/basics/recursive_old_fail.py b/python/file-test-data/basics/recursive_old_fail.py
@@ -0,0 +1,37 @@
+from wypp import *
+
+# Ein Flussabschnitt ist entweder
+# - ein Bach mit Namen und Quelle, oder
+# - ein Zusammenfluss eines Haupt- und Nebenflussabschnitts an einem bestimmten Ort.
+
+@record
+class Creek:
+    origin: str
+    name: str
+
+@record
+class Confluence:
+    location: str
+    mainStem: RiverSection
+    tributary: RiverSection
+
+type RiverSection = Union[Creek, Confluence]
+
+kinzig1 = Creek('Loßburg', 'Kinzig')
+gutach = Creek('Schönwald', 'Gutach')
+kinzig2 = Confluence('Hausach', kinzig1, gutach)
+schutter1 = Creek('Schweighausen', 'Schutter')
+heidengraben = Creek('Lahr', 'Heidengraben')
+schutter2 = Confluence('Lahr', schutter1, heidengraben)
+kinzig3 = Confluence('Kehl', kinzig2, schutter2)
+
+# Name eines Flussabschnitts bestimmen
+# Eingabe: den Flussabschnitt (Typ: RiverSection)
+# Ergebnis: der Name (Typ: str)
+def riverName(r: RiverSection) -> str:
+    if isinstance(r, Creek):
+        return r.name
+    elif isinstance(r, Confluence):
+        return riverName(r.mainStem)
+
+print(riverName(kinzig3))
diff --git a/python/fileTests.py b/python/fileTests.py
@@ -1,17 +1,39 @@
 from pathlib import Path
 from fileTestsLib import *
+import sys
+
+def pythonMinVersion(major: int, minor: int) -> bool:
+    return sys.version_info >= (major, minor)
+
+def pythonMaxVersion(major: int, minor: int) -> bool:
+    return sys.version_info <= (major, minor)
 
 directories = [Path("file-test-data/basics"),
                Path("file-test-data/extras")]
 
+special = {
+    'file-test-data/basics/recursive_ok.py': pythonMinVersion(3, 14),
+    'file-test-data/basics/recursive_old_fail.py': pythonMaxVersion(3, 13)
+    }
+
 #directories = [Path("file-test-data/basics")]
 #directories = [Path("file-test-data/extras")]
 
-for d in directories:
-    for file in d.iterdir():
-        if file.is_file():
-            name = file.as_posix()
-            if name.endswith('.py'):
-                check(name)
+def main():
+    for d in directories:
+        for file in d.iterdir():
+            if file.is_file():
+                name = file.as_posix()
+                if name.endswith('.py'):
+                    if name in special:
+                        if special[name]:
+                            check(name)
+                    else:
+                        check(name)
+
+    globalCtx.results.finish()
 
-globalCtx.results.finish()
+try:
+    main()
+except KeyboardInterrupt:
+    pass
diff --git a/python/fileTestsLib.py b/python/fileTestsLib.py
@@ -10,6 +10,7 @@
 import shutil
 import json
 import re
+import fnmatch
 
 GLOBAL_CHECK_OUTPUTS = True
 
@@ -24,6 +25,7 @@ class TestOpts:
     keepGoing: bool
     record: Optional[str]
     lang: Optional[str]
+    patterns: list[str]
 
 def parseArgs() -> TestOpts:
     parser = argparse.ArgumentParser(
@@ -41,7 +43,9 @@ def parseArgs() -> TestOpts:
                         type=str, help='Record the expected output for the given file.')
     parser.add_argument('--lang', dest='lang',
                         type=str, help='Display error messages in this language (either en or de, only for recording).')
-
+    parser.add_argument('patterns', metavar='PATTERN',
+                        help='Glob patterns, a test is executed only if it matches at least one pattern',
+                        nargs='*')
     # Parse the arguments
     args = parser.parse_args()
 
@@ -53,7 +57,8 @@ def parseArgs() -> TestOpts:
         only=args.only,
         keepGoing=args.keepGoing,
         record=args.record,
-        lang=args.lang
+        lang=args.lang,
+        patterns=args.patterns,
     )
 
 defaultLang = 'de'
@@ -82,6 +87,8 @@ def finish(self):
         print(f"Passed: {len(self.passed)}")
         print(f"Skipped: {len(self.skipped)}")
         print(f"Failed: {len(self.failed)}")
+        print()
+        print('Python version: ' + sys.version)
         if self.failed:
             print()
             print("Failed tests:")
@@ -136,6 +143,9 @@ def shouldSkip(testFile: str, ctx: TestContext, minVersion: Optional[tuple[int,
     """
     global _started
     opts = ctx.opts
+    if opts.patterns:
+        if not matchesAnyPattern(testFile, opts.patterns):
+            return True
     if opts.startAt:
         if _started:
             return False
@@ -368,6 +378,12 @@ def checkNoConfig(testFile: str,
         if not ctx.opts.keepGoing:
             ctx.results.finish()
 
+def matchesAnyPattern(testFile: str, patterns: list[str]) -> bool:
+    for p in patterns:
+        if fnmatch.fnmatch(testFile, p) or p in testFile:
+            return True
+    return False
+
 def check(testFile: str,
           exitCode: int = 1,
           minVersion: Optional[tuple[int, int]] = None,
diff --git a/src/extension.ts b/src/extension.ts
diff --git a/vscode-test/.vscode/settings.json b/vscode-test/.vscode/settings.json
diff --git a/vscode-test/type-test.py b/vscode-test/type-test.py
