Merge pull request #283 from Jeremi360/true-false-v2

Add `true/false` keywords support PR v2

Author: Jeremi360

.gut_editor_config.json

@@ -33,12 +33,12 @@
  "post_run_script": "",
  "pre_run_script": "",
  "prefix": "Test",
- "selected": "TestFix273.gd",
+ "selected": "TestVariablesRk.gd",
  "should_exit": false,
  "should_exit_on_success": false,
  "should_maximize": false,
  "show_help": false,
  "suffix": ".gd",
  "tests": [],
- "unit_test_name": null
+ "unit_test_name": "test_variables"
 }

Test/TestParser/TestVariables/TestVariables.gd

@@ -27,9 +27,11 @@ func test_variables():
 
 	assert_variable("Sy.life", TYPE_INT, 10)
 
-	assert_eq(Rakugo.get_variable("g"), null)
+	assert_variable("boolean", TYPE_BOOL, true)
+	
+	assert_variable("boolean", TYPE_BOOL, false)
 
-func  test_variables_in_strings():
+func test_variables_in_strings():
 	var file_path = "res://Test/TestParser/TestVariables/TestDynamicVars.rk"
 
 	var file_base_name = get_file_base_name(file_path)

Test/TestParser/TestVariables/TestVariables.rk

@@ -8,7 +8,7 @@ a /= 1
 b += 1
 c += " world !"
 d -= 2
-Sy.life *= 2
 e = Sy.life
-f = 1
-f += "1"
+Sy.life *= 2
+boolean = true
+boolean = false

addons/Rakugo/Rakugo.gd

@@ -9,11 +9,11 @@ const save_folder = "application/addons/rakugo/save_folder"
 #Godot setting's strings
 const game_title = "application/config/name"
 
-const version := "2.3"
+const version := "2.3.1"
 
-const StoreManager = preload ("res://addons/Rakugo/lib/systems/StoreManager.gd")
-const Parser = preload ("res://addons/Rakugo/lib/systems/Parser.gd")
-const Executer = preload ("res://addons/Rakugo/lib/systems/Executer.gd")
+const StoreManager = preload("res://addons/Rakugo/lib/systems/StoreManager.gd")
+const Parser = preload("res://addons/Rakugo/lib/systems/Parser.gd")
+const Executer = preload("res://addons/Rakugo/lib/systems/Executer.gd")
 
 var waiting_step := false: get = is_waiting_step
 
@@ -203,9 +203,9 @@ func get_character_variable(character_tag: String, var_name: String):
 			(
 				"Rakugo character with tag "
 				+ character_tag
-				+ " does not have this variable: "
+				+" does not have this variable: "
 				+ var_name
-				+ ", returning null"
+				+", returning null"
 			)
 		)
 		push_error("Available variables are: " + str(character.keys()))
@@ -220,19 +220,19 @@ func get_character_variable(character_tag: String, var_name: String):
 func _ready():
 	var version = ProjectSettings.get_setting(game_version)
 	var title = ProjectSettings.get_setting(game_title)
-	get_window().set_title(title + " " + version)
+	get_window().set_title(title + " " + str(version))
 
 	var narrator_name = ProjectSettings.get_setting(narrator_name)
 	define_character("narrator", narrator_name)
 
 ## Save all variables, characters, script_name and last line readed on last executed script, in user://save/save_name/save.json file.
-func save_game(save_name: String="quick"):
+func save_game(save_name: String = "quick"):
 	mutex.lock()
 	store_manager.save_game(executer.get_current_thread_datas(), save_name)
 	mutex.unlock()
 
 ## Load all variables, characters, script_name and last line readed on last executed script, from user://save/save_name/save.json file if existed.
-func load_game(save_name:="quick"):
+func load_game(save_name := "quick"):
 	last_thread_datas = store_manager.load_game(save_name)
 	parse_script(last_thread_datas["path"])
 	sg_game_loaded.emit()
@@ -272,7 +272,7 @@ func parse_script(file_name: String) -> int:
 
 ## Executer
 ## Execute a script previously registered with parse_script.
-func execute_script(script_name: String, label_name: String="", index: int=0) -> int:
+func execute_script(script_name: String, label_name: String = "", index: int = 0) -> int:
 	var error = FAILED
 
 	mutex.lock()
@@ -292,7 +292,7 @@ func stop_last_script():
 	mutex.unlock()
 
 ## Do parse_script, if return OK then do execute_script.
-func parse_and_execute_script(file_name: String, label_name: String="") -> int:
+func parse_and_execute_script(file_name: String, label_name: String = "") -> int:
 	var error = FAILED
 
 	mutex.lock()

addons/Rakugo/lib/systems/Executer.gd

@@ -4,11 +4,11 @@ const jump_error = "Executer::do_execute_jump, can not jump to unknow label : "
 
 var stop_thread := false
 
-var current_thread:Thread
+var current_thread: Thread
 
-var current_semaphore:Semaphore
+var current_semaphore: Semaphore
 
