Changeset 726 for branches/1.3/processor/struct.m4

Timestamp:

2011-04-09T14:59:31+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• processor/struct.m4 (modified) (5 diffs)

branches/1.3/processor/struct.m4

@@ -30 +30 @@
     {
         pushdef(`ELEMENTS_DONE')
-        ifdef(`SIZEOF_$1', , `m4_errprint(`AUTOCHECK WARN: $1: missing structinfo, dont panic')define(`SIZEOF_$1', 0)')
         IFASSERT(`
             /* {{{ init assert */
-            ifdef(`SIZEOF_$1', , `m4_errprint(`missing SIZEOF_$1, safe to ignore')define(`SIZEOF_$1', 0)')
-            ifdef(`COUNTOF_$1', , `m4_errprint(`missing COUNTOF_$1, safe to ignore')define(`COUNTOF_$1', 0)')
+            ifdef(`SIZEOF_$1', , `m4_errprint(`missing SIZEOF_$1, safe to ignore')')
+            ifdef(`COUNTOF_$1', , `m4_errprint(`missing COUNTOF_$1, safe to ignore'))')
             dnl SIZEOF_x COUNTOF_x can be both defined or both not
             ifdef(`SIZEOF_$1', `
@@ -48 +47 @@
             int assert_size = SIZEOF_$1, assert_count = COUNTOF_$1;
             int done_size = 0, done_count = 0;
+            const char *assert_names[] = { ifdef(`ELEMENTSOF_$1', `ELEMENTSOF_$1') };
+            HashTable done_names;
+            zend_hash_init(&done_names, 0, NULL, NULL, 0);
             /* }}} */
             IFRESTORE(`assert(xc_is_shm(src));')
@@ -53 +55 @@
             do {
         ')
+        ifdef(`SIZEOF_$1', , `m4_errprint(`AUTOCHECK WARN: $1: missing structinfo, dont panic')')
 
         ifdef(`USEMEMCPY', `IFCOPY(`
@@ -68 +71 @@
             INDENT()fprintf(stderr, "}\n");
         ')
-        ifdef(`SKIPASSERT_ONCE', `undefine(`SKIPASSERT_ONCE')', `
+        ifdef(`SKIPASSERT_ONCE', `
+            undefine(`SKIPASSERT_ONCE')
             IFASSERT(`
-                /* {{{ check assert */
+                zend_hash_destroy(&done_names);
+            ')
+        ', `
+            IFASSERT(`
+            /* {{{ check assert */ do {
+                int name_check_errors = xc_check_names(__FILE__, __LINE__, "FUNC_NAME", assert_names, sizeof(assert_names) / sizeof(assert_names[0]), &done_names);
+                zend_hash_destroy(&done_names);
+
                 if (done_count != assert_count) {
                     fprintf(stderr
@@ -85 +96 @@
                         );
                 }
-                if (done_count != assert_count || done_size != assert_size) {
+                if (name_check_errors || done_count != assert_count || done_size != assert_size) {
                     assert(0);
                 }
-                /* }}} */
+            } while (0); /* }}} */
             ')
             ifdef(`ELEMENTSOF_$1', `