Changeset 648

Timestamp:

2009-07-10T06:02:07+02:00 (4 years ago)

Author:

moo

Message:

also cache/reproduce E_DEPRECATED

Location:

trunk

Files:

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

trunk/processor/processor.m4

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

trunk/utils.c

@@ -539 +539 @@
     sandbox = (xc_sandbox_t *) XG(sandbox);
     assert(sandbox != NULL);
-    if (type != E_STRICT) {
+    switch (type) {
+    case E_STRICT:
+#ifdef E_DEPRECATED
+    case E_DEPRECATED:
+#endif
+        if (sandbox->compilererror_cnt <= sandbox->compilererror_size) {
+            if (sandbox->compilererror_size) {
+                sandbox->compilererror_size += 16;
+                sandbox->compilererrors = erealloc(sandbox->compilererrors, sandbox->compilererror_size * sizeof(sandbox->compilererrors));
+            }
+            else {
+                sandbox->compilererror_size = 16;
+                sandbox->compilererrors = emalloc(sandbox->compilererror_size * sizeof(sandbox->compilererrors));
+            }
+        }
+        compilererror = &sandbox->compilererrors[sandbox->compilererror_cnt++];
+        compilererror->type = type;
+        compilererror->lineno = error_lineno;
+        compilererror->error_len = vspprintf(&compilererror->error, 0, format, args);
+        break;
+
+    default: {
         /* give up, and user handler is not supported in this case */
         zend_uint i;
@@ -548 +569 @@
             compilererror = &sandbox->compilererrors[i];
             CG(zend_lineno) = compilererror->lineno;
-            zend_error(E_STRICT, "%s", compilererror->error);
+            zend_error(type, "%s", compilererror->error);
         }
         CG(zend_lineno) = orig_lineno;
@@ -554 +575 @@
 
         sandbox->orig_zend_error_cb(type, error_filename, error_lineno, format, args);
-        return;
-    }
-
-    if (sandbox->compilererror_cnt <= sandbox->compilererror_size) {
-        if (sandbox->compilererror_size) {
-            sandbox->compilererror_size += 16;
-            sandbox->compilererrors = erealloc(sandbox->compilererrors, sandbox->compilererror_size * sizeof(sandbox->compilererrors));
-        }
-        else {
-            sandbox->compilererror_size = 16;
-            sandbox->compilererrors = emalloc(sandbox->compilererror_size * sizeof(sandbox->compilererrors));
-        }
-    }
-    compilererror = &sandbox->compilererrors[sandbox->compilererror_cnt++];
-    compilererror->lineno = error_lineno;
-    compilererror->error_len = vspprintf(&compilererror->error, 0, format, args);
+        break;
+    }
+    }
 }
 /* }}} */
@@ -817 +825 @@
         xc_compilererror_t *error = &sandbox->compilererrors[i];
         CG(zend_lineno) = error->lineno;
-        zend_error(E_STRICT, "%s", error->error);
+        zend_error(error->type, "%s", error->error);
     }
     CG(zend_lineno) = 0;

trunk/xcache.c

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

trunk/xcache.h

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