diff --git a/share/analysis-scripts/build.py b/share/analysis-scripts/build.py index c70b53e0414ed1ed6c8e1d8e12d078d0deaf8803..79ad1427d1043bf34b6be05f70814abee6bfe41e 100755 --- a/share/analysis-scripts/build.py +++ b/share/analysis-scripts/build.py @@ -38,11 +38,8 @@ from pathlib import Path import function_finder -MIN_PYTHON = (3, 6) # for glob(recursive) and automatic Path conversions -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - script_dir = os.path.dirname(sys.argv[0]) + # Command-line parsing ######################################################## parser = argparse.ArgumentParser(description="""Produces a GNUmakefile @@ -201,7 +198,6 @@ def find_definitions(funcname, filename): file_lines = file_content.splitlines(keepends=True) newlines = function_finder.compute_newline_offsets(file_lines) defs = function_finder.find_definitions_and_declarations(True, False, filename, file_content, file_lines, newlines, funcname) - #print(f"found defs for {funcname}: {defs}") res = [] for d in defs: defining_line = file_lines[d[2]-1] diff --git a/share/analysis-scripts/build_callgraph.py b/share/analysis-scripts/build_callgraph.py index bfac7c709596c4273a30e712cbdbd43b07453558..792579d212131d13a40ff701887e4a9d33a0499f 100755 --- a/share/analysis-scripts/build_callgraph.py +++ b/share/analysis-scripts/build_callgraph.py @@ -30,10 +30,6 @@ import os import re import function_finder -MIN_PYTHON = (3, 5) -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - arg = "" if len(sys.argv) < 2: print(f"usage: {sys.argv[0]} file...") @@ -78,10 +74,8 @@ class Callgraph: return f"Callgraph({self.succs}, {self.edges})" def compute(files): - #print(f"Computing callgraph for {len(files)} file(s)...") cg = Callgraph() for f in files: - #print(f"Processing {os.path.relpath(f)}...") with open(f, encoding="ascii", errors='ignore') as data: file_content = data.read() file_lines = file_content.splitlines(keepends=True) @@ -96,7 +90,6 @@ def compute(files): if debug: print(f"build_callgraph: {f}:{line}: {caller} -> {called}") cg.add_edge(caller, called, loc) - #print(f"Callgraph computed ({len(cg.succs)} node(s), {len(cg.edges)} edge(s))") return cg def print_edge(cg, caller, called, padding="", end="\n"): diff --git a/share/analysis-scripts/detect_recursion.py b/share/analysis-scripts/detect_recursion.py index 332d80f3b8ca50eb555c5100b68d96dc7c880e4f..c5da73ad2f3712259a6b8cde93193997ee9a45f9 100755 --- a/share/analysis-scripts/detect_recursion.py +++ b/share/analysis-scripts/detect_recursion.py @@ -28,10 +28,6 @@ import sys import build_callgraph -MIN_PYTHON = (3, 5) # for glob(recursive) -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - arg = "" if len(sys.argv) < 2: print(f"usage: {sys.argv[0]} [file1 file2 ...]") diff --git a/share/analysis-scripts/estimate_difficulty.py b/share/analysis-scripts/estimate_difficulty.py index dab975aabac5e7bf03d0de6a7f20bb4adac0a367..0f37fb1de1171e2d8b07f5027aa741b40fe03316 100755 --- a/share/analysis-scripts/estimate_difficulty.py +++ b/share/analysis-scripts/estimate_difficulty.py @@ -41,10 +41,6 @@ import tempfile #TODO : try to check the presence of compiler builtins #TODO : try to check for pragmas -MIN_PYTHON = (3, 5) -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - parser = argparse.ArgumentParser(description=""" Estimates the difficulty of analyzing a given code base""") parser.add_argument("--header-dirs", "-d", metavar='DIR', nargs='+', diff --git a/share/analysis-scripts/find_fun.py b/share/analysis-scripts/find_fun.py index b14e429fba77ebf14b0e952f5826b0ffa71a6a10..2c01d43a3bab28ed13706c0bd010d0b25670b3cb 100755 --- a/share/analysis-scripts/find_fun.py +++ b/share/analysis-scripts/find_fun.py @@ -32,10 +32,6 @@ import re import sys from pathlib import Path -MIN_PYTHON = (3, 5) # for glob(recursive) -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - parser = argparse.ArgumentParser(description=""" Looks for likely declarations/definitions of a function in files with extensions '.c', '.h' and '.i'. diff --git a/share/analysis-scripts/heuristic_list_functions.py b/share/analysis-scripts/heuristic_list_functions.py index 0dc5a867025afcb18b0991fdc9f3c521a8f8224d..93c2d5c82f5c6cd5b45d5c3fcae6bf2f42579cb4 100755 --- a/share/analysis-scripts/heuristic_list_functions.py +++ b/share/analysis-scripts/heuristic_list_functions.py @@ -30,10 +30,6 @@ import os import re import function_finder -MIN_PYTHON = (3, 5) # for glob(recursive) -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - debug = bool(os.getenv("DEBUG", False)) arg = "" diff --git a/share/analysis-scripts/list_files.py b/share/analysis-scripts/list_files.py index ac822030be89c50fcde456d387e91d6708cc50f7..e39ae6cb6d2940e8fd7a8d54f9c4ca29a477a697 100755 --- a/share/analysis-scripts/list_files.py +++ b/share/analysis-scripts/list_files.py @@ -33,10 +33,6 @@ import json import re from pathlib import Path -MIN_PYTHON = (3, 6) # for glob(recursive) and automatic Path conversions -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - if len(sys.argv) < 2: # no argument, assume default name arg = Path("compile_commands.json") diff --git a/share/analysis-scripts/make_template.py b/share/analysis-scripts/make_template.py index 6e47b60c60993be74bbc2d40a32e9cd45150f880..dad3225eeced1547e9ea2e295987b5b445a2d650 100755 --- a/share/analysis-scripts/make_template.py +++ b/share/analysis-scripts/make_template.py @@ -36,10 +36,6 @@ from subprocess import Popen, PIPE from pathlib import Path import function_finder -MIN_PYTHON = (3, 6) # for glob(recursive) and automatic Path conversions -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - if len(sys.argv) > 2: print(f"usage: {sys.argv[0]} [dir]") print(" creates a Frama-C makefile in [dir] (default: .frama-c)") diff --git a/share/analysis-scripts/make_wrapper.py b/share/analysis-scripts/make_wrapper.py index 7f9f5b9b517b3be2e1eacdc325dad720ee5eed69..56fb52e0f8c1ce4b1f6937dfc15d6ff9f04f6601 100755 --- a/share/analysis-scripts/make_wrapper.py +++ b/share/analysis-scripts/make_wrapper.py @@ -34,10 +34,6 @@ import sys from functools import partial import tempfile -MIN_PYTHON = (3, 6) # for automatic Path conversions -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - # Check if GNU make is available and has the minimal required version # (4.0). Otherwise, this script will fail. # We first test with 'gmake', then 'make', then fail. diff --git a/share/analysis-scripts/normalize_jcdb.py b/share/analysis-scripts/normalize_jcdb.py index 041baef52d449f8fb0e73d0c39a542ecf481f4c2..70cff41349cc48c7f2d218aea4a42bdee2a5b152 100755 --- a/share/analysis-scripts/normalize_jcdb.py +++ b/share/analysis-scripts/normalize_jcdb.py @@ -32,10 +32,6 @@ import json import re from pathlib import Path -MIN_PYTHON = (3, 6) # for automatic Path conversions -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - if len(sys.argv) < 2: # no argument, assume default name arg = Path("compile_commands.json") diff --git a/share/analysis-scripts/print_callgraph.py b/share/analysis-scripts/print_callgraph.py index 9c5451669dc0955757608d50db117bb2249b7923..54822dd238817f2840a48fb5a3dd82cb69134890 100755 --- a/share/analysis-scripts/print_callgraph.py +++ b/share/analysis-scripts/print_callgraph.py @@ -28,10 +28,6 @@ import sys import build_callgraph -MIN_PYTHON = (3, 5) # for glob(recursive) -if sys.version_info < MIN_PYTHON: - sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON) - dotfile = None args = sys.argv[1:] if "--dot" in args: