Merge branch 'master' into parsing

Author: sipma

.github/workflows/run_mypy.yaml

@@ -5,7 +5,7 @@ on: [pull_request, push]
 jobs:
   run_mypy:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v1

.github/workflows/run_pycodestyle.yaml

@@ -5,7 +5,7 @@ on: [pull_request, push]
 jobs:
   run_pycodestyle:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v1

.gitignore

@@ -6,6 +6,10 @@ semantics
 # CodeHawk-C local configuration file
 ConfigLocal.py
 
+# Ocaml binaries
+chc/bin/*/canalyzer
+chc/bin/*/parseFile
+
 # Emacs
 *.py~
 *.rst~

chc/app/CApplication.py

@@ -6,7 +6,7 @@
 #
 # Copyright (c) 2017-2020 Kestrel Technology LLC
 # Copyright (c) 2020-2022 Henny B. Sipma
-# Copyright (c) 2023-2024 Aarno Labs LLC
+# Copyright (c) 2023-2025 Aarno Labs LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

chc/cmdline/ParseManager.py

@@ -6,7 +6,7 @@
 #
 # Copyright (c) 2017-2020 Kestrel Technology LLC
 # Copyright (c) 2020-2022 Henny B. Sipma
-# Copyright (c) 2023-2024 Aarno Labs LLC
+# Copyright (c) 2023-2025 Aarno Labs LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -290,15 +290,8 @@ def preprocess_file_with_gcc(
 
     def get_file_length(self, fname: str) -> int:
         """Return the number of lines in named file."""
-
-        with open(fname) as f:
-            try:
-                for i, _l in enumerate(f):
-                    pass
-            except UnicodeDecodeError as e:
-                chklogger.logger.warning("Unable to read %s: %s", fname, str(e))
-                i = -1
-        return i + 1
+        with open(fname, 'rb') as f:
+            return sum(1 for _ in f)
 
     def normalize_filename(self, filename: str) -> str:
         """Make filename relative to project directory (if in project
@@ -460,8 +453,8 @@ def parse_with_ccommands(
                 returncode = subprocess.call(command)
                 print("\n" + ("-" * 80) + "\n\n")
             else:
-                returncopde = (
-                    subprocess.call(command, stdout=open(os.devnull, "w")))
+                returncode = subprocess.call(command, stdout=open(os.devnull, "w"))
+
             if returncode == 1:
                 print("\n" + ("*" * 80))
                 print("Parsing error in " + cfilename)

chc/cmdline/c_project/cprojectutil.py

@@ -250,6 +250,7 @@ def cproject_analyze_project(args: argparse.Namespace) -> NoReturn:
     loglevel: str = args.loglevel
     logfilename: Optional[str] = args.logfilename
     logfilemode: str = args.logfilemode
+    excludefiles: List[str] = args.exclude
 
     if not os.path.isdir(tgtpath):
         print_error(f"Target directory {tgtpath} not found")
@@ -273,7 +274,7 @@ def cproject_analyze_project(args: argparse.Namespace) -> NoReturn:
         exit(1)
 
     capp = CApplication(
-        projectpath, projectname, targetpath, contractpath)
+        projectpath, projectname, targetpath, contractpath, excludefiles=excludefiles)
 
     def save_xrefs(f: "CFile") -> None:
         capp.indexmanager.save_xrefs(
@@ -286,7 +287,7 @@ def save_xrefs(f: "CFile") -> None:
     linker.save_global_compinfos()
 
     capp = CApplication(
-        projectpath, projectname, targetpath, contractpath)
+        projectpath, projectname, targetpath, contractpath, excludefiles=excludefiles)
 
     am = AnalysisManager(capp, verbose=True)
 

chc/cmdline/chkc

@@ -1416,6 +1416,9 @@ def parse() -> argparse.Namespace:
         choices=["a", "w"],
         default="a",
         help="file mode for log file: append (a, default), or write (w)")
+    cprojectanalyze.add_argument("-x", "--exclude", action='append',
+        help="Exclude file from analysis. To exclude multiple files, use "
+             "this option for each file, e.g. -x dir1/f1.c, -x dir2/f2.c")
     cprojectanalyze.set_defaults(func=P.cproject_analyze_project)
 
     # --- report