Changeset 500 for trunk

Timestamp:

01/04/2008 02:42:36 PM (9 months ago)

Author:

moo

Message:

don't catch compiler error, just warnings

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• processor/processor.m4 (modified) (1 diff)
• utils.c (modified) (3 diffs)
• xcache.c (modified) (1 diff)
• xcache.h (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
 ChangeLog
 ========
- * compiler errors: all compiler warning (e.g.: E_STRICT) is now cached and is supported for user handler
+ * compiler errors: all compiler warning (E_STRICT only currently) is now cached and is supported for user handler
  * added module dependency
  * live with wrong system time: allow caching files with mtime in further

trunk/processor/processor.m4

@@ -746 +746 @@
 #ifdef E_STRICT
 DEF_STRUCT_P_FUNC(`xc_compilererror_t', , `dnl {{{
-    DISPATCH(int, type)
     DISPATCH(uint, lineno)
     DISPATCH(int, error_len)

trunk/utils.c

@@ -526 +526 @@
     sandbox = (xc_sandbox_t *) XG(sandbox);
     assert(sandbox != NULL);
+    if (type != E_STRICT) {
+        /* give up, and user handler is not supported in this case */
+        int i;
+        zend_uint orig_lineno = CG(zend_lineno);
+        zend_error_cb = sandbox->orig_zend_error_cb;
+
+        for (i = 0; i < sandbox->compilererror_cnt; i ++) {
+            compilererror = &sandbox->compilererrors[i];
+            CG(zend_lineno) = compilererror->lineno;
+            zend_error(E_STRICT, "%s", compilererror->error);
+        }
+        CG(zend_lineno) = orig_lineno;
+        sandbox->compilererror_cnt = 0;
+
+        sandbox->orig_zend_error_cb(type, error_filename, error_lineno, format, args);
+        return;
+    }
+
     if (sandbox->compilererror_cnt <= sandbox->compilererror_size) {
         if (sandbox->compilererror_size) {
@@ -537 +555 @@
     }
     compilererror = &sandbox->compilererrors[sandbox->compilererror_cnt++];
-    compilererror->type   = type;
     compilererror->lineno = error_lineno;
     compilererror->error_len = zend_vspprintf(&compilererror->error, 0, format, args);
@@ -721 +738 @@
         xc_compilererror_t *error = &sandbox->compilererrors[i];
         CG(zend_lineno) = error->lineno;
-        zend_error(error->type, "%s", error->error);
+        zend_error(E_STRICT, "%s", error->error);
     }
     CG(zend_lineno) = 0;

trunk/xcache.c

@@ -670 +670 @@
         xc_compilererror_t *error = &p->compilererrors[i];
         CG(zend_lineno) = error->lineno;
-        zend_error(error->type, "%s", error->error);
+        zend_error(E_STRICT, "%s", error->error);
     }
     CG(zend_lineno) = 0;

trunk/xcache.h

@@ -268 +268 @@
 /* {{{ xc_compilererror_t */
 typedef struct {
-    int type;
     uint lineno;
     int error_len;