-var threads:Dictionary
+var threads: Dictionary
 
 var regex := {
 	NAME = "[a-zA-Z][a-zA-Z_0-9]*",
@@ -18,7 +18,7 @@ var regex := {
 
 var regex_cache := {}
 
-var menu_jump_index:int
+var menu_jump_index: int
 
 func _init():
 	for key in regex:
@@ -34,7 +34,7 @@ func get_current_thread_datas() -> Dictionary:
 	if current_thread:
 		var dico = threads[current_thread.get_id()]
 
-		return {"file_base_name":dico["file_base_name"], "last_index":dico["last_index"]}
+		return {"file_base_name": dico["file_base_name"], "last_index": dico["last_index"]}
 
 	return {}
 
@@ -46,27 +46,27 @@ func stop_current_thread() -> int:
 		dico["semaphore"].post()
 	return OK
 
-func execute_script(parsed_script:Dictionary, label_name:String = "", index:int = 0) -> int:
+func execute_script(parsed_script: Dictionary, label_name: String = "", index: int = 0) -> int:
 	stop_current_thread()
 
 	current_thread = Thread.new()
 
 	current_semaphore = Semaphore.new()
 
 	var thread_parameters = {
-		"thread":current_thread,
-		"semaphore":current_semaphore,
-		"parsed_script":parsed_script,
-		"file_base_name":parsed_script["path"].get_file().get_basename(),
-		"stop":false
+		"thread": current_thread,
+		"semaphore": current_semaphore,
+		"parsed_script": parsed_script,
+		"file_base_name": parsed_script["path"].get_file().get_basename(),
+		"stop": false
 		}
 
 	if index > 0:
 		thread_parameters["last_index"] = index
 	elif !label_name.is_empty():
 		thread_parameters["label_name"] = label_name
 
-	if current_thread.start(Callable(self,"do_execute_script").bind(thread_parameters)) != OK:
+	if current_thread.start(Callable(self, "do_execute_script").bind(thread_parameters)) != OK:
 		threads.erase(current_thread.get_id())
 
 		current_thread = null
@@ -76,7 +76,7 @@ func execute_script(parsed_script:Dictionary, label_name:String = "", index:int
 		return FAILED
 	return OK
 
-func do_execute_script_end(parameters:Dictionary):
+func do_execute_script_end(parameters: Dictionary):
 	parameters["thread"].wait_to_finish()
 
 	if parameters.has("error"):
@@ -91,13 +91,13 @@ func do_execute_script_end(parameters:Dictionary):
 
 	current_semaphore = null
 
-func do_execute_jump(jump_label:String, labels:Dictionary) -> int:
+func do_execute_jump(jump_label: String, labels: Dictionary) -> int:
 	if labels.has(jump_label):
 		return labels[jump_label]
 
 	return -1
 
-func do_execute_script(parameters:Dictionary):
+func do_execute_script(parameters: Dictionary):
 	var thread = parameters["thread"]
 
 	threads[thread.get_id()] = parameters
@@ -108,7 +108,7 @@ func do_execute_script(parameters:Dictionary):
 
 	Rakugo.call_thread_safe("send_execute_script_start", parameters["file_base_name"])
 
-	var parse_array:Array = parsed_script["parse_array"]
+	var parse_array: Array = parsed_script["parse_array"]
 
 	var labels = parsed_script["labels"]
 
@@ -133,11 +133,11 @@ func do_execute_script(parameters:Dictionary):
 	while !parameters["stop"] and index < parse_array.size():
 		parameters["last_index"] = index
 
-		var line:Array = parse_array[index]
+		var line: Array = parse_array[index]
 
 		var result = line[1]
 
-		match(line[0]):
+		match (line[0]):
 			"EXIT":
 				parameters["stop"] = true
 				break
@@ -200,9 +200,9 @@ func do_execute_script(parameters:Dictionary):
 				semephore.wait()
 
 			"MENU":
-				var menu_choices:PackedStringArray
+				var menu_choices: PackedStringArray
 
-				var menu_jumps:Dictionary
+				var menu_jumps: Dictionary
 
 				for i in line[2].size():
 					var menu_choice_result = line[2][i]
@@ -241,16 +241,18 @@ func do_execute_script(parameters:Dictionary):
 				var rvar_name = result["rvar_name"]
 				var text = result["text"]
 
-				var value
+				var value = null
 
 				if !rvar_name.is_empty():
 					value = Rakugo.get_variable(rvar_name)
-					
-					if !value:
+
+					if value == null:
 						parameters["error"] = "Executer::do_execute_script::SET_VARIABLE, can not get variable :" + rvar_name
 						parameters["stop"] = true
 						break
-						
+				
+				elif !result["bool"].is_empty():
+					value = result["bool"] == "true"
 				elif !text.is_empty():
 					value = text
 				else:
@@ -283,7 +285,7 @@ func do_execute_script(parameters:Dictionary):
 						parameters["stop"] = true
 						break
 
-					match(assignment):
+					match (assignment):
 						"+=":
 							value = lvalue + value