Changeset 1834 in kBuild for trunk

Timestamp:

Oct 11, 2008 7:07:29 PM (16 years ago)

Author:

bird

Message:

kmk: assertions.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (3 diffs)
• kbuild.c (modified) (1 diff)
• make.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -487 +487 @@
   if (length < 0)
     length = strlen (string);
+  else
+    MY_ASSERT_MSG (string + length == (p1 = memchr (string, '\0', length)) || !p1, ("len=%ld p1=%p %s\n", length, p1, line));
 
   /* Simple 1: Emptry string. */
@@ -551 +553 @@
                 o = op;
                 p = begp;
+                assert (!memchr (variable_buffer + line_offset, '\0', o - variable_buffer + line_offset));
                 break;
               }
@@ -707 +710 @@
   o = variable_buffer_output (o, "\0", 2); /* KMK: compensate for the strlen + 1 that was removed above. */
   *eolp = o - 2;
-  assert (strchr (variable_buffer + line_offset, '\0') == *eolp);
+  MY_ASSERT_MSG (strchr (variable_buffer + line_offset, '\0') == *eolp,
+                 ("expected=%d actual=%d\nlength=%ld string=%.*s\n",
+                  (int)(*eolp - variable_buffer + line_offset), (int)strlen(variable_buffer + line_offset),
+                  length, (int)length, string));
   return (variable_buffer + line_offset);
 }

trunk/src/kmk/kbuild.c

@@ -50 +50 @@
 #ifndef va_copy
 # define va_copy(dst, src) do {(dst) = (src);} while (0)
-#endif
-#ifdef _MSC_VER
-# define MY_INLINE  _inline static
-#elif defined(__GNUC__)
-# define MY_INLINE  static __inline__
-#else
-# define MY_INLINE  static
 #endif
 

trunk/src/kmk/make.h

@@ -148 +148 @@
 #ifndef CHAR_BIT
 # define CHAR_BIT 8
+#endif
+
+#ifdef KMK
+# ifdef _MSC_VER
+#  define MY_INLINE  _inline static
+# elif defined(__GNUC__)
+#  define MY_INLINE  static __inline__
+# else
+#  define MY_INLINE  static
+# endif
+#endif /* KMK */
+#if defined(CONFIG_WITH_VALUE_LENGTH) || defined(KMK)
+# ifndef NDEBUG
+#  define MY_ASSERT_MSG(expr, printfargs) \
+    do { if (!(expr)) { printf printfargs; assert(expr); } } while (0)
+# else
+#  define MY_ASSERT_MSG(expr, printfargs)   do { } while (0)
+# endif
 #endif