Support string (text.dat string ID) arguments to bbs.text() and system.text()

Currently, this is a slower way to look-up a text.dat string, but requires no
load/require of text.js and allows for a shorter syntax to get a text.dat
string, i.e. bbs.text("Quit") instead of bbs.text(bbs.text.Quit);

Although the bbs.text() ID lookup is cached, it's only marginally faster than
system.text() ID lookup, which is not cached and about 1/3 the speed of the
other methods of index to string lookup (in the MSVC-Windows build).

src/sbbs3/js_bbs.cpp

@@ -1502,10 +1502,20 @@ js_text(JSContext *cx, uintN argc, jsval *arglist)
 
 	JS_SET_RVAL(cx, arglist, JSVAL_NULL);
 
-	if(argc && JSVAL_IS_NUMBER(argv[0])) {
-		if(!JS_ValueToECMAUint32(cx,argv[0],&i))
-			return JS_FALSE;
-		if(JSVAL_IS_BOOLEAN(argv[1]))
+	if(argc > 0) {
+		if(JSVAL_IS_NUMBER(argv[0])) {
+			if(!JS_ValueToECMAUint32(cx,argv[0],&i))
+				return JS_FALSE;
+		} else {
+			JSString* js_str = JS_ValueToString(cx, argv[0]);
+			if(js_str == NULL)
+				return JS_FALSE;
+			char* id = nullptr;
+			JSSTRING_TO_MSTRING(cx, js_str, id, NULL);
+			i = sbbs->get_text_num(id) + 1;
+			free(id);
+		}
+		if(argc > 1 && JSVAL_IS_BOOLEAN(argv[1]))
 			dflt = JSVAL_TO_BOOLEAN(argv[1]);
 	}
 
@@ -4592,31 +4602,32 @@ static jsSyncMethodSpec js_bbs_functions[] = {
 	,320
 	},
 	/* text.dat */
-	{"text",			js_text,			1,	JSTYPE_STRING,	JSDOCSTR("index_number [,<i>bool</i> default_text=false]")
-	,JSDOCSTR("Return current text string (specified via 1-based string index number)"
-		"from text.dat/text.ini or replacement text or <i>null</i> upon error"
+	{"text",			js_text,			1,	JSTYPE_STRING,	JSDOCSTR("<i>number</i> index or <i>string</i> id [,<i>bool</i> default_text=false]")
+	,JSDOCSTR("Return current text string (specified via 1-based string index number or identifier string)"
+		"from <tt>text.dat</tt>, <tt>text.ini</tt> or replacement text or <i>null</i> upon error"
 		"<p>"
 		"<i>New in v3.20:</i><br>"
+		"Passing <i>string</i> identifier (<tt>id</tt>) for fast/cached look-up of text string by ID.<br>"
 		"Use <tt>bbs.text.<i>ID</i></tt> to obtain a text string index number from its corresponding ID (name).<br>"
 		"The <tt>default_text</tt> argument can be used to get a <i>default</i> language (i.e. <tt>text.dat</tt> file) string value."
 	)
 	,310
 	},
 	{"replace_text",	js_replace_text,	2,	JSTYPE_BOOLEAN,	JSDOCSTR("index_number, text")
-	,JSDOCSTR("Replace specified text.dat/text.ini string in memory")
+	,JSDOCSTR("Replace specified <tt>text.dat</tt> or <tt>text.ini</tt> string in memory")
 	,310
 	},
 	{"revert_text",		js_revert_text,		1,	JSTYPE_BOOLEAN,	JSDOCSTR("[<i>number</i> index=<i>all</i>]")
-	,JSDOCSTR("Revert specified text string to original <tt>text.dat/text.ini</tt> string; "
+	,JSDOCSTR("Revert specified text string to original <tt>text.dat</tt> or <tt>text.ini</tt> string; "
 		"if <i>index</i> unspecified, reverts all text lines")
 	,310
 	},
 	{"load_text",		js_load_text,		1,	JSTYPE_BOOLEAN,	JSDOCSTR("base_filename")
-	,JSDOCSTR("Load an alternate text.dat from ctrl directory, automatically appends '.dat' to basefilename")
+	,JSDOCSTR("Load an alternate text.dat from ctrl directory, automatically appends <tt>.dat</tt> to basefilename")
 	,310
 	},
 	{"load_user_text",	js_load_user_text,	0,	JSTYPE_BOOLEAN,	JSDOCSTR("")
-	,JSDOCSTR("Load text string from the user's selected language (ctrl/text.*.ini) file")
+	,JSDOCSTR("Load text string from the user's selected language (<tt>ctrl/text.*.ini</tt>) file")
 	,320
 	},
 	/* procedures */
@@ -4704,7 +4715,7 @@ static jsSyncMethodSpec js_bbs_functions[] = {
 	,JSDOCSTR("Clear the batch download or batch upload queue")
 	,320
 	},
-	{"batch_remove",	js_batch_remove,	2,	JSTYPE_NUMBER,	JSDOCSTR("boolean upload_queue, <i>string</i> filename_or_pattern or <i>number</i> index")
+	{"batch_remove",	js_batch_remove,	2,	JSTYPE_NUMBER,	JSDOCSTR("<i>bool</i> upload_queue, <i>string</i> filename_or_pattern or <i>number</i> index")
 	,JSDOCSTR("Remove one or more files from the batch download or batch upload queue")
 	,320
 	},

src/sbbs3/js_system.c

@@ -2194,8 +2194,18 @@ js_text(JSContext *cx, uintN argc, jsval *arglist)
 	if(sys->cfg == NULL || sys->cfg->text == NULL)
 		return JS_TRUE;
 
-	if(!JS_ValueToECMAUint32(cx, argv[0], &i))
-		return JS_FALSE;
+	if(JSVAL_IS_NUMBER(argv[0])) {
+		if(!JS_ValueToECMAUint32(cx, argv[0], &i))
+			return JS_FALSE;
+	} else {
+		JSString* js_str = JS_ValueToString(cx, argv[0]);
+		if(js_str == NULL)
+			return JS_FALSE;
+		char* id;
+		JSSTRING_TO_MSTRING(cx, js_str, id, NULL);
+		i = get_text_num(id) + 1; // Note: this is a non-caching look-up!
+		free(id);
+	}
 
 	if(i > 0  && i <= TOTAL_TEXT) {
 		JSString* js_str = JS_NewStringCopyZ(cx, sys->cfg->text[i - 1]);
@@ -2358,8 +2368,9 @@ static jsSyncMethodSpec js_system_functions[] = {
 		"returns <tt>true</tt> on success")
 	,315
 	},
-	{"text",			js_text,			1,	JSTYPE_STRING,	JSDOCSTR("index_number")
-	,JSDOCSTR("Return specified text string (see <tt>bbs.text()</tt> for details)")
+	{"text",			js_text,			1,	JSTYPE_STRING,	JSDOCSTR("<i>number</i> index or <i>string</i> id")
+	,JSDOCSTR("Return specified text string (see <tt>bbs.text()</tt> for details)<br>"
+		"The <i>string</i> id support was added in v3.20.")
 	,31802
 	},
 	{0}