Added an MB_PRINT_INPUT_PROMPT macro

Added an MB_PRINT_INPUT_CONTENT macro
Fixed a wrong return value of the mb_get_array_len function
Fixed a newline bug of the shell

Author: paladin-t

HISTORY

@@ -1,7 +1,13 @@
+Jul. 9 2022
+Added an MB_PRINT_INPUT_PROMPT macro
+Added an MB_PRINT_INPUT_CONTENT macro
+Fixed a wrong return value of the mb_get_array_len function
+Fixed a newline bug of the shell
+
 Jul. 8 2022
-Added a mb_get_vars function to retrieve active variables
+Added an mb_get_vars function to retrieve active variables
 Added a clear_vars parameter to the mb_reset function
-Added a mb_debug_count_stack_frames function to get the stack frame count
+Added an mb_debug_count_stack_frames function to get the stack frame count
 Removed a few unused parameters
 
 Jun. 16 2022

MY-BASIC Quick Reference.pdf

@@ -13540,11 +13540,8 @@ int mb_get_array_len(struct mb_interpreter_t* s, void** l, void* a, int r, int*
 	int result = 0;
 	_array_t* arr = 0;
 
-	if(!s || !l) {
-		result = MB_FUNC_ERR;
-
+	if(!s || !l)
 		goto _exit;
-	}
 
 	arr = (_array_t*)a;
 	if(r < 0 || r >= arr->dimension_count) {
@@ -13814,7 +13811,7 @@ int mb_remove_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, mb_val
 
 /* Tell the element count of a collection */
 int mb_count_coll(struct mb_interpreter_t* s, void** l, mb_value_t coll, int* c) {
-	int result = 0;
+	int result = MB_FUNC_OK;
 	_object_t ocoll;
 #ifdef MB_ENABLE_COLLECTION_LIB
 	_list_t* lst = 0;
@@ -18545,7 +18542,9 @@ static int _std_input(mb_interpreter_t* s, void** l) {
 	}
 	if(obj->type == _DT_STRING) {
 		pmt = obj->data.string;
+#if MB_PRINT_INPUT_PROMPT
 		_print_string(s, obj);
+#endif /* MB_PRINT_INPUT_PROMPT */
 		ast = ast->next;
 		obj = (_object_t*)ast->data;
 		if(!_IS_SEP(obj, ',')) {
@@ -18561,10 +18560,18 @@ static int _std_input(mb_interpreter_t* s, void** l) {
 		_get_inputer(s)(s, pmt, line, sizeof(line));
 		obj->data.variable->data->type = _DT_INT;
 		obj->data.variable->data->data.integer = (int_t)mb_strtol(line, &conv_suc, 0);
-		if(*conv_suc != _ZERO_CHAR) {
+		if(*conv_suc == _ZERO_CHAR) {
+#if MB_PRINT_INPUT_CONTENT
+			_get_printer(s)(s, MB_INT_FMT "\n", obj->data.variable->data->data.integer);
+#endif /* MB_PRINT_INPUT_CONTENT */
+		} else {
 			obj->data.variable->data->type = _DT_REAL;
 			obj->data.variable->data->data.float_point = (real_t)mb_strtod(line, &conv_suc);
-			if(*conv_suc != _ZERO_CHAR) {
+			if(*conv_suc == _ZERO_CHAR) {
+#if MB_PRINT_INPUT_CONTENT
+				_get_printer(s)(s, MB_REAL_FMT "\n", obj->data.variable->data->data.float_point);
+#endif /* MB_PRINT_INPUT_CONTENT */
+			} else {
 				_handle_error_on_obj(s, SE_RN_INVALID_ID_USAGE, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
 			}
 		}
@@ -18587,12 +18594,18 @@ static int _std_input(mb_interpreter_t* s, void** l) {
 			while((len = mb_wchar_to_bytes(_WCHAR_BUF_PTR(wbuf), &_CHAR_BUF_PTR(buf), _CHARS_OF_BUF(buf))) > _CHARS_OF_BUF(buf)) {
 				_RESIZE_CHAR_BUF(buf, len);
 			}
+#if MB_PRINT_INPUT_CONTENT
+			_get_printer(s)(s, "%ls\n", _WCHAR_BUF_PTR(wbuf));
+#endif /* MB_PRINT_INPUT_CONTENT */
 			_DISPOSE_BUF(wbuf);
 			obj->data.variable->data->data.string = _HEAP_CHAR_BUF(buf);
 			obj->data.variable->data->is_ref = false;
 		} while(0);
 #else /* MB_CP_VC && MB_ENABLE_UNICODE */
 		obj->data.variable->data->data.string = mb_memdup(line, (unsigned)(len + 1));
+#if MB_PRINT_INPUT_CONTENT
+		_get_printer(s)(s, "%s\n", obj->data.variable->data->data.string);
+#endif /* MB_PRINT_INPUT_CONTENT */
 #endif /* MB_CP_VC && MB_ENABLE_UNICODE */
 		ast = ast->next;
 	} else {

core/my_basic.c

@@ -188,6 +188,14 @@ extern "C" {
 #	define MB_CONVERT_TO_INT_LEVEL MB_CONVERT_TO_INT_LEVEL_ALL
 #endif /* MB_CONVERT_TO_INT_LEVEL */
 
+#ifndef MB_PRINT_INPUT_PROMPT
+#	define MB_PRINT_INPUT_PROMPT 1
+#endif /* MB_PRINT_INPUT_PROMPT */
+
+#ifndef MB_PRINT_INPUT_CONTENT
+#	define MB_PRINT_INPUT_CONTENT 0
+#endif /* MB_PRINT_INPUT_CONTENT */
+
 #ifndef MB_PREFER_SPEED
 #	define MB_PREFER_SPEED
 #endif /* MB_PREFER_SPEED */
@@ -278,15 +286,13 @@ extern "C" {
 #ifndef mb_stricmp
 #	ifdef MB_CP_VC
 #		define mb_stricmp _strcmpi
-#	else /* MB_CP_VC */
-#		ifdef MB_CP_BORLANDC
-#			define mb_stricmp stricmp
-#		elif defined MB_CP_PELLESC
-#			define mb_stricmp _stricmp
-#		else
-#			define mb_stricmp strcasecmp
-#		endif
-#	endif /* MB_CP_VC */
+#	elif defined MB_CP_BORLANDC
+#		define mb_stricmp stricmp
+#	elif defined MB_CP_PELLESC
+#		define mb_stricmp _stricmp
+#	else
+#		define mb_stricmp strcasecmp
+#	endif
 #endif /* mb_stricmp */
 
 #ifndef mb_assert

core/my_basic.h

@@ -468,11 +468,10 @@ static int _append_line(const char* txt) {
 		code->lines = (char**)realloc(code->lines, sizeof(char*) * code->size);
 	}
 	result = l = (int)strlen(txt);
-	buf = (char*)malloc(l + 2);
+	buf = (char*)malloc(l + 1);
 	_CHECK_MEM(buf);
 	memcpy(buf, txt, l);
-	buf[l] = '\n';
-	buf[l + 1] = '\0';
+	buf[l] = '\0';
 	code->lines[code->count++] = buf;
 
 	return result;