Changeset 237

Timestamp:

10/11/2006 05:49:59 AM (7 years ago)

Author:

moo

Message:

trunk->1.0: merged [169] [187], fix the parsing of c headers to build on some rare header

Files:

• branches/1.0/mkstructinfo.awk (modified) (6 diffs)

branches/1.0/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) {
@@ -51 +78 @@
 {
     if (brace == 1 && instruct) {
+        gsub(/(^[\t ]+|[\t ]+$)/, ""); # trim whitespaces
         sub(/.*[{}]/, "");
         gsub(/\[[^\]]+\]/, ""); # ignore [...]
@@ -63 +91 @@
         }
         else {
+            # process normal variables
+
             # ignore any ()s
             while (gsub(/(\([^)]*\))/, "")) {
@@ -69 +99 @@
                 next;
             }
+            # unsigned int *a,  b; int c;
             gsub(/[*]/, " ");
+            # unsigned int a,  b; int c;
             gsub(/ +/, " ");
+            # unsigned int a, b; int c;
             gsub(/ *[,;]/, ";");
+            # unsigned int a; b; int c;
             if (!match($0, /;/)) {
                 next;
             }
+            # print "=DEBUG=" $0 "==";
             split($0, chunks, ";");
-            # get var of "int *var, var;" etc
-            for (i in chunks) {
+            # [unsigned int a, b, c]
+
+            for (i = 1; i in chunks; i ++) {
                 if (chunks[i] == "") {
                     delete chunks[i];
@@ -83 +119 @@
                 }
                 split(chunks[i], pieces, " ");
+                # [unsigned, int, a]
+                # [b]
+                # [c]
 
-                for (j in pieces) {
+                last_piece = "";
+                for (j = 1; j in pieces; j ++) {
                     last_piece = pieces[j];
-                    delete pieces[i];
+                    delete pieces[j];
                 }
                 if (last_piece == "") {
-                    print "=====" chunks[i];
+                    # print "=ERROR=" chunks[i] "==";
+                    delete chunks[i];
+                    continue;
                 }
+                # a
+                # b
+                # c
+
                 buffer[buffer_len] = last_piece;
                 buffer_len ++;
-                delete chunks[i];
+                delete chunks[i]
             }
+            last_piece = "";
         }
         next;
@@ -105 +152 @@
     next;
 }
-/^typedef struct .*\{/ {
+/^typedef struct .*\{[^}]*$/ {
     brace = 1;
     instruct = 1;