Merge pull request #5 from Oldes/r2-pick

FEAT/FIX: Picking the right PICK

Author: Oldes

src/core/t-block.c

@@ -534,13 +534,15 @@ static struct {
 	REBINT n = 0;
 
 	/* Issues!!!
-		a/1.3
 		a/not-found: 10 error or append?
 		a/not-followed: 10 error or append?
 	*/
 
-	if (IS_INTEGER(pvs->select)) {
-		n = Int32(pvs->select) + VAL_INDEX(pvs->value) - 1;
+	if (IS_INTEGER(pvs->select) || IS_DECIMAL(pvs->select)) {
+		REBINT i = Int32(pvs->select);
+		if (i == 0) return PE_NONE; // like in case: path/0
+		if (i < 0) i++;
+		n = i + VAL_INDEX(pvs->value) - 1;
 	}
 	else if (IS_WORD(pvs->select)) {
 		n = Find_Word(VAL_SERIES(pvs->value), VAL_INDEX(pvs->value), VAL_WORD_CANON(pvs->select));
@@ -573,6 +575,8 @@ static struct {
 	REBINT n = 0;
 
 	n = Get_Num_Arg(selector);
+	if (n == 0) return 0;
+	if (n < 0) n++;
 	n += VAL_INDEX(block) - 1;
 	if (n < 0 || (REBCNT)n >= VAL_TAIL(block)) return 0;
 	return VAL_BLK_SKIP(block, n);

src/core/t-string.c

@@ -354,7 +354,10 @@ static REBSER *make_binary(REBVAL *arg, REBOOL make)
 	REBSER *ser = VAL_SERIES(data);
 
 	if (IS_INTEGER(pvs->select)) {
-		n = Int32(pvs->select) + VAL_INDEX(data) - 1;
+		i = Int32(pvs->select);
+		if (i == 0) return PE_NONE; // like in case: path/0
+		if (i < 0) i++;
+		n = i + VAL_INDEX(data) - 1;
 	}
 	else return PE_BAD_SELECT;
 
@@ -542,8 +545,9 @@ static REBSER *make_binary(REBVAL *arg, REBOOL make)
 	case A_PICK:
 	case A_POKE:
 		len = Get_Num_Arg(arg); // Position
-		//if (len > 0) index--;
-		if (REB_I32_SUB_OF(len, 1, &len)
+		if (len < 0) REB_I32_ADD_OF(index, 1, &index);
+		if (len == 0
+			|| REB_I32_SUB_OF(len, 1, &len)
 			|| REB_I32_ADD_OF(index, len, &index)
 			|| index < 0 || index >= tail) {
 			if (action == A_PICK) goto is_none;

src/core/t-vector.c

@@ -468,10 +468,13 @@ void Set_Vector_Row(REBSER *ser, REBVAL *blk)
 	REBINT bits;
 	REBYTE *vp;
 	REBI64 i;
-	REBDEC f;
+	REBDEC f = 0.0;
 
-	if (IS_INTEGER(pvs->select) || IS_DECIMAL(pvs->select))
+	if (IS_INTEGER(pvs->select) || IS_DECIMAL(pvs->select)) {
 		n = Int32(pvs->select);
+		if (n == 0) return PE_NONE;
+		if (n < 0) n++;
+	}
 	else return PE_BAD_SELECT;
 
 	n += VAL_INDEX(pvs->value);