# HG changeset patch
# User Leonard Ritter <contact@leonard-ritter.com>
# Date 1611221735 -3600
#      Thu Jan 21 10:35:35 2021 +0100
# Node ID dd99b520343c12d2c7e9dd748189be5aa08e39ba
# Parent  f05fdbd8514607414b006c2d35dc433bf2f3b073
* Fixed `emplace-append-many` for `String` and `Array` using the wrong offset. (tests by Westerbly Snaydley)

diff --git a/lib/scopes/Array.sc b/lib/scopes/Array.sc
--- a/lib/scopes/Array.sc
+++ b/lib/scopes/Array.sc
@@ -183,10 +183,10 @@
         assigned slot of array `self`. When the `array` is of `GrowingArray`
         type, this operation will transparently resize the array's storage.
     inline emplace-append-many (self size args...)
-        let dest = (append-slots self size)
+        let dest = (& (append-slots self size))
         for idx in (range size)
             let value = (((typeof self) . ElementType) args...)
-            assign value (self._items @ idx)
+            assign value (dest @ idx)
         dest
 
     """"Insert `value` at `index` into the array `self` and return a reference
diff --git a/lib/scopes/String.sc b/lib/scopes/String.sc
--- a/lib/scopes/String.sc
+++ b/lib/scopes/String.sc
@@ -284,10 +284,10 @@
         assigned slot of string `self`. When the string is of `GrowingString`
         type, this operation will transparently resize the string's storage.
     inline emplace-append-many (self size args...)
-        let dest = (append-slots self size)
+        let dest = (& (append-slots self size))
         for idx in (range size)
             let value = (((typeof self) . ElementType) args...)
-            assign value (self._items @ idx)
+            assign value (dest @ idx)
         dest
 
     """"Insert `value` at `index` into the string `self` and return a reference
diff --git a/testing/test_array.sc b/testing/test_array.sc
--- a/testing/test_array.sc
+++ b/testing/test_array.sc
@@ -133,5 +133,4 @@
 
     One.test-refcount-balanced;
 
-
-
+;
diff --git a/testing/test_mutarray.sc b/testing/test_mutarray.sc
--- a/testing/test_mutarray.sc
+++ b/testing/test_mutarray.sc
@@ -231,3 +231,15 @@
 
 test-remove;
 One.test-refcount-balanced;
+
+do
+    local a : (Array i32)
+    for i in (range 3)
+        'append a 10
+    'emplace-append-many a 2 1
+    for i in (range 3)
+        test ((a @ i) == 10)
+    for i in (range 3 5)
+        test ((a @ i) == 1)
+
+;
diff --git a/testing/test_string.sc b/testing/test_string.sc
--- a/testing/test_string.sc
+++ b/testing/test_string.sc
@@ -95,6 +95,12 @@
     test (q == "inittiniinit")
     ;
 
+do
+    local s : String "abcd"
+    'emplace-append-many s 4 101:i8
+    test (s == "abcdeeee")
+    ;
+
 # testing proper globalization
 local s = (String "test")
 run-stage;