fix function expand_module_String(options)

Author: kanasimi

_test suite/test.js

@@ -5813,7 +5813,7 @@ function test_wiki() {
 				var options = CeL.wiki.add_session_to_options(enwiki, { on_page_title: 'ABC', allow_promise: true });
 				return Promise.all([
 					'{{w|ABC}}{{w|ABC|DEF}}',
-					'{{str rightc |Lorem ipsum dolor sit amet |10}}',
+					'{{str right |Lorem ipsum dolor sit amet |10}}',
 					// [[w:en:Template:Str sub new]]
 					'{{str sub new|1234567890|3|7}}',
 					'{{str sub new|1234567890|3|-3}}',
@@ -5832,7 +5832,7 @@ function test_wiki() {
 				//console.trace(results);
 				var i = 0;
 				assert(['[[ABC]][[ABC|DEF]]', results[i++].toString()], 'CeL.wiki.expand_transclusion() using wiki.template_functions: {{w}}');
-				assert(['r sit amet', results[i++].toString()], 'CeL.wiki.expand_transclusion( {{str rightc}} )');
+				assert(['m dolor sit amet', results[i++].toString()], 'CeL.wiki.expand_transclusion( {{str right}} )');
 				// [[w:en:Template:Str sub new]]
 				assert(['34567', results[i++].toString()], 'CeL.wiki.expand_transclusion( {{str sub new ||+|+ }} )');
 				assert(['345678', results[i++].toString()], 'CeL.wiki.expand_transclusion( {{str sub new ||+|-}} )');

application/net/wiki/parser/evaluate.js

@@ -1982,7 +1982,9 @@ function module_code(library_namespace) {
 			expression = eval_expr(expression);
 			if (expression instanceof wiki_API.wiki_error)
 				return expression.toString();
-			token = get_parameter_String(expression ? 2 : 3) || '';
+			token = get_parameter_String(expression && expression !== '0' ? 2
+					: 3)
+					|| '';
 			token = wiki_API.trim_token(token);
 			// console.trace(token);
 			break;

application/net/wiki/parser/misc.js

@@ -1210,8 +1210,8 @@ function module_code(library_namespace) {
 				|| to_template_token.type !== 'transclusion'
 				|| !Array.isArray(from_template_token)
 				|| from_template_token.type !== 'transclusion') {
-			throw new Error(
-					'merge_template_parameters: Invalid template token!');
+			throw new Error('merge_template_parameters: '
+					+ 'Invalid template token!');
 			return;
 		}
 

application/net/wiki/template_functions/general_functions.js

@@ -622,6 +622,7 @@ function module_code(library_namespace) {
 		var parameters = token.parameters;
 		if (!(NO in parameters))
 			return;
+
 		var value = parameters[NO].toString();
 		if (/{{/.test(value)) {
 			var _value = wiki_API.expand_transclusion(value, options);
@@ -640,24 +641,33 @@ function module_code(library_namespace) {
 	// [[w:en:Module:String]]
 	function expand_module_String(options) {
 		/* const */var token = this;
+		var index = 1;
+		// 警告: 本函數中取用 get_parameter(NO) 必須嚴格按照 [[Module:String]]
+		// 的順序，且每一參數僅能取用一次。
 		function get_parameter(NO) {
-			return get_parameter_of_token(NO, token, options);
+			var parameter_value = get_parameter_of_token(NO, token, options);
+			if (parameter_value === undefined) {
+				// @see function str._getParameters @ [[Module:String]]
+				parameter_value = get_parameter_of_token(index++, token,
+						options);
+			}
+			return parameter_value;
 		}
 
 		switch (token.function_name) {
 		case 'len':
-			return (get_parameter('s') || get_parameter(1)).length;
+			return get_parameter('s').length;
 
 		case 'endswith':
-			return (get_parameter('source') || get_parameter(1))
-					.endsWith(get_parameter('pattern') || get_parameter(2)) ? 'yes'
-					: '';
+			var source = get_parameter('source');
+			var pattern = get_parameter('pattern');
+			return source.endsWith(pattern) ? 'yes' : '';
 
 		case 'replace':
-			var pattern = get_parameter('pattern') || get_parameter(2);
+			var source = get_parameter('source');
+			var pattern = get_parameter('pattern');
 			pattern = Lua_pattern_to_RegExp_pattern(pattern, 'g');
-			return (get_parameter('source') || get_parameter(1)).replace(
-					pattern, get_parameter('replace') || get_parameter(3));
+			return source.replace(pattern, get_parameter('replace'));
 
 		case 'sub':
 			// function str.sub( frame )