Moving Open code to C

src/basic/basic_string.cpp

@@ -333,4 +333,34 @@ API Int GetSize(Array<String> array) {
     Int result = 0;
     For (array) result += it.len;
     return result;
+}
+
+API bool Chop(String *string, String ending) {
+    if (EndsWith(*string, ending)) {
+        *string = Chop(*string, ending.len);
+        return true;
+    }
+    return false;
+}
+
+API String ChopNumberEx(String *string) {
+    String col = {};
+    for (int64_t i = string->len - 1; i >= 0; i -= 1) {
+        if (IsDigit(string->data[i])) {
+            col.data = string->data + i;
+            col.len += 1;
+        } else {
+            break;
+        }
+    }
+    *string = Chop(*string, col.len);
+    return col;
+}
+
+API Int ChopNumber(String *string) {
+    Scratch  scratch;
+    String col = ChopNumberEx(string);
+    if (col.len == 0) return -1;
+    Int result = strtoll(col.data, NULL, 10) - 1;
+    return result;
 }

src/basic/basic_string16.cpp

@@ -394,20 +394,18 @@ API String16 SkipWhitespace(String16 *string) {
     return begin;
 }
 
-// chop this - :324
+// chop this - 324
 API String16 ChopNumberEx(String16 *string) {
     String16 col = {};
     for (int64_t i = string->len - 1; i >= 0; i -= 1) {
         if (IsDigit(string->data[i])) {
             col.data = string->data + i;
             col.len += 1;
-        } else if (string->data[i] == L':') {
-            break;
         } else {
-            return {};
+            break;
         }
     }
-    *string = Chop(*string, col.len + 1);
+    *string = Chop(*string, col.len);
     return col;
 }
 
@@ -416,7 +414,6 @@ API Int ChopNumber(String16 *string) {
     String16 col = ChopNumberEx(string);
     if (col.len == 0) return -1;
     String num_string = ToString(scratch, col);
-    Int    result     = strtoll(num_string.data, NULL, 10) - 1;
-
+    Int result = strtoll(num_string.data, NULL, 10) - 1;
     return result;
 }