Moved _trace to stderr.

[minimal.git] / stdlib.h

diff --git a/stdlib.h b/stdlib.h
index 21fd7d725202175dea95298951b3044b965a7974..8d0f8c9918df4b29b58c6a20e91c9b168123501b 100644 (file)
--- a/stdlib.h
+++ b/stdlib.h
@@ -35,10 +35,29 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef MINIMAL_STDLIB_H
+#define MINIMAL_STDLIB_H
+
+#ifdef __i386__
+#define _breakpoint() \
+    __asm__ ("int $0x03")
+#else
+#define _breakpoint()
+#endif
+
+#ifdef __cplusplus
+#define _assert_(e) \
+    throw e
+#else
+#define _assert_(e) \
+    exit(1)
+#endif
+
 #define _assert(expr) \
     do if (!(expr)) { \
         fprintf(stderr, "%s(%u): _assert(%u:%s)\n", __FILE__, __LINE__, errno, #expr); \
-        exit(1); \
+        _breakpoint(); \
+        _assert_(#expr); \
     } while (false)
 
 #define _syscall(expr) \
@@ -55,19 +74,39 @@
     for (;;)
 
 #define _trace() \
-    printf("_trace(%s:%u)\n", __FILE__, __LINE__)
+    fprintf(stderr, "_trace(%s:%u): %s\n", __FILE__, __LINE__, __FUNCTION__)
 
 #define _not(type) \
     ((type) ~ (type) 0)
 
-#define _breakpoint() \
-    __asm__ { int 0x3 }
-
-#define _unused \
+#define _disused \
     __attribute__((unused))
 
+#define _label__(x) _label ## x
+#define _label_(y) _label__(y)
+#define _label _label_(__LINE__)
+
+#define _packed \
+    __attribute__((packed))
+
+#ifdef __cplusplus
+
+template <typename Type_>
+struct Iterator_ {
+    typedef typename Type_::const_iterator Result;
+};
+
+#define _foreach(item, list) \
+    for (bool _stop(true); _stop; ) \
+        for (const __typeof__(list) &_list = (list); _stop; _stop = false) \
+            for (Iterator_<__typeof__(list)>::Result item = _list.begin(); item != _list.end(); ++item)
+
+#endif
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
+
+#endif/*MINIMAL_STDLIB_H*/