ADD array_repositioned

Author: Michal-Martinek

std/core/structs.mx

@@ -14,6 +14,9 @@
 ;;    - inplace initialization of values
 ;; %deinit()
 ;;    - inplace deinitialization of values
+;; %void_method repositioned(this)
+;;    - move / duplicate values after copy (ie. referenced data)
+;;    - calling this is user's responsibility
 
 
 %namespace struct {

std/ds/array.mx

@@ -54,6 +54,14 @@
 		%seg:this(0, %init())
 	}
 
+	; this ->
+	; duplicates value array after repositioning (call after struct:move)
+	%void_method{ array_repositioned, 1, 0,
+		%seg:this(%capacity, str 0) ; force copy: this.capacity = 0
+		%seg:push(%this, %size)     ; this.reserve(this.size)
+		%call(at_least_capacity)
+	}
+
 	; this, index -> item (G_DEST)
 	; safely indexes array
 	%method{ index, 2, 0,

tests/std-array.mx

@@ -145,6 +145,18 @@
 	%seg:push_addr(%local, 0)
 	%call(array_print)
 
+	; copying
+	%seg:push_addr(%local, 0)
+	%array:shallow_copy()
+	%stack:dup()
+	%call(array_repositioned)
+	%stack:top() ; copy stays at stack:top
+	movm
+	%print_endl(
+		outc 'C'
+		%array:default_print()
+	)
+
 	%seg:push_addr(%local, 0)
 	%stack:push(proc_int_lt_with_emit)
 	%call(array_sort)
@@ -153,6 +165,8 @@
 	%seg:push_addr(%local, 0)
 	%call(array_print)
 
+	%call(array_print) ; unchanged copy
+
 	; init(1) = 32, sum with rest
 	%seg:push_addr(%local, 0)
 	%stack:push(proc_debug_reduce_init)

tests/std-array.txt

@@ -1,6 +1,6 @@
 :returncode 0
 
-:stdout 479
+:stdout 512
 []
 [7, 8]
 8
@@ -27,8 +27,10 @@ F: 2056 7 8 0
 725
 [8, 1, 3, 4]
 [6, 8, 9, 1, 3, 4, 7]
+C 2066 7 8
 6<8 8<9 9<1 8<1 6<1 9<3 8<3 6<3 1<3 9<4 8<4 6<4 3<4 9<7 8<7 6<7 
 [1, 3, 4, 6, 7, 8, 9]
+[6, 8, 9, 1, 3, 4, 7]
 69
 36288
 2@65535

tests/std-struct.txt

@@ -15,38 +15,38 @@ P 6 4 4 6
 1 2050 6,4
 2048: 2 1 6 4 61432 0 0 0
 
-:stderr 2355
+:stderr 2357
 tests\std-struct.mx:19:3 ERROR: Invalid directive name '1st'
-std\core\structs.mx:107:11 ERROR: Define redefinition 'struct_id'
-std\core\structs.mx:27:10 ERROR: Macro redefinition 'new'
-std\core\structs.mx:31:10 ERROR: Macro redefinition 'dealloc'
-std\core\structs.mx:38:10 ERROR: Macro redefinition 'constructor'
-std\core\structs.mx:47:10 ERROR: Macro redefinition 'destructor'
-std\core\structs.mx:56:10 ERROR: Macro redefinition 'shallow_move'
-std\core\structs.mx:63:10 ERROR: Macro redefinition 'shallow_copy'
-std\core\structs.mx:75:10 ERROR: Macro redefinition 'at'
-std\core\structs.mx:80:10 ERROR: Macro redefinition 'reset'
-std\core\structs.mx:86:10 ERROR: Macro redefinition 'do_at'
-std\core\structs.mx:93:10 ERROR: Macro redefinition 'set'
-std\core\structs.mx:97:10 ERROR: Macro redefinition 'default_print'
+std\core\structs.mx:110:11 ERROR: Define redefinition 'struct_id'
+std\core\structs.mx:30:10 ERROR: Macro redefinition 'new'
+std\core\structs.mx:34:10 ERROR: Macro redefinition 'dealloc'
+std\core\structs.mx:41:10 ERROR: Macro redefinition 'constructor'
+std\core\structs.mx:50:10 ERROR: Macro redefinition 'destructor'
+std\core\structs.mx:59:10 ERROR: Macro redefinition 'shallow_move'
+std\core\structs.mx:66:10 ERROR: Macro redefinition 'shallow_copy'
+std\core\structs.mx:78:10 ERROR: Macro redefinition 'at'
+std\core\structs.mx:83:10 ERROR: Macro redefinition 'reset'
+std\core\structs.mx:89:10 ERROR: Macro redefinition 'do_at'
+std\core\structs.mx:96:10 ERROR: Macro redefinition 'set'
+std\core\structs.mx:100:10 ERROR: Macro redefinition 'default_print'
 tests\std-struct.mx:21:3 ERROR: Invalid directive name '2nd'
 tests\std-struct.mx:23:3 ERROR: Invalid directive name '3rd'
-std\core\structs.mx:107:11 ERROR: Define redefinition 'struct_id'
-std\core\structs.mx:27:10 ERROR: Macro redefinition 'new'
-std\core\structs.mx:31:10 ERROR: Macro redefinition 'dealloc'
-std\core\structs.mx:38:10 ERROR: Macro redefinition 'constructor'
-std\core\structs.mx:47:10 ERROR: Macro redefinition 'destructor'
-std\core\structs.mx:56:10 ERROR: Macro redefinition 'shallow_move'
-std\core\structs.mx:63:10 ERROR: Macro redefinition 'shallow_copy'
-std\core\structs.mx:75:10 ERROR: Macro redefinition 'at'
-std\core\structs.mx:80:10 ERROR: Macro redefinition 'reset'
-std\core\structs.mx:86:10 ERROR: Macro redefinition 'do_at'
-std\core\structs.mx:93:10 ERROR: Macro redefinition 'set'
-std\core\structs.mx:97:10 ERROR: Macro redefinition 'default_print'
+std\core\structs.mx:110:11 ERROR: Define redefinition 'struct_id'
+std\core\structs.mx:30:10 ERROR: Macro redefinition 'new'
+std\core\structs.mx:34:10 ERROR: Macro redefinition 'dealloc'
+std\core\structs.mx:41:10 ERROR: Macro redefinition 'constructor'
+std\core\structs.mx:50:10 ERROR: Macro redefinition 'destructor'
+std\core\structs.mx:59:10 ERROR: Macro redefinition 'shallow_move'
+std\core\structs.mx:66:10 ERROR: Macro redefinition 'shallow_copy'
+std\core\structs.mx:78:10 ERROR: Macro redefinition 'at'
+std\core\structs.mx:83:10 ERROR: Macro redefinition 'reset'
+std\core\structs.mx:89:10 ERROR: Macro redefinition 'do_at'
+std\core\structs.mx:96:10 ERROR: Macro redefinition 'set'
+std\core\structs.mx:100:10 ERROR: Macro redefinition 'default_print'
 tests\std-struct.mx:12:3 ERROR: Undeclared identifier '------------ 1 ------------'
 tests\std-struct.mx:31:2 ERROR: Missing directive name
 tests\std-struct.mx:12:3 ERROR: Undeclared identifier '------------ 2 ------------'
-std\core\structs.mx:119:11 ERROR: Define redefinition 'sizeof'
+std\core\structs.mx:122:11 ERROR: Define redefinition 'sizeof'
 tests\std-struct.mx:12:3 ERROR: Undeclared identifier '------------ 3 ------------'
 tests\std-struct.mx:46:2 ERROR: Undeclared identifier '0'
 tests\std-struct.mx:47:2 ERROR: Undeclared identifier '0'