Changeset 187

Timestamp:

09/19/2006 12:37:06 AM (2 years ago)

Author:

moo

Message:

handle one line struct {}, multiline comments, whitespaces when parsing header for structs

Files:

• trunk/mkstructinfo.awk (modified) (6 diffs)

trunk/mkstructinfo.awk

@@ -3 +3 @@
 BEGIN {
     brace = 0;
+    incomment = 0;
     buffer_len = 0;
 }
+
+# multiline comment handling
+{
+    # removes one line comment
+    gsub(/\/\*(.+?)\*\//, " ");
+}
+/\*\// {
+    if (incomment) {
+        sub(/.*\*\//, "");
+        incomment = 0;
+    }
+}
+incomment {
+    next;
+}
+/\/\*/ {
+    sub(/\/\*.*/, "");
+    incomment = 1;
+    # fall through
+}
+
+# skip file/line mark here to be faster
 /^#/ {
     next;
 }
+
 /^}.*;/ {
     if (instruct) {
@@ -54 +78 @@
 {
     if (brace == 1 && instruct) {
-        gsub(/\/\*(.+?)\*\//, " "); # removes one line comment
+        gsub(/(^[\t ]+|[\t ]+$)/, ""); # trim whitespaces
         sub(/.*[{}]/, "");
         gsub(/\[[^\]]+\]/, ""); # ignore [...]
@@ -67 +91 @@
         }
         else {
+            # process normal variables
+
             # ignore any ()s
             while (gsub(/(\([^)]*\))/, "")) {
@@ -83 +109 @@
                 next;
             }
+            # print "=DEBUG=" $0 "==";
             split($0, chunks, ";");
             # [unsigned int a, b, c]
@@ -102 +129 @@
                 }
                 if (last_piece == "") {
-                    print "=====" chunks[i];
+                    # print "=ERROR=" chunks[i] "==";
+                    delete chunks[i];
+                    continue;
                 }
                 # a
@@ -123 +152 @@
     next;
 }
-/^typedef struct .*\{/ {
+/^typedef struct .*\{[^}]*$/ {
     brace = 1;
     instruct = 1;