address feedback

Author: MjnMixael

code/parse/sexp.cpp

@@ -889,7 +889,7 @@ sexp_ai_goal_link Sexp_ai_goal_links[] = {
 	{ AI_GOAL_REARM_REPAIR, OP_AI_REARM_REPAIR },
 };
 
-SCP_vector<enum_list> Dynamic_enums;
+SCP_vector<dynamic_sexp_enum_list> Dynamic_enums;
 
 void sexp_set_skybox_model_preload(const char *name); // taylor
 int Num_skybox_flags = 6;

code/parse/sexp.h

@@ -136,12 +136,12 @@ enum : int {
 	First_available_list_id
 };
 
-typedef struct enum_list {
+struct dynamic_sexp_enum_list {
 	SCP_string name;
 	SCP_vector<SCP_string> list;
-}enum_list;
+};
 
-extern SCP_vector<enum_list> Dynamic_enums;
+extern SCP_vector<dynamic_sexp_enum_list> Dynamic_enums;
 
 // Operand return types
 #define	OPR_NUMBER				1	// returns number

code/parse/sexp/LuaSEXP.cpp

@@ -532,7 +532,7 @@ void LuaSEXP::parseTable() {
 			SCP_string enum_name;
 			stuff_string(enum_name, F_NAME);
 
-			enum_list thisList;
+			dynamic_sexp_enum_list thisList;
 			thisList.name = enum_name;
 
 			SCP_vector<SCP_string> list_items;
@@ -543,7 +543,7 @@ void LuaSEXP::parseTable() {
 			}
 
 			if ((int)list_items.size() > 0) {
-				thisList.list = list_items;
+				thisList.list = std::move(list_items);
 			} else {
 				thisList.list.push_back("<none>");
 			}

code/parse/sexp/sexp_lookup.cpp

@@ -28,7 +28,7 @@ struct global_state {
 	int next_free_operator_id = First_available_operator_id;
 	int next_free_category_id = First_available_category_id;
 	int next_free_subcategory_id = First_available_subcategory_id;
-	int next_free_list_id = First_available_list_id;
+	int next_free_enum_list_id = First_available_list_id;
 };
 
 // Static initialization to avoid initialization order issues
@@ -202,7 +202,7 @@ DynamicSEXP* get_dynamic_sexp(int operator_const)
 int increment_list_id()
 {
 	auto& global = globals();
-	return global.next_free_list_id++;
+	return global.next_free_enum_list_id++;
 }
 int get_category_of_subcategory(int subcategory_id)
 	{

fred2/sexp_tree.cpp

@@ -3499,7 +3499,7 @@ int sexp_tree::query_default_argument_available(int op, int i)
 			return 0;
 
 		default:
-			if (Dynamic_enums.size() > 0) {
+			if (!Dynamic_enums.empty()) {
 				if ((type - First_available_list_id) < (int)Dynamic_enums.size()) {
 					return 1;
 				} else {
@@ -7362,16 +7362,16 @@ sexp_list_item* sexp_tree::check_for_dynamic_sexp_enum(int opf)
 
 	int item = opf - First_available_list_id;
 
-	if (item <= (int)Dynamic_enums.size()) {
+	if (item < (int)Dynamic_enums.size()) {
 
-		for (int i = 0; i < (int)Dynamic_enums[item].list.size(); i++) {
-			head.add_data(Dynamic_enums[item].list[i].c_str());
+		for (const SCP_string& enum_item : Dynamic_enums[item].list) {
+			head.add_data(enum_item.c_str());
 		}
 		return head.next;
 	} else {
 		// else if opf is invalid do this
 		UNREACHABLE("Unhandled SEXP argument type!"); // unknown OPF code
-		return NULL;
+		return nullptr;
 	}
 }