FEAT/CHANGE: removing /base refinement from debase and enbase functions

So eliminating ugly `??base/base` code, for example instead of:
```
debase/base data 16
```
it is now just:
```
debase data 16
```

I'm still not sure if the `base` value should not be as a first argument, but so far I will just keep it as a second one.

Implements: Oldes/Rebol-issues#2411

Author: Oldes

src/boot/natives.r

@@ -403,18 +403,16 @@ construct: native [
 ]
 
 debase: native [
-	{Decodes binary-coded string (BASE-64 default) to binary value.}
+	{Decodes binary-coded string to binary value.}
 	value [binary! string!] {The string to decode}
-	/base {Binary base to use}
-	base-value [integer!] {The base to convert from: 85, 64, 16, or 2}
+	base  [integer!] {Binary base to use: 85, 64, 16, or 2}
 	/url  {Base 64 Decoding with URL and Filename Safe Alphabet}
 ]
 
 enbase: native [
-	{Encodes a string into a binary-coded string (BASE-64 default).}
+	{Encodes a string into a binary-coded string.}
 	value [binary! string!] {If string, will be UTF8 encoded}
-	/base {Binary base to use}
-	base-value [integer!] {The base to convert to: 85, 64, 16, or 2}
+	base  [integer!] {Binary base to use: 85, 64, 16, or 2}
 	/url  {Base 64 Encoding with URL and Filename Safe Alphabet}
 ]
 

src/core/n-strings.c

