Changeset 837 for trunk/mkstructinfo.awk

Timestamp:

2012-03-25T04:14:44+02:00 (15 months ago)

Author:

moo

Message:

PHP_5_4: improves traits support

File:

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

trunk/mkstructinfo.awk

@@ -5 +5 @@
     incomment = 0;
     buffer_len = 0;
+}
+function printstruct(structname) {
+    printf "define(`ELEMENTSOF_%s', `%s')\n", structname, ELEMENTSOF[structname];
+    printf "define(`COUNTOF_%s', `%s')\n", structname, COUNTOF[structname];
+    printf "define(`SIZEOF_%s', `(  %s  )')\n", structname, SIZEOF[structname];
 }
 
@@ -35 +40 @@
     if (instruct) {
         sub(";", "");
-        if (instruct == 1 && $2) {
-            instruct = $2;
+        structname = instruct;
+        if (structname == 1 && $2) {
+            structname = $2;
         }
-        if (instruct in typedefs) {
-            instruct = typedefs[instruct];
+        if (structname in typedefs) {
+            structname = typedefs[structname];
         }
         sizeinfo = "";
@@ -47 +53 @@
                 sizeinfo = sizeinfo " + ";
             }
-            sizeinfo = sizeinfo "sizeof(((" instruct "*)NULL)->" buffer[i] ")";
+            sizeinfo = sizeinfo "sizeof(((" structname "*)NULL)->" buffer[i] ")";
 
             if (i == 0) {
@@ -56 +62 @@
             }
         }
-        printf "define(`ELEMENTSOF_%s', `%s')\n", instruct, elms;
-        printf "define(`COUNTOF_%s', `%s')\n", instruct, i;
-        printf "define(`SIZEOF_%s', `(  %s  )')\n", instruct, sizeinfo;
+        ELEMENTSOF[structname] = elms;
+        COUNTOF[structname]    = i;
+        SIZEOF[structname]     = sizeinfo;
+        printstruct(structname);
         print "\n";
         for (i in buffer) {
@@ -149 +156 @@
 /^typedef struct [^{]*;/ {
     sub(";", "");
-    typedefs[$3] = $4;
+    typename=$3;
+    newtypename=$4;
+    typedefs[typename] = newtypename;
+    if (ELEMENTSOF[typename]) {
+        ELEMENTSOF[newtypename] = ELEMENTSOF[typename];
+        COUNTOF[newtypename]    = COUNTOF[typename];
+        sub(/.*/, SIZEOF[typename]);
+        gsub(typename, newtypename);
+        SIZEOF[newtypename]     = $0;
+        printstruct(newtypename);
+    }
     next;
 }