Real set variable

Test/TestParser/TestVariables/TestVariables.gd

@@ -11,7 +11,7 @@ func test_variables():
 
 	await wait_execute_script_finished(file_base_name)
 
-	assert_variable("a", TYPE_INT, 1)
+	assert_variable("a", TYPE_INT, 2)
 
 	assert_variable("b", TYPE_FLOAT, 2.5)
 
@@ -25,4 +25,6 @@ func test_variables():
 
 	assert_variable("e", TYPE_INT, Rakugo.get_variable("Sy.life"))
 
-	assert_eq(Rakugo.get_variable("f"), null)
+	assert_variable("e", TYPE_INT, 4)
+
+	assert_eq(Rakugo.get_variable("g"), null)

Test/TestParser/TestVariables/TestVariables.rk

@@ -1,7 +1,12 @@
-a = 1
-b = 2.5
+a = 1 + 1
+b = 5/2
 c = "Hello, world !"
 d = a
 character Sy "Sylvie"
 Sy.life = 5
-e = Sy.life
+e = Sy.life
+f = 2
+f += 2
+f *= 2
+f /= 2
+

addons/Rakugo/lib/systems/Executer.gd

@@ -17,8 +17,7 @@ var regex := {
 }
 
 var regex_cache := {}
-
-var menu_jump_index:int
+var menu_jump_index: int
 
 func _init():
 	for key in regex:
@@ -88,7 +87,6 @@ func do_execute_script_end(parameters:Dictionary):
 	threads.erase(current_thread.get_id())
 
 	current_thread = null
-
 	current_semaphore = null
 
 func do_execute_jump(jump_label:String, labels:Dictionary) -> int:
@@ -152,7 +150,9 @@ func do_execute_script(parameters:Dictionary):
 					var values = []
 
 					for var_name in line[3]:
-						var var_ = Rakugo.get_variable(var_name)
+						var var_ = null
+						if Rakugo.has_variable(var_name):
+							var_ = Rakugo.get_variable(var_name)
 
 						if !var_:
 							parameters["error"] = "Executer::do_execute_script::JUMP, can not get variable :" + var_name
@@ -167,6 +167,7 @@ func do_execute_script(parameters:Dictionary):
 						parameters["error"] = "Executer::do_execute_script::JUMP, failed to execute expression : " + result.get_string("expression")
 						parameters["stop"] = true
 						break
+
 				else:
 					can_jump = true
 
@@ -238,37 +239,64 @@ func do_execute_script(parameters:Dictionary):
 						break
 
 					# remove 1 because we add 1 at the end of the loop
-					index -= 1	
+					index -= 1
+
 				elif !(menu_jump_index in [0, menu_choices.size() - 1]):
 					parameters["error"] = "Executer::do_execute_script::MENU, menu_jump_index out of range: " + str(menu_jump_index) + " >= " + str(menu_choices.size())
 					parameters["stop"] = true
 					break
 
 			"SET_VARIABLE":
 				var rvar_name = result.get_string("rvar_name")
-				var text = result.get_string("text")
+				var operator = result.get_string("operator")
+				var final_value = null
+
+				var values = []
+				for var_name in line[3]:
+					var var_ = Rakugo.get_variable(var_name)
+
+					if !var_:
+						parameters["error"] = "Executer::do_execute_script::SET_VARIABLE, can not get variable :" + var_name
+						parameters["stop"] = true
+						break
+
+					values.push_back(var_)
+
+				final_value = line[2].execute(values)
 
-				var value
+				if line[2].has_execute_failed():
+					parameters["error"] = "Executer::do_execute_script::SET_VARIABLE, failed to execute expression : " + result.get_string("expression")
+					parameters["stop"] = true
+					break
 
-				if !rvar_name.is_empty():
-					value = Rakugo.get_variable(rvar_name)
+				if operator != "=":
+					if Rakugo.has_variable(rvar_name):
+						var org_value = Rakugo.get_variable(rvar_name)
+
+						match operator:
+							"+=":
+								Rakugo.set_variable(rvar_name, org_value + final_value)
+
+							"-=":
+								Rakugo.set_variable(rvar_name, org_value - final_value)
+
+							"*=":
+								Rakugo.set_variable(rvar_name, org_value * final_value)
+
+							"/=":
+								Rakugo.set_variable(rvar_name, org_value / final_value)
+
+							"%=":
+								Rakugo.set_variable(rvar_name, org_value % final_value)
 
-					if !value:
-						parameters["error"] = "Executer::do_execute_script::SET_VARIABLE, can not get variable :" + rvar_name
+					else:
+						parameters["error"] = "Executer::do_execute_script::SET_VARIABLE, variable not found : " + rvar_name
 						parameters["stop"] = true
 						break
-
-				elif !text.is_empty():
-					value = remove_double_quotes(text)
-				else:
-					value = result.get_string("number")
-
-					if value.is_valid_int():
-						value = int(value)
-					else:
-						value = float(value)
-
-				Rakugo.set_variable(result.get_string("lvar_name"), value)
+
+				# if operator is "=" or if the variable does not exist
+				Rakugo.set_variable(rvar_name, final_value)
+
 			_:
 				Rakugo.sg_custom_regex.emit(line[0], result)
 

addons/Rakugo/lib/systems/Parser.gd

