Fix and enhance type casts to strings (#507, #508)

Author: vtereshkov

doc/lang.md

@@ -417,7 +417,7 @@ If a value `s` of type `S` is given where a value `t` of some other type `T` is
 * `S` and `T` are compatible
 * `S` is an integer type and `T` is a real type
 * `S` is `char` and `T` is `str`
-* `S` is a `[]char` and `T` is `str`
+* `S` is `[]char` and `T` is `str`
 * `S` is `str` and `T` is `[]char` and `s` and `t` are not operands of a binary operator
 * `S` is an array type and `T` is a dynamic array type and the item types of `S` and `T` are equivalent and `s` and `t` are not operands of a binary operator
 * `S` is a dynamic array type and `T` is an array type and the item types of `S` and `T` are equivalent and `len(s) <= len(t)` 
@@ -437,6 +437,8 @@ If a value `s` of type `S` is given where a value `t` of some other type `T` is
 * `S` and `T` are ordinal types
 * `S` and `T` are pointer types and `sizeof(s^) >= sizeof(t^)` and both `S` and `T` don't contain pointers
 * `S` is an interface type and `T` is a type (or a pointer to a type) that was actually converted to `S`
+* `S` is `[]int8` or `[]uint8` and `T` is `str`
+* `S` is `str` and `T` is `[]int8` or `[]uint8`
 * `S` is `[]U`, `T` is `[]V` and `U` can be explicitly converted to `V` 
 
 ## Declarations

playground/umka.js

@@ -712,6 +712,18 @@ void doExplicitTypeConv(Compiler *comp, Type *dest, Type **src, Const *constant)
         }
     }
 
+    // Dynamic array to string
+    else if ((*src)->kind == TYPE_DYNARRAY && ((*src)->base->kind == TYPE_INT8 || (*src)->base->kind == TYPE_UINT8) && dest->kind == TYPE_STR)
+    {
+        doDynArrayToStrConv(comp, dest, src, constant, false);
+    }
+
+    // String to dynamic array
+    else if ((*src)->kind == TYPE_STR && dest->kind == TYPE_DYNARRAY && (dest->base->kind == TYPE_INT8 || dest->base->kind == TYPE_UINT8))
+    {
+        doStrToDynArrayConv(comp, dest, src, constant);
+    }
+
     // Dynamic array to dynamic array of another base type (covariant arrays)
     else if ((*src)->kind == TYPE_DYNARRAY && dest->kind == TYPE_DYNARRAY)
     {

src/umka_expr.c

@@ -2072,7 +2072,7 @@ static FORCE_INLINE void doBuiltinMakefromarr(Fiber *fiber, HeapPages *pages, Er
 }
 
 
-// fn makefromstr(src: str): []char
+// fn makefromstr(src: str): []char | []int8 | []uint8
 static FORCE_INLINE void doBuiltinMakefromstr(Fiber *fiber, HeapPages *pages, Error *error)
 {
     DynArray *dest  = (DynArray   *)(fiber->top++)->ptrVal;
@@ -2118,7 +2118,7 @@ static FORCE_INLINE void doBuiltinMaketoarr(Fiber *fiber, HeapPages *pages, Erro
 }
 
 
-// fn maketostr(src: char | []char): str
+// fn maketostr(src: char | []char | []int8 | []uint8): str
 static FORCE_INLINE void doBuiltinMaketostr(Fiber *fiber, HeapPages *pages, Error *error)
 {
     char *dest = doGetEmptyStr();
@@ -2139,14 +2139,17 @@ static FORCE_INLINE void doBuiltinMaketostr(Fiber *fiber, HeapPages *pages, Erro
     else
     {
         // Dynamic array to string
-        DynArray *src  = (DynArray *)(fiber->top++)->ptrVal;
+        DynArray *src = (DynArray *)(fiber->top++)->ptrVal;
 
         if (!src)
             error->runtimeHandler(error->context, ERR_RUNTIME, "Dynamic array is null");
 
         if (src->data)
         {
-            const int64_t len = strlen((const char *)src->data);
+            int64_t len = 0;
+            while (len < getDims(src)->len && ((const char *)src->data)[len])
+                len++;
+
             dest = doAllocStr(pages, len, error);
             memcpy(dest, src->data, len);
         }

src/umka_vm.c

@@ -749,6 +749,12 @@ Hey Hello
 ['H' 'e' 'l' 'l' 0x00] Hell
 HellHell
 HellHell
+[72 101 108 108 111 44 32 66 114 97 118 101 32 78 101 119 32 87 111 114 108 100 33]
+[72 101 108 108 111 44 32 -48 -76 -48 -72 -48 -78 -48 -67 -47 -117 -48 -71 32 -48 -67 -48 -66 -48 -78 -47 -117 -48 -71 32 -48 -68 -48 -72 -47 -128 33]
+Hello, Brave New World!
+Hello, дивный новый мир!
+['P' 'Q'] "PQ" 2 2
+['P' 'Q' 0x00 'R'] "PQ" 4 2
 
 
 >>> Non-local scope

tests/expected.log

@@ -70,10 +70,32 @@ fn test3() {
 	std::assert(d + c == "abab")
 }
 
+fn test4() {
+    s := "Hello,"
+    a := []uint8(s + " Brave New World!")
+    b := []int8(s + " дивный новый мир!")
+    printf("%v\n%v\n", a, b)
+    printf("%s\n%s\n", str(a), str(b))
+}
+
+fn test5() {
+    b := []char{'P', 'Q'}
+    b = append(b, 'R')
+    b = delete(b, 2)
+    printf("%v %v %v %v\n", b, str(b), len(b), len(str(b)))
+
+    c := []char{'P', 'Q', '\0', 'S'}
+    c = append(c, 'R')
+    c = delete(c, 3)
+    printf("%v %v %v %v\n", c, str(c), len(c), len(str(c)))    
+}
+
 fn test*() {
 	test1()
 	test2()
 	test3()
+	test4()
+	test5()
 }
 
 fn main() {