FEAT: implemented block argument for QUERY/MODE for FILE, DIR, INPUT (console) and HTTP ports

Author: Oldes

src/boot/actions.r

@@ -424,7 +424,7 @@ query: action [
 	{Returns information about a port, file, or URL.}
 	target [port! file! url! block!]
 	/mode "Get mode information"
-	field [word! none!] "NONE will return valid modes for port type"
+	field [word! block! none!] "NONE will return valid modes for port type"
 ]
 
 modify: action [

src/core/p-console.c

@@ -189,6 +189,26 @@
 		if (!Set_Console_Mode_Value(req, VAL_WORD_CANON(info), ret))
 			Trap1(RE_INVALID_ARG, info);
 	}
+	else if (IS_BLOCK(info)) {
+		REBVAL *val;
+		REBSER *values = Make_Block(2 * BLK_LEN(VAL_SERIES(info)));
+		REBVAL *word = VAL_BLK_DATA(info);
+		for (; NOT_END(word); word++) {
+			if (ANY_WORD(word)) {
+				if (IS_SET_WORD(word)) {
+					// keep the set-word in result
+					val = Append_Value(values);
+					*val = *word;
+					VAL_SET_LINE(val);
+				}
+				val = Append_Value(values);
+				if (!Set_Console_Mode_Value(req, VAL_WORD_CANON(word), val))
+					Trap1(RE_INVALID_ARG, word);
+			}
+			else  Trap1(RE_INVALID_ARG, word);
+		}
+		Set_Series(REB_BLOCK, ret, values);
+	}
 	else {
 		REBSER *obj = CLONE_OBJECT(VAL_OBJ_FRAME(spec));
 		SET_INTEGER(OFV(obj, STD_CONSOLE_INFO_BUFFER_COLS), req->console.buffer_cols);

src/core/p-file.c

@@ -132,11 +132,38 @@
 ***********************************************************************/
 {
 	REBSER *obj;
+	REBVAL *val;
 
 	if ( IS_WORD(info) ) {
 		if(!Set_File_Mode_Value(file, VAL_WORD_CANON(info), ret))
 			Trap1(RE_INVALID_ARG, info);
+	} else if (IS_BLOCK(info)) {
+		// example:
+		//	query/mode file [type size] ;== [file 1234]
+		// or:
+		//	 query/mode file [type: size:] ;== [type: file size: 1234]
+		// or combined:
+		//	 query/mode file [type: size] ;== [type: file 1234]
+		// When not supported word is used, if will throw an error
+
+		REBSER *values = Make_Block(2 * BLK_LEN(VAL_SERIES(info)));
+		REBVAL *word = VAL_BLK_DATA(info);
+		for (; NOT_END(word); word++) {
+			if(ANY_WORD(word)) {
+				if (IS_SET_WORD(word)) {
+					// keep the set-word in result
+					val = Append_Value(values);
+					*val = *word;
+					VAL_SET_LINE(val);
+				}
+				val = Append_Value(values);
+				if(!Set_File_Mode_Value(file, VAL_WORD_CANON(word), val))
+					Trap1(RE_INVALID_ARG, word);
+			} else  Trap1(RE_INVALID_ARG, word);
+		}
+		Set_Series(REB_BLOCK, ret, values);
 	} else {
+		//@@ oldes: is returning object really still needed?
 		info = In_Object(port, STD_PORT_SCHEME, STD_SCHEME_INFO, 0);
 		if (!info || !IS_OBJECT(info)) Trap_Port(RE_INVALID_SPEC, port, -10);
 		obj = CLONE_OBJECT(VAL_OBJ_FRAME(info));

src/mezz/prot-http.r

@@ -23,6 +23,7 @@ REBOL [
 		0.1.4 26-Nov-2012 "Richard Smolak"    "Version from Atronix's fork"
 		0.1.5 10-May-2018 "Oldes" "FIX: Query on URL was returning just none"
 		0.1.6 21-May-2018 "Oldes" "FEAT: Added support for basic redirection"
+		0.1.7 03-Dec-2018 "Oldes" "FEAT: Added support for QUERY/MODE action"
 	]
 ]
 
@@ -647,10 +648,10 @@ sys/make-scheme [
 		query: func [
 			port [port!]
 			/mode
-			field [word! none!]
-			/local error state
+			field [word! block! none!]
+			/local error state result
 		] [
-			if all [mode none? field] [ return words-of system/standard/file-info]
+			if all [mode none? field] [ return words-of system/schemes/http/info]
 			if none? state: port/state [
 				open port ;there is port opening in sync-op, but it would also close the port later and so clear the state
 				attempt [sync-op port [parse-write-dialect port [HEAD]]]
@@ -663,7 +664,18 @@ sys/make-scheme [
 				state/info/response-parsed
 			][
 				either field [
-					select state/info field
+					either word? field [
+						select state/info field
+					][
+						result: make block! length? field
+						foreach word field [
+							if any-word? word [
+								if set-word? word [ append result word ]
+								append result state/info/(to word! word)
+							]
+						]
+						result
+					]
 				][	state/info ]
 			][	none ]
 		]

src/tests/units/port-test.r3

@@ -32,13 +32,17 @@ Rebol [
 		--assert 'file = query/mode file 'type
 		--assert date?   query/mode file 'date
 		--assert 51732 = query/mode file 'size
+		--assert [file 51732] = query/mode file [type size]
+		--assert [type: file size: 51732] = query/mode file [type: size:]
 
 	--test-- "query file info (port)"
 		file: open %units/files/alice29.txt.gz
 		--assert [name size date type] = query/mode file none
 		--assert 'file = query/mode file 'type
 		--assert date?   query/mode file 'date
 		--assert 51732 = query/mode file 'size
+		--assert [file 51732] = query/mode file [type size]
+		--assert [type: file size: 51732] = query/mode file [type: size:]
 		close file
 ===end-group===
 
@@ -58,7 +62,10 @@ Rebol [
 		--assert integer? query/mode system/ports/input 'buffer-cols
 		--assert integer? query/mode system/ports/input 'buffer-rows
 		--assert [buffer-cols buffer-rows window-cols window-rows]
-						= query/mode system/ports/input none
+						= m: query/mode system/ports/input none
+		--assert block?   v: query/mode system/ports/input m
+		--assert 4 = length? v
+
 ===end-group===
 
 ~~~end-file~~~