@@ -41,6 +41,7 @@ var Regex := {
 	NUMERIC = "-?[0-9]\\.?[0-9]*",
 	STRING = "\".*\"",
 	VARIABLE = "((?<char_tag>{NAME})\\.)?(?<var_name>{NAME})",
+	ASSIGNMENT = "(=|\\+=|\\-=|\\*=|\\/=|\\%=)",
 #	MULTILINE_STRING = "\"\"\"(?<string>.*)\"\"\"",
 }
 
@@ -65,13 +66,7 @@ var parser_regex :={
 	# jump label
 	JUMP = "^jump (?<label>{NAME})( if (?<expression>.+))?$",
 	# for setting Rakugo variables
-	SET_VARIABLE = "^(?<lvar_name>{VARIABLE}) = ((?<text>{STRING})|(?<number>{NUMERIC})|(?<rvar_name>{VARIABLE}))$",
-	# $ some_gd_script_code
-#	IN_LINE_GDSCRIPT = "^\\$.*",
-	# gdscript:
-#	GDSCRIPT_BLOCK = "^gdscript:",
-#	TRANSLATION = "\\[TR:(?<tr>.*?)]\\",
-#	CONDITION = "(if|elif) (?<condition>.*)",
+	SET_VARIABLE = "^(?<rvar_name>{VARIABLE})\\s*(?<operator>{ASSIGNMENT})\\s*(?<expression>.+)$",
 }
 
 var other_regex :={
@@ -107,7 +102,9 @@ func _init():
 
 	for key in other_regex:
 		add_regex(key, other_regex[key], other_cache, "Parser, _init, failed " + key)
-
+
+	# prints("SET_VARIABLE", regex_cache["SET_VARIABLE"]. get_pattern())
+
 	add_regex("VARIABLE", Regex["VARIABLE"], other_cache, "Parser, _init, failed VARIABLE")
 
 func count_indent(s:String) -> int:
@@ -124,19 +121,42 @@ func count_indent(s:String) -> int:
 
 	return ret
 
+func get_vars_in_expression(str_expression:String):
+	var sub_results = other_cache["VARIABLE"].search_all(str_expression)
+	var vars = []
+
+	# Expression does not like '.'
+	var vars_expression = []
+
+	for sub_result in sub_results:
+		var sub_result_str = sub_result.strings[0]
+
+		if !vars.has(sub_result_str):
+			vars.push_back(sub_result_str)
+
+		var var_name_expr = sub_result.get_string("char_tag")
+
+		if !var_name_expr.is_empty():
+			var_name_expr += "_" + sub_result.get_string("var_name")
+
+			str_expression = str_expression.replace(sub_result_str, var_name_expr)
+		else:
+			var_name_expr = sub_result.get_string("var_name")
+
+		if !vars_expression.has(var_name_expr):
+			vars_expression.push_back(var_name_expr)
+
+	return [vars_expression, vars]
+
 func parse_script(lines:PackedStringArray) -> Dictionary:
 	if lines.is_empty():
 		push_error("Parser, parse_script : lines is empty !")
 		return {}
 
 	var parse_array:Array
-
 	var labels:Dictionary
-
 	var indent_count:int
-
 	var menu_choices
-
 	var current_menu_result
 
 	state = State.Normal
@@ -203,42 +223,33 @@ func parse_script(lines:PackedStringArray) -> Dictionary:
 						if str_expression.is_empty():
 							parse_array.push_back([key, result])
 							break
+
+						var vars = get_vars_in_expression(str_expression)
+						var expression = Expression.new()
+						if expression.parse(str_expression, vars[0]) != OK:
+							push_error("Parser: Error on line: " + str(i+1) + ", " + expression.get_error_text())
+							return {}
 
-						var sub_results = other_cache["VARIABLE"].search_all(str_expression)
-
-						var vars = []
-
-						# Expression does not like '.'
-						var vars_expression = []
-
-						for sub_result in sub_results:
-							var sub_result_str = sub_result.strings[0]
-
-							if !vars.has(sub_result_str):
-								vars.push_back(sub_result_str)
-
-							var var_name_expr = sub_result.get_string("char_tag")
-
-							if !var_name_expr.is_empty():
-								var_name_expr += "_" + sub_result.get_string("var_name")
+						parse_array.push_back([key, result, expression, vars[1]])
 
-								str_expression = str_expression.replace(sub_result_str, var_name_expr)
-							else:
-								var_name_expr = sub_result.get_string("var_name")
-
-							if !vars_expression.has(var_name_expr):
-								vars_expression.push_back(var_name_expr)
+					"SET_VARIABLE":
+						var str_expression:String = result.get_string("expression")
 
+						if str_expression.is_empty():
+							parse_array.push_back([key, result])
+							break
+
+						var vars = get_vars_in_expression(str_expression)
 						var expression = Expression.new()
-
-						if expression.parse(str_expression, vars_expression) != OK:
+						if expression.parse(str_expression, vars[0]) != OK:
 							push_error("Parser: Error on line: " + str(i+1) + ", " + expression.get_error_text())
 							return {}
 
-						parse_array.push_back([key, result, expression, vars])
+						parse_array.push_back([key, result, expression, vars[1]])
 
 					_:
 						parse_array.push_back([key, result])
+
 				break
 
 		if (not have_find_key):