Skip to content

Commit

Permalink
stylecheck: Add uncrastify exception for STATS
Browse files Browse the repository at this point in the history
Uncrustify removes leading spaces from STATS.
This simple awk scrip if executed after uncrustify
inserts spaces when expected

Signed-off-by: Jerzy Kasenberg <[email protected]>
  • Loading branch information
kasjer committed Jun 17, 2024
1 parent 884ed2e commit 13f2462
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/check_style.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def check_file(fname: str, commit: str, upstream: str) -> list[str]:
in_chunk = False

for s in run_cmd(f"uncrustify -q -c uncrustify.cfg -f {tmpf.name} | "
f"awk -f uncrustify.awk | "
f"diff -u0 -p {tmpf.name} - || true"):
m = re.match(r"^@@ -(\d+)(?:,(\d+))? \+\d+(?:,\d+)? @@", s)
if not m:
Expand Down
37 changes: 37 additions & 0 deletions uncrustify.awk
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

# awk script run AFTER uncrustify reformats code to format
# STATS_NAME and STATS_SECT block to have indents removed
# by uncrustify

# detect begining of STATS_NAME section
/^(static )?STATS_NAME_START[(]/ { stats_name = 1 }
# detect end of STATN_NAME section
/^STATS_NAME_END/ { stats_name = 0 }
# for each line in sectin add 4 spaces eaten by uncrustify
/^STATS_NAME[(]/ && stats_name == 1 { printf " " }

# detect begining of STATS_SECT section
/^STATS_SECT_START[(]/ { stats_sect = 1 }
# detect end of STATN_SECT section
/^STATS_SECT_END/ { stats_sect = 0 }
# for each line in sectin add 4 spaces eaten by uncrustify
/^STATS_SECT_ENTRY[(]/ && stats_sect == 1 { printf " " }
{ print }

0 comments on commit 13f2462

Please sign in to comment.