diff options
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/lint-src | 14 | ||||
| -rw-r--r-- | build-aux/measurestack/app_plugins.py | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/build-aux/lint-src b/build-aux/lint-src index 033340d..69b594a 100755 --- a/build-aux/lint-src +++ b/build-aux/lint-src @@ -13,7 +13,7 @@ err() { } get-dscname() { - if [[ $1 == */Documentation/* ]] && [[ "$(sed 1q -- "$1")" == 'NAME' ]]; then + if [[ $1 == */Documentation/* && "$(sed 1q -- "$1")" == 'NAME' ]]; then sed -n ' 2{ s,[/.],_,g; @@ -90,7 +90,7 @@ get-dscname() { # File body ############################################################ - if grep -n --color=auto "$(printf '\\S\t')" "$filename"; then + if grep -n --color=auto $'\\S\t' "$filename"; then err "$filename" 'uses tabs for alignment' fi done @@ -112,6 +112,16 @@ get-dscname() { grep -Fxq "#endif /* ${guard} */" "$filename"; }; then err "$filename" "does not have ${guard} guard" fi + if [[ $filename != libmisc/include/libmisc/obj.h ]] && + grep -Fn --color=auto -e LO_IMPLEMENTATION_C -e LO_IMPLEMENTATION_STATIC "$filename"; then + err "$filename" "contains LO_IMPLEMENTATION_C and/or LO_IMPLEMENTATION_STATIC" + fi + fi + if [[ $filename == *.c ]]; then + if [[ $filename != libmisc/tests/test_obj.c ]] && + grep -Fn --color=auto L_IMPLEMENTATION_H "$filename"; then + err "$filename" "contains LO_IMPLEMENTATION_H" + fi fi done ;; diff --git a/build-aux/measurestack/app_plugins.py b/build-aux/measurestack/app_plugins.py index 6fc81ec..c5407be 100644 --- a/build-aux/measurestack/app_plugins.py +++ b/build-aux/measurestack/app_plugins.py @@ -60,7 +60,10 @@ class LibMiscPlugin: re_lo_iface = re.compile(r"^\s*#\s*define\s+(?P<name>\S+)_LO_IFACE") re_lo_func = re.compile(r"LO_FUNC *\([^,]*, *(?P<name>[^,) ]+) *[,)]") re_lo_implementation = re.compile( - r"^LO_IMPLEMENTATION_[HC]\s*\(\s*(?P<iface>[^, ]+)\s*,\s*(?P<impl_typ>[^,]+)\s*,\s*(?P<impl_name>[^, ]+)\s*[,)].*" + r"^LO_IMPLEMENTATION_(?P<vis>H|C|STATIC)\s*\(" + r"\s*(?P<iface>[^, ]+)\s*," + r"\s*(?P<impl_typ>[^,]+)\s*," + r"\s*(?P<impl_name>[^, ]+)\s\)" ) re_call_objcall = re.compile(r"LO_CALL\((?P<obj>[^,]+), (?P<meth>[^,)]+)[,)].*") |