Fixed string concat to cstring conversion (#427)

* Fixed string concat to cstring conversion * Minor stylistic adjustment
pschachte · Dec 8, 2023 · 63c971d · 63c971d
1 parent 35b5c14
commit 63c971d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/test-cases/execution/string_concat_to_cstring.exp b/test-cases/execution/string_concat_to_cstring.exp
@@ -0,0 +1 @@
+012
diff --git a/test-cases/execution/string_concat_to_cstring.in b/test-cases/execution/string_concat_to_cstring.in
diff --git a/test-cases/execution/string_concat_to_cstring.wybe b/test-cases/execution/string_concat_to_cstring.wybe
@@ -0,0 +1,3 @@
+?str = ("0" ,, "1") ,, "2"
+
+!println(c_string(str))
diff --git a/wybelibs/wybe/string.wybe b/wybelibs/wybe/string.wybe
@@ -42,7 +42,7 @@ pub def c_string(s:_):c_string = str where {
        | else :: 
             ?len = length(s) + 1
             foreign lpvm alloc(len, ?str)
-            foreign lpvm mutate(str, ?str, len, true, len, 0, '\0')
+            foreign lpvm mutate(str, ?str, len - 1, true, len, 0, '\0')
             ?offset = 0
             pack(s, !str, len, !offset)
     }
@@ -180,7 +180,6 @@ def pack(s:_, !raw:c_string, size:int, !offset:int) {
       | concat(?left, ?right) :: 
             pack(left, !raw, size, !offset)
             pack(right, !raw, size, !offset)
-            incr(!offset)
       | slice(_, _) :: 
             for ?c in s {
                 foreign lpvm mutate(raw, ?raw, offset, true, size, 0, c)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		?str = ("0" ,, "1") ,, "2"

		!println(c_string(str))