fix small string and small array for betterC

libmir · Aug 2, 2020 · 0a32920 · 0a32920
1 parent 4418e9f
commit 0a32920
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/source/mir/small_array.d b/source/mir/small_array.d
@@ -181,7 +181,10 @@ struct SmallArray(T, uint maxLength)
     ref typeof(this) append(T elem)
     {
         if (_length == maxLength)
-            throw exception;
+        {
+            version(D_Exceptions) throw exception;
+            else assert(0, errorMsg);
+        }
         _data[_length++] = elem;
         return this;
     }
@@ -190,7 +193,10 @@ struct SmallArray(T, uint maxLength)
     ref typeof(this) append(V[] array)
     {
         if (_length + array.length > maxLength)
-            throw exception;
+        {
+            version(D_Exceptions) throw exception;
+            else assert(0, errorMsg);
+        }
         _data[_length .. _length + array.length] = array;
         _length += array.length;
         return this;

diff --git a/source/mir/small_string.d b/source/mir/small_string.d
@@ -194,7 +194,10 @@ extern(D):
     {
         auto length = asArray.length;
         if (length == maxLength)
-            throw exception;
+        {
+            version(D_Exceptions) throw exception;
+            else assert(0, errorMsg);
+        }
         _data[length] = c;
         return this;
     }
@@ -204,7 +207,10 @@ extern(D):
     {
         auto length = asArray.length;
         if (length + str.length > maxLength)
-            throw exception;
+        {
+            version(D_Exceptions) throw exception;
+            else assert(0, errorMsg);
+        }
         if (__ctfe)
             _data[length .. str.length + length] = str;
         else