Changed back to clang-tidy

diff --git a/.clang-format b/.clang-format
new file mode 100644 (file)
index 0000000..ac7dcd1
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1 @@
+SortIncludes: false

diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644 (file)
index 0000000..8808da1
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,30 @@
+---
+Checks: "*,
+        -abseil-*,
+        -llvm*,
+       -google*,
+       -modernize-use-trailing-return-type,
+        -readability-else-after-return,
+        -readability-static-accessed-through-instance,
+        -readability-avoid-const-params-in-decls,
+       -misc-unused-parameters,
+       -bugprone-easily-swappable-parameters,
+       -cert-err33-c,
+       -readability-identifier-length,
+       -altera-unroll-loops,
+  -cppcoreguidelines-avoid-non-const-global-variables,
+  -altera-struct-pack-align,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -readability-magic-numbers,
+  -cert-err34-c,
+  -readability-function-cognitive-complexity,
+  -altera-id-dependent-backward-branch,
+  -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
+  -misc-no-recursion,
+  -concurrency-mt-unsafe,
+  -clang-analyzer-unix.Malloc,
+  -modernize-macro-to-enum
+"
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+FormatStyle:     None

diff --git a/include/ulas.h b/include/ulas.h
index bd4d2181fe36f49139db97b427a924782d079c48..0ef18029a8adc5523b3ef05ea5b531b1862fedcb 100644 (file)
--- a/include/ulas.h
+++ b/include/ulas.h
@@ -312,7 +312,7 @@ void ulas_preprocfree(struct ulas_preproc *pp);
  * returns 0: no error
  *        -1: error
  */
-int ulas_preproc(FILE * dst, FILE * src);
+int ulas_preproc(FILE *dst, FILE *src);
 
 // reads the next line
 // returns 0 if no more data can be read
@@ -320,7 +320,7 @@ int ulas_preproc(FILE * dst, FILE * src);
 //         -1 on error
 // it also places the processed line into pp->line.buf
 // note that this is overwritten by every call!
