Rename fractal variable to token, matching token_type_e naming

This commit is contained in:
Madeline Busig 2025-02-17 20:03:49 -08:00
parent b2e2e575a7
commit 7def6da765

View File

@ -17,7 +17,7 @@ constexpr size_t g_max_concurrent_leafs = 1024;
constexpr size_t g_max_rules_basic = 16; constexpr size_t g_max_rules_basic = 16;
constexpr size_t g_max_rules_marking = 4; constexpr size_t g_max_rules_marking = 4;
using variable_id_t = uint32_t; using token_id_t = uint32_t;
using group_id_t = uint32_t; using group_id_t = uint32_t;
using weighted_group_id_t = uint32_t; using weighted_group_id_t = uint32_t;
@ -28,7 +28,7 @@ enum class token_type_e {
generate, generate,
}; };
struct variable_t { struct token_t {
token_type_e m_token = token_type_e::none; token_type_e m_token = token_type_e::none;
mtl::fixed m_value; mtl::fixed m_value;
}; };
@ -37,7 +37,7 @@ struct group_characteristic_t {
static constexpr size_t g_max_group_size = 32; static constexpr size_t g_max_group_size = 32;
uint32_t m_factor; // Number of groups generated in succession uint32_t m_factor; // Number of groups generated in succession
etl::vector<variable_id_t, g_max_group_size> m_variable_ids; etl::vector<token_id_t, g_max_group_size> m_token_ids;
}; };
struct marker_t { struct marker_t {
@ -74,12 +74,12 @@ struct weighted_group_t {
}; };
struct branch_rule_basic_t { struct branch_rule_basic_t {
variable_id_t m_match; token_id_t m_match;
weighted_group_id_t m_weighted_group; weighted_group_id_t m_weighted_group;
}; };
struct branch_rule_marking_t { struct branch_rule_marking_t {
variable_id_t m_match; token_id_t m_match;
uint32_t m_point_id; uint32_t m_point_id;
}; };