filter // comments

Author: david-vanderson

src/textdiff/addHeaders.zig

@@ -109,7 +109,7 @@ pub fn main() !void {
             defer file.close();
             var contents = try file.reader().readAllAlloc(arena, 100 * 1024 * 1024);
 
-            // filter out comments
+            // filter out comments (both /**/ and // styles)
             var i: usize = 0;
             var k: usize = 0;
             var in_comment = false;
@@ -126,6 +126,14 @@ pub fn main() !void {
                         i += 2;
                         continue;
                     }
+
+                    if (!in_comment and std.mem.eql(u8, contents[i..][0..2], "//")) {
+                        // skip until we get to a newline
+                        while (contents[i] != '\n') {
+                            i += 1;
+                        }
+                        continue;
+                    }
                 }
 
                 if (!in_comment) {

src/textdiff/outputHeaders.zig

@@ -134,7 +134,7 @@ pub fn main() !void {
                             break;
                         } else {
                             const vline = versionstack.pop();
-                            try outwriter.print("#endif /*{s}*/\n", .{vline});
+                            try outwriter.print("#endif /*_ZIG_UH_|{s}*/\n", .{vline});
                         }
                     }
 
@@ -158,7 +158,7 @@ pub fn main() !void {
                             first_v = false;
                             try outwriter.print("defined {s}", .{version});
                         }
-                        try outwriter.print(" OR _ZIG_UH_TEST\n", .{});
+                        try outwriter.print(" OR _ZIG_UH_\n", .{});
 
                         try versionstack.append(versionline);
 
@@ -173,7 +173,7 @@ pub fn main() !void {
 
             while (versionstack.items.len > 0) {
                 const versionline = versionstack.pop();
-                try outwriter.print("#endif /*{s}*/\n", .{versionline});
+                try outwriter.print("#endif /*_ZIG_UH_|{s}*/\n", .{versionline});
             }
         }
     }

src/textdiff/testHeaders.zig

@@ -92,7 +92,7 @@ pub fn main() !void {
                 if (debug) std.debug.print("trimmed {s}\n", .{trimmed});
                 if (std.mem.startsWith(u8, trimmed, "if")) {
                     if (debug) std.debug.print("- if\n", .{});
-                    if (std.mem.indexOf(u8, trimmed, "_ZIG_UH_TEST") != null) {
+                    if (std.mem.indexOf(u8, trimmed, "_ZIG_UH_") != null) {
                         if (std.mem.indexOf(u8, trimmed, versionStr) != null) {
                             try outputing.append(3);
                         } else {