-int ulas_preprocnext(struct ulas_preproc *pp, FILE * dst, FILE * src, char *buf,
+int ulas_preprocnext(struct ulas_preproc *pp, FILE *dst, FILE *src, char *buf,
                      int n);
 
 // process a line of preproc
@@ -331,7 +331,7 @@ int ulas_preprocnext(struct ulas_preproc *pp, FILE * dst, FILE * src, char *buf,
 //  not be used in the caller after recursvion finishes!
 //  or initialize a new preproc object if the old state is important!
 //  (preprocinit and preprocfree)
-int ulas_preprocline(struct ulas_preproc *pp, FILE * dst, FILE * src,
+int ulas_preprocline(struct ulas_preproc *pp, FILE *dst, FILE *src,
                      const char *raw_line, unsigned long n);
 
 // expand preproc into dst line
@@ -359,8 +359,8 @@ void ulas_tokbuffree(struct ulas_tokbuf *tb);
 // returns 0 if no more data can be read
 //         > 0 if data was read
 //         -1 on error
-int ulas_asmnext(FILE * dst, FILE * src, char *buf, int n);
-int ulas_asm(FILE * dst, FILE * src);
+int ulas_asmnext(FILE *dst, FILE *src, char *buf, int n);
+int ulas_asm(FILE *dst, FILE *src);
 
 // parses and executes a 32 bit signed int math expressions
 int ulas_intexpr(const char **line, unsigned long n, int *rc);

diff --git a/makefile b/makefile
index 1772663e162d348a5ce4a162e4d895b51605acfd..e2755f7fce6f9f66f973ebb3ed76ce2196841db0 100644 (file)
--- a/makefile
+++ b/makefile
@@ -55,13 +55,17 @@ install:
 tags:
        ctags --recurse=yes --exclude=.git --exclude=bin --exclude=obj --extras=*  --fields=*  --c-kinds=* --language-force=C 
 
+.PHONY:
+ccmds:
+       bear -- make SHELL="sh -x -e" --always-make
+
 .PHONY: format
 format:
-       VERSION_CONTROL=none indent -kr -ci2 -cli2 -i2 -l80 -nut -brf -par -cli0 -cbi0 src/*.c $(IDIR)/*.h
+       clang-format -i ./src/*.c ./include/*.h
 
-.PHONY: lint
+.PHONY: lint 
 lint:
-       splint src/*.c -I$(IDIR) -warnposix
+       clang-tidy ./include/*.h ./src/*.c
 
 .PHONY: runtest
 runtest:

diff --git a/src/main.c b/src/main.c
index d07fe3a2c8b5bc6141791e37522eb04d0a0eb80d..bb38dee0bea1b8e388864552c48a0a55b410c867 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,9 +26,7 @@ void ulas_help(void) {
   ULAS_HELP("o=path", "Output file");
 }
 
-void ulas_version(void) {
-  printf("%s version %s\n", ULAS_NAME, ULAS_VER);
-}
+void ulas_version(void) { printf("%s version %s\n", ULAS_NAME, ULAS_VER); }
 
 void ulas_getopt(int argc, char **argv, struct ulas_config *cfg) {
   int c = 0;

diff --git a/src/test.c b/src/test.c
index 19ef051986f19253ac8743dde5d57fcf1a65dcf7..65ec59f95796e774131778b49857407e61ba7aaf 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -50,12 +50,12 @@
 void test_tok(void) {
   TESTBEGIN("tok");
 
-  assert_tok("  test  tokens   with,   line / * + - , ; $1", {
-             "test", "tokens", "with", ",", "line", "/", "*", "+", "-", ",",
-             ";", "$1", NULL});
+  assert_tok("  test  tokens   with,   line / * + - , ; $1",
+             {"test", "tokens", "with", ",", "line", "/", "*", "+", "-", ",",
+              ";", "$1", NULL});
 
-  assert_tokuntil(" this is a, test for tok , until", ',', {
-                  "this is a", "test for tok ", "until", NULL});
+  assert_tokuntil(" this is a, test for tok , until", ',',
+                  {"this is a", "test for tok ", "until", NULL});
 
   TESTEND("tok");
 }
@@ -108,20 +108,22 @@ void test_preproc(void) {
                  "#define test 123\ntest\n#undefine test\ntest");
 
   // macro
-  assert_preproc
-    ("  line p1 1 label01,2 3\n  line p2 2\n  line p3 3 p1, p2, p3\n", 0,
-     "#macro test\n  line $1 1 label$$$$,$$ $$\n  line $2 2\n  line $3 3 "
-     "$0\n#endmacro\ntest p1, p2, p3");
+  assert_preproc(
+      "  line p1 1 label01,2 3\n  line p2 2\n  line p3 3 p1, p2, p3\n", 0,
+      "#macro test\n  line $1 1 label$$$$,$$ $$\n  line $2 2\n  line $3 3 "
+      "$0\n#endmacro\ntest p1, p2, p3");
   assert_preproc("test macro with no args\n", 0,
                  "#macro test\ntest macro with no args\n#endmacro\ntest");
   assert_preproc("", -1, "#macro test\n not terminated\n");
-  assert_preproc("nested macro t1\nafter\ncontent n1\n", 0,
-                 "#macro test\nnested macro $1\n#macro "
-                 "nested\ncontent $1\n#endmacro\nafter\nnested n1\n#endmacro\ntest t1");
+  assert_preproc(
+      "nested macro t1\nafter\ncontent n1\n", 0,
+      "#macro test\nnested macro $1\n#macro "
+      "nested\ncontent $1\n#endmacro\nafter\nnested n1\n#endmacro\ntest t1");
 
   // ifdef
-  assert_preproc("before\nifdeftest defined!\nafter", 0,
-                 "before\n#define test\n#ifdef test\nifdeftest defined!\n#endif\nafter");
+  assert_preproc(
+      "before\nifdeftest defined!\nafter", 0,
+      "before\n#define test\n#ifdef test\nifdeftest defined!\n#endif\nafter");
   assert_preproc("before\nafter", 0,
                  "before\n#ifdef test\nifdeftest defined!\n#endif\nafter");
   assert_preproc("ifdeftest defined!\n", -1,
@@ -130,8 +132,9 @@ void test_preproc(void) {
   // ifndef
   assert_preproc("before\nifndeftest defined!\nafter", 0,
                  "before\n#ifndef test\nifndeftest defined!\n#endif\nafter");
-  assert_preproc("before\nafter", 0,
-                 "before\n#define test\n#ifndef test\nifndeftest defined!\n#endif\nafter");
+  assert_preproc(
+      "before\nafter", 0,
+      "before\n#define test\n#ifndef test\nifndeftest defined!\n#endif\nafter");
   assert_preproc("ifndeftest defined!\n", -1,
                  "#ifndef test\nifndeftest defined!\n");
 

diff --git a/src/ulas.c b/src/ulas.c
index a6a02ead9f6cf46ecc9bec3abbff61914f1c45e8..2031b746faa83255c6ce485e7c5fde989a933fc0 100644 (file)
--- a/src/ulas.c
+++ b/src/ulas.c
@@ -41,9 +41,7 @@ void ulas_free(void) {
   ulas_tokbuffree(&ulas.toks);
 }
 
-int ulas_icntr(void) {
-  return ulas.icntr++;
-}
+int ulas_icntr(void) { return ulas.icntr++; }
 
 struct ulas_config ulas_cfg_from_env(void) {
   struct ulas_config cfg;
@@ -317,9 +315,9 @@ struct ulas_tok ulas_totok(char *buf, unsigned long n, int *rc) {
       // 0b prefix is not supported in strtol... so we implement it by hand
       if (*buf == 'b') {
         buf++;
-        tok.lit.val.intv = (int) strtol(buf, &buf, 2);
+        tok.lit.val.intv = (int)strtol(buf, &buf, 2);
       } else {
-        tok.lit.val.intv = (int) strtol(buf - 1, &buf, 0);
+        tok.lit.val.intv = (int)strtol(buf - 1, &buf, 0);
       }
     } else if (first == '\'') {
       tok.type = ULAS_TOKLITERAL;
@@ -328,7 +326,7 @@ struct ulas_tok ulas_totok(char *buf, unsigned long n, int *rc) {
         buf++;
         tok.lit.val.intv = ulas_unescape(*buf, rc);
       } else {
-        tok.lit.val.intv = (int) *buf;
+        tok.lit.val.intv = (int)*buf;
       }
       buf++;
       if (*buf != '\'') {
@@ -366,7 +364,7 @@ end:
 #undef WLED_TOKISTERM
 
 struct ulas_str ulas_str(unsigned long n) {
-  struct ulas_str str = { malloc(n), n };
+  struct ulas_str str = {malloc(n), n};
   return str;
 }
 
@@ -449,11 +447,11 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
     first_tok = 0;
 
     struct ulas_ppdef *def =
-      ulas_preprocgetdef(pp, pp->tok.buf, pp->tok.maxlen);
+        ulas_preprocgetdef(pp, pp->tok.buf, pp->tok.maxlen);
     if (def) {
       // if so... expand now and leave
       switch (def->type) {
-      case ULAS_PPDEF:{
+      case ULAS_PPDEF: {
         unsigned long val_len = strlen(def->value);
         int wsi = ulas_preproclws(pp, praw_line - read, *n);
         if (val_len) {
@@ -473,7 +471,7 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
         }
         break;
       }
-      case ULAS_PPMACRO:{
+      case ULAS_PPMACRO: {
         // TODO: i am sure we can optimize the resize of line buffers here...
 
         // get 9 comma separated values.
@@ -492,7 +490,7 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
         int paramc = 0;
         while (paramc < ULAS_MACROPARAMMAX &&
                ulas_tokuntil(&pp->macroparam[paramc], ',', &praw_line, *n) >
-               0) {
+                   0) {
           // trim new lines from the end of macro params
           ulas_trimend('\n', pp->macroparam[paramc].buf,
                        strlen(pp->macroparam[paramc].buf));
@@ -501,8 +499,7 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
         ulas_strensr(&pp->line, strlen(def->value) + 2);
 
         const char *macro_argname[ULAS_MACROPARAMMAX] = {
-          "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", "$9"
-        };
+            "$1", "$2", "$3", "$4", "$5", "$6", "$7", "$8", "$9"};
 
         const char *val = def->value;
         unsigned long vallen = strlen(def->value);
@@ -525,11 +522,10 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
             const char *name = macro_argname[mi];
             if (pp->macroparam[mi].buf[0] &&
                 strncmp((name), pp->macrobuf.buf, pp->macrobuf.maxlen) == 0) {
-              ulas_strensr(&pp->line,
-                           strnlen(pp->line.buf,
-                                   pp->line.maxlen) +
-                           strnlen(pp->macroparam[mi].buf,
-                                   pp->macroparam[mi].maxlen) + 1);
+              ulas_strensr(&pp->line, strnlen(pp->line.buf, pp->line.maxlen) +
+                                          strnlen(pp->macroparam[mi].buf,
+                                                  pp->macroparam[mi].maxlen) +
+                                          1);
 
               tocat = pp->macroparam[mi].buf;
               tocatlen = pp->macroparam[mi].maxlen;
@@ -569,7 +565,7 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
             // make sure to include leading white space
             int wsi = ulas_preproclws(pp, val - valread, vallen);
             ulas_strensr(&pp->line, strnlen(pp->line.buf, pp->line.maxlen) +
-                         tocatlen + wsi + 1);
+                                        tocatlen + wsi + 1);
             strncat(pp->line.buf, tocat, tocatlen);
           }
         }
@@ -612,16 +608,14 @@ int ulas_preprocline(struct ulas_preproc *pp, FILE *dst, FILE *src,
   char *line = ulas_preprocexpand(pp, raw_line, &n);
   const char *pline = line;
 
-  const char *dirstrs[] = { ULAS_PPSTR_DEF, ULAS_PPSTR_MACRO,
-    ULAS_PPSTR_IFDEF, ULAS_PPSTR_IFNDEF,
-    ULAS_PPSTR_ENDIF, ULAS_PPSTR_ENDMACRO,
-    ULAS_PPSTR_UNDEF, NULL
-  };
-  enum ulas_ppdirs dirs[] = { ULAS_PPDIR_DEF, ULAS_PPDIR_MACRO,
-    ULAS_PPDIR_IFDEF, ULAS_PPDIR_IFNDEF,
-    ULAS_PPDIR_ENDIF, ULAS_PPDIR_ENDMACRO,
-    ULAS_PPDIR_UNDEF
-  };
+  const char *dirstrs[] = {ULAS_PPSTR_DEF,   ULAS_PPSTR_MACRO,
+                           ULAS_PPSTR_IFDEF, ULAS_PPSTR_IFNDEF,
+                           ULAS_PPSTR_ENDIF, ULAS_PPSTR_ENDMACRO,
+                           ULAS_PPSTR_UNDEF, NULL};
+  enum ulas_ppdirs dirs[] = {ULAS_PPDIR_DEF,   ULAS_PPDIR_MACRO,
+                             ULAS_PPDIR_IFDEF, ULAS_PPDIR_IFNDEF,
+                             ULAS_PPDIR_ENDIF, ULAS_PPDIR_ENDMACRO,
+                             ULAS_PPDIR_UNDEF};
 
   enum ulas_ppdirs found_dir = ULAS_PPDIR_NONE;
 
@@ -646,7 +640,7 @@ found:
   if (found_dir != ULAS_PPDIR_NONE) {
     ulas_trimend('\n', line, strlen(line));
     switch (found_dir) {
-    case ULAS_PPDIR_DEF:{
+    case ULAS_PPDIR_DEF: {
       // next token is a name
       // and then the entire remainder of the line is a value
       if (ulas_tok(&pp->tok, &pline, n) == 0) {
@@ -659,15 +653,14 @@ found:
         return -1;
       }
 
-      struct ulas_ppdef def = { ULAS_PPDEF, strdup(pp->tok.buf), strdup(pline),
-        0
-      };
+      struct ulas_ppdef def = {ULAS_PPDEF, strdup(pp->tok.buf), strdup(pline),
+                               0};
       ulas_preprocdef(pp, def);
       // define short-circuits the rest of the logic
       // because it just takes the entire rest of the line as a value!
       goto dirdone;
     }
-    case ULAS_PPDIR_MACRO:{
+    case ULAS_PPDIR_MACRO: {
       // get a name, ensure no more tokens come after
       // and then consume lines until ENDMACRO is seen
       if (ulas_tok(&pp->tok, &pline, n) == 0) {
@@ -713,7 +706,7 @@ found:
       }
       // we leak the str's buffer into the def now
       // this is ok because we call free for it later anyway
-      struct ulas_ppdef def = { ULAS_PPMACRO, name, val.buf, 0 };
+      struct ulas_ppdef def = {ULAS_PPMACRO, name, val.buf, 0};
       ulas_preprocdef(pp, def);
 
       goto dirdone;
@@ -722,7 +715,7 @@ found:
     case ULAS_PPDIR_ENDMACRO:
       break;
     case ULAS_PPDIR_IFDEF:
-    case ULAS_PPDIR_IFNDEF:{
+    case ULAS_PPDIR_IFNDEF: {
       // get the name
       // get a name, ensure no more tokens come after
       // and then consume lines until ENDMACRO is seen
@@ -731,7 +724,7 @@ found:
         return -1;
       }
       struct ulas_ppdef *def =
-        ulas_preprocgetdef(pp, pp->tok.buf, pp->tok.maxlen);
+          ulas_preprocgetdef(pp, pp->tok.buf, pp->tok.maxlen);
 
       char buf[ULAS_LINEMAX];
       memset(buf, 0, ULAS_LINEMAX);
@@ -758,7 +751,7 @@ found:
       }
       goto dirdone;
     }
-    case ULAS_PPDIR_UNDEF:{
+    case ULAS_PPDIR_UNDEF: {
       if (ulas_tok(&pp->tok, &pline, n) == 0) {
         ULASERR("Expected name for #undef\n");
         return -1;
@@ -801,7 +794,7 @@ int ulas_preprocnext(struct ulas_preproc *pp, FILE *dst, FILE *src, char *buf,
 }
 
 struct ulas_preproc ulas_preprocinit(void) {
-  struct ulas_preproc pp = { NULL, 0, ulas_str(1), ulas_str(1) };
+  struct ulas_preproc pp = {NULL, 0, ulas_str(1), ulas_str(1)};
   for (unsigned long i = 0; i < ULAS_MACROPARAMMAX; i++) {
     pp.macroparam[i] = ulas_str(8);
   }
@@ -912,13 +905,9 @@ void ulas_tokbufpush(struct ulas_tokbuf *tb, struct ulas_tok tok) {
   tb->len++;
 }
 
-void ulas_tokbufclear(struct ulas_tokbuf *tb) {
-  tb->len = 0;
-}
+void ulas_tokbufclear(struct ulas_tokbuf *tb) { tb->len = 0; }
 
-void ulas_tokbuffree(struct ulas_tokbuf *tb) {
-  free(tb->buf);
-}
+void ulas_tokbuffree(struct ulas_tokbuf *tb) { free(tb->buf); }
 
 /**
  * Assembly step
@@ -951,13 +940,11 @@ int ulas_asmline(FILE *dst, FILE *src, const char *line, unsigned long n) {
 
   if (ulas.tok.buf[0] == ULAS_TOK_ASMDIR_BEGIN) {
     const char *dirstrs[] = {
-      ULAS_ASMSTR_ORG, ULAS_ASMSTR_SET, ULAS_ASMSTR_BYTE, ULAS_ASMSTR_STR,
-      ULAS_ASMSTR_FILL, ULAS_ASMSTR_PAD, ULAS_ASMSTR_INCBIN, NULL
-    };
+        ULAS_ASMSTR_ORG,  ULAS_ASMSTR_SET, ULAS_ASMSTR_BYTE,   ULAS_ASMSTR_STR,
+        ULAS_ASMSTR_FILL, ULAS_ASMSTR_PAD, ULAS_ASMSTR_INCBIN, NULL};
     enum ulas_asmdir dirs[] = {
-      ULAS_ASMDIR_ORG, ULAS_ASMDIR_SET, ULAS_ASMDIR_BYTE, ULAS_ASMDIR_STR,
-      ULAS_ASMDIR_FILL, ULAS_ASMDIR_PAD, ULAS_ASMDIR_INCBIN
-    };
+        ULAS_ASMDIR_ORG,  ULAS_ASMDIR_SET, ULAS_ASMDIR_BYTE,  ULAS_ASMDIR_STR,
+        ULAS_ASMDIR_FILL, ULAS_ASMDIR_PAD, ULAS_ASMDIR_INCBIN};
 
     enum ulas_asmdir dir = ULAS_ASMDIR_NONE;