From 03410ed4a2a7194a136c18879583b5e1dd80c17a Mon Sep 17 00:00:00 2001 From: Lioncache Date: Sat, 6 Sep 2025 10:51:00 -0400 Subject: [PATCH 1/3] config_generator: Remove unnecessary format() in print_parse_jsonloader_options() This format call essentially does nothing since it has no specifier. We can also fix up the indentation of the else case too, for consistency. --- FEXCore/Scripts/config_generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FEXCore/Scripts/config_generator.py b/FEXCore/Scripts/config_generator.py index 0e345e638..ab349f60e 100644 --- a/FEXCore/Scripts/config_generator.py +++ b/FEXCore/Scripts/config_generator.py @@ -474,8 +474,8 @@ def print_parse_jsonloader_options(options): output_argloader.write("\tAppendStrArrayValue(KeyOption, ConfigString);\n") output_argloader.write("}\n") assert op_key is not None, "No options found in JSONLOADER" - output_argloader.write("else {{\n".format(op_key)) - output_argloader.write("Set(KeyOption, ConfigString);\n") + output_argloader.write("else {\n") + output_argloader.write("\tSet(KeyOption, ConfigString);\n") output_argloader.write("}\n") output_argloader.write("#endif\n") From 675956c92dd9a9125201836a4631479256ce6272 Mon Sep 17 00:00:00 2001 From: Lioncache Date: Sat, 6 Sep 2025 10:57:29 -0400 Subject: [PATCH 2/3] config_generator: Indent ENVLOADER conditional bodies Makes the indentation consistent with the rest of the generated file. --- FEXCore/Scripts/config_generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FEXCore/Scripts/config_generator.py b/FEXCore/Scripts/config_generator.py index ab349f60e..3b49ee0e0 100644 --- a/FEXCore/Scripts/config_generator.py +++ b/FEXCore/Scripts/config_generator.py @@ -447,13 +447,13 @@ def print_parse_envloader_options(options): value_type = op_vals["Type"] if (value_type == "strenum"): output_argloader.write("else if (Key == \"FEX_{0}\") {{\n".format(op_key.upper())) - output_argloader.write("Value = FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, Value_View);\n".format(op_key, op_key, op_key)) + output_argloader.write("\tValue = FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, Value_View);\n".format(op_key, op_key, op_key)) output_argloader.write("}\n") if ("ArgumentHandler" in op_vals): conversion_func = "FEXCore::Config::Handler::{0}".format(op_vals["ArgumentHandler"]) output_argloader.write("else if (Key == \"FEX_{0}\") {{\n".format(op_key.upper())) - output_argloader.write("Value = {0}(Value_View);\n".format(conversion_func)) + output_argloader.write("\tValue = {0}(Value_View);\n".format(conversion_func)) output_argloader.write("}\n") output_argloader.write("#endif\n") From 272d2747cdab9b6ae8b070885f063ef9b18e5d3d Mon Sep 17 00:00:00 2001 From: Lioncache Date: Sat, 6 Sep 2025 11:18:36 -0400 Subject: [PATCH 3/3] config_generator: Remove excess formatting arguments for EnumParser handling Each instance had one more argument than necessary. --- FEXCore/Scripts/config_generator.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FEXCore/Scripts/config_generator.py b/FEXCore/Scripts/config_generator.py index 3b49ee0e0..ae77e019d 100644 --- a/FEXCore/Scripts/config_generator.py +++ b/FEXCore/Scripts/config_generator.py @@ -418,7 +418,7 @@ def print_parse_argloader_options(options): if (value_type == "strenum"): output_argloader.write("\tfextl::string UserValue = Options[\"{0}\"];\n".format(op_key)) - output_argloader.write("\tSet(FEXCore::Config::ConfigOption::CONFIG_{}, FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, UserValue));\n".format(op_key.upper(), op_key, op_key, op_key)) + output_argloader.write("\tSet(FEXCore::Config::ConfigOption::CONFIG_{}, FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, UserValue));\n".format(op_key.upper(), op_key, op_key)) elif (value_type == "strarray"): # these need a bit more help output_argloader.write("\tauto Array = Options.all(\"{0}\");\n".format(op_key)) @@ -447,7 +447,7 @@ def print_parse_envloader_options(options): value_type = op_vals["Type"] if (value_type == "strenum"): output_argloader.write("else if (Key == \"FEX_{0}\") {{\n".format(op_key.upper())) - output_argloader.write("\tValue = FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, Value_View);\n".format(op_key, op_key, op_key)) + output_argloader.write("\tValue = FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, Value_View);\n".format(op_key, op_key)) output_argloader.write("}\n") if ("ArgumentHandler" in op_vals): @@ -467,7 +467,7 @@ def print_parse_jsonloader_options(options): value_type = op_vals["Type"] if (value_type == "strenum"): output_argloader.write("else if (KeyName == \"{0}\") {{\n".format(op_key)) - output_argloader.write("\tSet(KeyOption, FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, Value_View));\n".format(op_key, op_key, op_key)) + output_argloader.write("\tSet(KeyOption, FEXCore::Config::EnumParser(FEXCore::Config::{}_EnumPairs, Value_View));\n".format(op_key, op_key)) output_argloader.write("}\n") elif (value_type == "strarray"): output_argloader.write("else if (KeyName == \"{0}\") {{\n".format(op_key))