ccanlint: ignore comments when parsing examples.
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 6 Dec 2010 02:21:40 +0000 (12:51 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 6 Dec 2010 02:21:40 +0000 (12:51 +1030)
We insert comments when we massage or combine examples; don't let these
throw off our analysis (as happened for idtree.h).

tools/ccanlint/tests/examples_compile.c

index 5aeabed38cbb7f8ec59664c0fd4bf0912081e3a9..768e96aea911f2e5f9f3732a3d1b05eeb7911ed0 100644 (file)
@@ -291,6 +291,19 @@ static char **combine(const void *ctx, char **lines, char **prev)
        return ret;
 }
 
+/* Only handles very simple comments. */
+static char *strip_comment(const void *ctx, const char *orig_line)
+{
+       char *p, *ret = talloc_strdup(ctx, orig_line);
+
+       p = strstr(ret, "/*");
+       if (!p)
+               p = strstr(ret, "//");
+       if (p)
+               *p = '\0';
+       return ret;
+}
+
 static char *mangle(struct manifest *m, char **lines)
 {
        char *ret, *use_funcs = NULL, *why;
@@ -334,28 +347,30 @@ static char *mangle(struct manifest *m, char **lines)
 
        /* Primitive, very primitive. */
        for (i = 0; lines[i]; i++) {
+               char *line = strip_comment(ret, lines[i]);
+
                /* } at start of line ends a function. */
                if (in_function) {
-                       if (lines[i][0] == '}')
+                       if (line[0] == '}')
                                in_function = false;
                } else {
                        /* Character at start of line, with ( and no ;
                         * == function start.  Ignore comments. */
-                       if (!isspace(lines[i][0])
-                           && strchr(lines[i], '(')
-                           && !strchr(lines[i], ';')
-                           && !strstr(lines[i], "//")) {
+                       if (!isspace(line[0])
+                           && strchr(line, '(')
+                           && !strchr(line, ';')
+                           && !strstr(line, "//")) {
                                in_function = true;
-                               if (strncmp(lines[i], "int main", 8) == 0)
+                               if (strncmp(line, "int main", 8) == 0)
                                        has_main = true;
-                               if (strncmp(lines[i], "static", 6) == 0) {
+                               if (strncmp(line, "static", 6) == 0) {
                                        use_funcs = add_func(use_funcs,
-                                                            lines[i]);
+                                                            line);
                                }
                        }
                }
                /* ... means elided code. */
-               if (strcmp(lines[i], "...") == 0) {
+               if (strcmp(line, "...") == 0) {
                        if (!in_function && !has_main
                            && looks_internal(lines + i + 1, &why)) {
                                /* This implies we start a function here. */