@@ -453,16 +453,14 @@ static struct digest {
 **
 ***********************************************************************/
 {
-	REBINT base = 64;
+	REBINT base = VAL_INT32(D_ARG(2));
 	REBSER *ser;
 	REBCNT index;
 	REBCNT len = 0;
 
 	ser = Prep_Bin_Str(D_ARG(1), &index, &len); // result may be a SHARED BUFFER!
 
-	if (D_REF(2)) base = VAL_INT32(D_ARG(3)); // /base
-
-	if (!Decode_Binary(D_RET, BIN_SKIP(ser, index), len, base, 0, D_REF(4)))
+	if (!Decode_Binary(D_RET, BIN_SKIP(ser, index), len, base, 0, D_REF(3)))
  		Trap1(RE_INVALID_DATA, D_ARG(1));
 
 	return R_RET;
@@ -478,19 +476,17 @@ static struct digest {
 **
 ***********************************************************************/
 {
-	REBINT base = 64;
 	REBSER *ser = NULL;
 	REBCNT index;
 	REBVAL *arg = D_ARG(1);
+	REBINT base = VAL_INT32(D_ARG(2));
 
 	Set_Binary(arg, Prep_Bin_Str(arg, &index, 0)); // may be SHARED buffer
 	VAL_INDEX(arg) = index;
 
-	if (D_REF(2)) base = VAL_INT32(D_ARG(3));
-
 	switch (base) {
 	case 64:
-		ser = Encode_Base64(arg, 0, FALSE, D_REF(4));
+		ser = Encode_Base64(arg, 0, FALSE, D_REF(3));
 		break;
 	case 16:
 		ser = Encode_Base16(arg, 0, FALSE);
@@ -507,7 +503,7 @@ static struct digest {
 
 		break;
 	default:
-		Trap_Arg(D_ARG(3));
+		Trap_Arg(D_ARG(2));
 	}
 
 	Set_String(D_RET, ser);

src/mezz/codec-swf.r

@@ -328,7 +328,7 @@ import module [
 				][
 					lineType: none
 					;StyleChangeRecord
-					;print ["SCR:" mold copy/part bin/buffer 5 (enbase/base to-binary to-char states 2)]
+					;print ["SCR:" mold copy/part bin/buffer 5 (enbase to-binary to-char states 2)]
 					append records 'style
 					insert/only tail records reduce [
 						either 0 < (states and 1 ) [ readSBPair ][none] ;move

src/mezz/codec-unixtime.r

@@ -23,7 +23,7 @@ register-codec [
 		epoch [number! string! binary!] "Date in unix time format (string is uspposed to be in base-16 format)"
 		/utc {Will not add time zone}
 	][
-		if string? epoch [ epoch: debase/base epoch 16 ]
+		if string? epoch [ epoch: debase epoch 16 ]
 		if binary? epoch [ epoch: to integer! epoch ]
 		days: to integer! tmp: epoch / 86400
 		hours: to integer! time: (tmp - days) * 24
@@ -54,7 +54,7 @@ register-codec [
 			binary/write bin: #{} [ui32 :unix]
 			switch type [
 				binary!  [ return bin ]
-				string!  [ return enbase/base bin 16]
+				string!  [ return enbase bin 16]
 				integer! [ return unix ] ; just for consistency
 			]
 			cause-error 'script 'invalid-arg type

src/mezz/mezz-crypt.r

@@ -68,11 +68,11 @@ import module [
 		][	return none ]
 
 		either binary [
-			try [debase base64-data]
+			try [debase base64-data 64]
 		][
 			compose/only [
 				label:     (trim/tail label)
-				binary:    (try [debase base64-data])
+				binary:    (try [debase base64-data 64])
 				header:    (new-line/skip header true 2)
 				pre-text:  (trim/head/tail pre-text)
 				post-text: (trim/head/tail post-text)

src/mezz/prot-smtp.r

@@ -154,11 +154,11 @@ sync-smtp-handler: func [ event
 						case [
 							find/part response "334 VXNlcm5hbWU6" 16 [
 								; username being requested
-								write client to-binary net-log/C join enbase client/spec/user CRLF
+								write client to-binary net-log/C join enbase client/spec/user 64 CRLF
 							]
 							find/part response "334 UGFzc3dvcmQ6" 16 [
 								; pass being requested
-								write client to-binary net-log/C join enbase client/spec/pass CRLF
+								write client to-binary net-log/C join enbase client/spec/pass 64 CRLF
 								client/spec/state: 'PASSWORD
 							]
 							true [
@@ -172,11 +172,11 @@ sync-smtp-handler: func [ event
 						case [
 							find/part response "334 " 4 [
 								auth-key: skip response 4
-								auth-key: debase auth-key
+								auth-key: debase auth-key 64
 								; compute challenge response
 								auth-key: checksum/method/key auth-key 'md5 client/spec/pass
 								write client to-binary net-log/C join 
-								enbase reform [client/spec/user lowercase enbase/base auth-key 16] CRLF
+								enbase reform [client/spec/user lowercase enbase auth-key 16] 64 CRLF
 								client/spec/state: 'PASSWORD
 							]
 							true [ 
@@ -238,7 +238,7 @@ any
 								write client to-binary net-log/C rejoin ["MAIL FROM: <" client/spec/email/from ">" CRLF]					   ][
 							switch/default client/spec/state [
 								PLAIN [
-									write client to-binary net-log/C rejoin [ "AUTH PLAIN " enbase rejoin [client/spec/user #"^@" client/spec/user #"^@" client/spec/pass] CRLF  ]
+									write client to-binary net-log/C rejoin [ "AUTH PLAIN " enbase rejoin [client/spec/user #"^@" client/spec/user #"^@" client/spec/pass] 64 CRLF  ]
 									client/spec/state: 'PASSWORD
 									]
 								LOGIN [

src/tests/units/enbase-test.r3

@@ -10,41 +10,36 @@ Rebol [
 
 ===start-group=== "enbase basic"
 	;from https://tools.ietf.org/html/rfc4648#section-10
-	--test-- "enbase-1" --assert "" = enbase ""
-	--test-- "enbase-2" --assert "Zg==" = enbase "f"
-	--test-- "enbase-3" --assert "Zm8=" = enbase "fo"
-	--test-- "enbase-4" --assert "Zm9v" = enbase "foo"
-	--test-- "enbase-5" --assert "Zm9vYg==" = enbase "foob"
-	--test-- "enbase-6" --assert "Zm9vYmE=" = enbase "fooba"
-	--test-- "enbase-7" --assert "Zm9vYmFy" = enbase "foobar"
-
-	--test-- "enbase-8"  --assert ""             = enbase/base "" 16
-	--test-- "enbase-9"  --assert "66"           = enbase/base "f" 16
-	--test-- "enbase-10" --assert "666F"         = enbase/base "fo" 16
-	--test-- "enbase-11" --assert "666F6F"       = enbase/base "foo" 16
-	--test-- "enbase-12" --assert "666F6F62"     = enbase/base "foob" 16
-	--test-- "enbase-13" --assert "666F6F6261"   = enbase/base "fooba" 16
-	--test-- "enbase-14" --assert "666F6F626172" = enbase/base "foobar" 16
+	--test-- "enbase-1" --assert ""         = enbase "" 64
+	--test-- "enbase-2" --assert "Zg=="     = enbase "f" 64
+	--test-- "enbase-3" --assert "Zm8="     = enbase "fo" 64
+	--test-- "enbase-4" --assert "Zm9v"     = enbase "foo" 64
+	--test-- "enbase-5" --assert "Zm9vYg==" = enbase "foob" 64
+	--test-- "enbase-6" --assert "Zm9vYmE=" = enbase "fooba" 64
+	--test-- "enbase-7" --assert "Zm9vYmFy" = enbase "foobar" 64
+
+	--test-- "enbase-8"  --assert ""             = enbase "" 16
+	--test-- "enbase-9"  --assert "66"           = enbase "f" 16
+	--test-- "enbase-10" --assert "666F"         = enbase "fo" 16
+	--test-- "enbase-11" --assert "666F6F"       = enbase "foo" 16
+	--test-- "enbase-12" --assert "666F6F62"     = enbase "foob" 16
+	--test-- "enbase-13" --assert "666F6F6261"   = enbase "fooba" 16
+	--test-- "enbase-14" --assert "666F6F626172" = enbase "foobar" 16
 ===end-group===
 
 ===start-group=== "enbase with position not at head"
 	;@@ https://github.com/rebol/rebol-issues/issues/319
 	bin: #{FF00FF00}
-	--test-- "enbase-2"  --assert #{00FF00} = debase/base enbase/base next bin 2 2
-	--test-- "enbase-16" --assert #{00FF00} = debase/base enbase/base next bin 16 16
-	--test-- "enbase-64" --assert #{00FF00} = debase enbase next bin
+	--test-- "enbase-2"  --assert #{00FF00} = debase enbase next bin 2 2
+	--test-- "enbase-16" --assert #{00FF00} = debase enbase next bin 16 16
+	--test-- "enbase-64" --assert #{00FF00} = debase enbase next bin 64 64
 ===end-group===
 
 ===start-group=== "debase 64"
-
 	--test-- "debase 64 1"          
-		--assert strict-equal? "A simple string" to string! debase "QSBzaW1wbGUgc3RyaW5n"
+		--assert strict-equal? "A simple string" to string! debase "QSBzaW1wbGUgc3RyaW5n" 64
 	--test-- "debase 64 2"          
-		--assert strict-equal? "A multi-line\nstring" to string! debase "QSBtdWx0aS1saW5lXG5zdHJpbmc="
-	--test-- "debase 64 3"          
-		--assert strict-equal? "A simple string" to string! debase/base "QSBzaW1wbGUgc3RyaW5n" 64
-	--test-- "debase 64 4"          
-		--assert strict-equal? "A multi-line\nstring" to string! debase/base "QSBtdWx0aS1saW5lXG5zdHJpbmc=" 64   
+		--assert strict-equal? "A multi-line\nstring" to string! debase "QSBtdWx0aS1saW5lXG5zdHJpbmc=" 64   
 
 ===end-group===
 
@@ -58,37 +53,37 @@ Rebol [
 			0GarZRmB_eSN9383LcOLn6_dO--xi12jzDwusC-eOkHWEsqtFZESc6BfI7noOPqv
 			hJ1phCnvWh6IeYI2w9QOYEUipUTI8np6LbgGY9Fs98rqVt5AXLIhWkWywlVmtVrB
 			p0igcN_IoypGlUPQGe77Rw
-		}]
+		} 64]
 		--assert binary? try [debase {
 			cC4hiUPoj9Eetdgtv3hF80EGrhuB__dzERat0XF9g2VtQgr9PJbu3XOiZj5RZmh7
 			AAuHIm4Bh-0Qc_lF5YKt_O8W2Fp5jujGbds9uJdbF9CUAr7t1dnZcAcQjbKBYNX4
 			BAynRFdiuB--f_nZLgrnbyTyWzO75vRK5h6xBArLIARNPvkSjtQBMHlb1L07Qe7K
 			0GarZRmB_eSN9383LcOLn6_dO--xi12jzDwusC-eOkHWEsqtFZESc6BfI7noOPqv
 			hJ1phCnvWh6IeYI2w9QOYEUipUTI8np6LbgGY9Fs98rqVt5AXLIhWkWywlVmtVrB
 			p0igcN_IoypGlUPQGe77Rw
-		}]
+		} 64]
 	--test-- "debase 64 url 2 - missing padding in the input" 
 		;should be ok with the padding
 		--assert binary? try [debase {
 		    eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFt
 		    cGxlLmNvbS9pc19yb290Ijp0cnVlfQ==
-		}]
+		} 64]
 		;should throw error when missing padding and not /url refinement is used
 		--assert error? try [debase {
 		    eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFt
 		    cGxlLmNvbS9pc19yb290Ijp0cnVlfQ
-		}]
+		} 64]
 		--assert binary? try [debase/url {
 		    eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFt
 		    cGxlLmNvbS9pc19yb290Ijp0cnVlfQ
-		}]
+		} 64]
 	--test-- "debase 64 url 3"
 		key1: "qL8R4QIcQ_ZsRqOAbeRfcZhilN_MksRtDaErMA=="
-		bin: try [debase/url key1]
-		--assert true? all [binary? bin key1 = enbase/url bin]
+		bin: try [debase/url key1 64]
+		--assert true? all [binary? bin key1 = enbase/url bin 64]
 		;debase is working also when input is missing the padding
 		key2: "qL8R4QIcQ_ZsRqOAbeRfcZhilN_MksRtDaErMA"
-		--assert bin = try [debase/url key2]
+		--assert bin = try [debase/url key2 64]
 
 ===end-group===
 
@@ -97,11 +92,11 @@ Rebol [
 	--test-- "debase 16 1"          
 		--assert strict-equal? 
 			"A simple string" 
-			to string! debase/base "412073696d706c6520737472696e67" 16
+			to string! debase "412073696d706c6520737472696e67" 16
 	--test-- "debase 16 2"          
 		--assert strict-equal? 
 			"A multi-line\nstring" 
-			to string! debase/base "41206d756c74692d6c696e655c6e737472696e67" 16
+			to string! debase "41206d756c74692d6c696e655c6e737472696e67" 16
 
 ===end-group===
 
@@ -110,12 +105,12 @@ Rebol [
 	--test-- "debase 2 1"          
 		--assert strict-equal? 
 			"^(04)^(01)" 
-			to string! debase/base "0000010000000001" 2
+			to string! debase "0000010000000001" 2
 
 ===end-group===
 
 if any [
-	not error? err: try [enbase/base "a" 85]
+	not error? err: try [enbase "a" 85]
 	err/id <> 'feature-na
 ][
 	base85-str-tests: [
@@ -157,25 +152,25 @@ if any [
 
 
 	===start-group=== "enbase-85"
-		--test-- "enbase/base str 85"    
+		--test-- "enbase str 85"    
 			foreach [inp out] base85-str-tests [
-				--assert out = enbase/base inp 85
+				--assert out = enbase inp 85
 			]
 	===end-group===
 
 	===start-group=== "debase-85"
-		--test-- "debase/base str 85"    
+		--test-- "debase str 85"    
 			foreach [out inp] base85-str-tests [
-				--assert out = probe to-string debase/base inp 85
+				--assert out = to-string debase inp 85
 			]
 		--test-- "debase 85 with spaces"
 			foreach [out inp] base85-spaces-tests [
-				--assert out = debase/base inp 85
+				--assert out = debase inp 85
 			]
 		--test-- "invalid debase85 input"
-			--assert error? try [debase/base "abcx" 85]
-			--assert error? try [debase/base "~>" 85]
-			--assert error? try [debase/base {s8W-"} 85]
+			--assert error? try [debase "abcx"  85]
+			--assert error? try [debase "~>"    85]
+			--assert error? try [debase {s8W-"} 85]
 	===end-group===
 ]