state

Author: mcspr

cores/esp8266/LwipIntfDev.h

@@ -349,7 +349,8 @@ boolean LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu
 template<class RawDev>
 void LwipIntfDev<RawDev>::end()
 {
-        netif_remove(&_netif);
+    netif_remove(&_netif);
+
     _started = false;
     RawDev::end();
 }

tests/restyle.py

@@ -7,8 +7,7 @@
 import subprocess
 import contextlib
 
-from dataclasses import dataclass, fields
-from dataclasses import field as dataclass_field
+from dataclasses import dataclass
 
 
 GIT_ROOT = pathlib.Path(
@@ -19,22 +18,44 @@
 
 
 def clang_format(clang_format, config, files):
+    if not files:
+        raise ValueError("Files list cannot be empty")
+
     cmd = [clang_format, "--verbose", f"--style=file:{config.as_posix()}", "-i"]
     cmd.extend(files)
 
     subprocess.run(cmd, check=True)
 
 
+def ls_files(patterns):
+    """Git-only search, but rather poor at matching complex patterns (at least w/ <=py3.12)"""
+    proc = subprocess.run(
+        ["git", "--no-pager", "ls-files"],
+        capture_output=True,
+        check=True,
+        universal_newlines=True,
+    )
+
+    out = []
+    for line in proc.stdout.split("\n"):
+        path = pathlib.Path(line.strip())
+        if any(path.match(pattern) for pattern in patterns):
+            out.append(path)
+
+    return out
+
+
 def find_files(patterns):
+    """Filesystem search, matches both git and non-git files"""
     return [
         file
         for pattern in patterns
         for file in [found for found in GIT_ROOT.rglob(pattern)]
     ]
 
 
-# just like original script, only handle a subset of core sources
 def find_core_files():
+    """Returns a subset of Core files that should be formatted"""
     return [
         file
         for file in find_files(
@@ -54,27 +75,19 @@ def find_core_files():
         if file.is_file()
         and file.suffix in (".c", ".cpp", ".h", ".hpp")
         and not GIT_ROOT / "tests/host/bin" in file.parents
-        and not "ArduinoCatch" in file.name
-        and not "catch.hpp" in file.name
+        and not GIT_ROOT / "tests/host/common/catch.hpp" == file
     ]
 
 
-# include *every* .ino file, excluding submodules
 def find_arduino_files():
-    all_libraries = [path for path in GIT_ROOT.glob("libraries/*") if path.is_dir()]
-    submodules = [
-        path.parent for path in GIT_ROOT.glob("libraries/*/.git") if path.is_file()
+    """Returns every .ino file available in the repository, excluding submodule ones"""
+    return [
+        ino
+        for library in find_files(("libraries/*",))
+        if library.is_dir() and not (library / ".git").exists()
+        for ino in library.rglob("**/*.ino")
     ]
 
-    libraries = [library for library in all_libraries if not library in submodules]
-
-    files = []
-    for library in libraries:
-        for ino in library.rglob("**/*.ino"):
-            files.append(ino)
-
-    return files
-
 
 FILES_PRESETS = {
     "core": find_core_files,
@@ -89,52 +102,51 @@ class Changed:
     lines: list[int]
 
 
-@dataclass
 class Context:
-    append_hunk: bool = False
-    deleted: bool = False
-    file: str = ""
-    hunk: list[str] = dataclass_field(default_factory=list)
-    markers: list[str] = dataclass_field(default_factory=list)
+    def __init__(self):
+        self.append_hunk = False
+        self.deleted = False
+        self.file = ""
+        self.hunk = []
+        self.markers = []
+
+    def reset(self):
+        self.__init__()
+
+    def reset_with_line(self, line):
+        self.reset()
+        self.hunk.append(line)
+
+    def pop(self, out, line):
+        if self.file and self.hunk and self.markers:
+            out.append(
+                Changed(file=self.file, hunk="\n".join(self.hunk), lines=self.markers)
+            )
+
+        self.reset_with_line(line)
 
 
-# naive git-diff parser for clang-format aftercare
-# ref. https://github.com/cpp-linter/cpp-linter/blob/main/cpp_linter/git/__init__.py ::parse_diff
-# ref. https://github.com/libgit2/pygit2/blob/master/src/diff.c ::parse_diff
-# TODO: pygit2?
 def changed_files():
+    """
+    Naive git-diff output parser. Generates list[Changed] for every file changed after clang-format.
+    """
     proc = subprocess.run(
         ["git", "--no-pager", "diff"],
         capture_output=True,
         check=True,
         universal_newlines=True,
     )
 
-    def reset_context(ctx):
-        other = Context()
-        for field in fields(other):
-            setattr(ctx, field.name, getattr(other, field.name))
-
-    def reset_with_line(ctx, line):
-        reset_context(ctx)
-        if line:
-            ctx.hunk = [line]
-
-    def pop(out, context, line):
-        if ctx.file and ctx.hunk and ctx.markers:
-            out.append(
-                Changed(file=ctx.file, hunk="\n".join(ctx.hunk), lines=ctx.markers)
-            )
-
-        reset_with_line(context, line)
-
-    out = []
     ctx = Context()
+    out = []
 
+    # TODO: pygit2?
+    # ref. https://github.com/cpp-linter/cpp-linter/blob/main/cpp_linter/git/__init__.py ::parse_diff
+    # ref. https://github.com/libgit2/pygit2/blob/master/src/diff.c ::parse_diff
     for line in proc.stdout.split("\n"):
         # '--- a/path/to/changed/file' most likely
         if line.startswith("---"):
-            pop(out, ctx, line)
+            ctx.pop(out, line)
 
         # '+++ b/path/to/changed/file' most likely
         # '+++ /dev/null' aka removed file
@@ -145,8 +157,6 @@ def pop(out, context, line):
             deleted = "/dev/null" in file
             if not deleted:
                 ctx.file = file[2:]
-            else:
-                ctx.file = file
 
         # @@ from-file-line-numbers to-file-line-numbers @@
         elif not ctx.deleted and line.startswith("@@"):
@@ -166,7 +176,7 @@ def pop(out, context, line):
         elif ctx.append_hunk and line.startswith(("+", "-", " ")):
             ctx.hunk.append(line)
 
-    pop(out, ctx, line)
+    ctx.pop(out, line)
 
     return out
 
@@ -223,8 +233,9 @@ def run_assert(args):
         if args.with_summary:
             summary_diff(changed)
 
-    if not args.with_summary:
+    if args.with_diff:
         stdout_diff()
+
     assert_unchanged()
 
 
@@ -249,8 +260,9 @@ def run_assert(args):
 
     assert_ = cmd.add_parser("assert")
     assert_.set_defaults(func=run_assert)
-    assert_.add_argument("--with-summary", action="store_true")
+    assert_.add_argument("--with-diff", action="store_true")
     assert_.add_argument("--with-errors", action="store_true")
+    assert_.add_argument("--with-summary", action="store_true")
 
     args = parser.parse_args()
     args.func(args)