Changeset 500 for trunk/utils.c

Timestamp:

2008-01-04T15:42:36+01:00 (5 years ago)

Author:

moo

Message:

don't catch compiler error, just warnings

File:

• trunk/utils.c (modified) (3 diffs)

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;