From a6dabae7ea06b12620dd85023bb9aab1a795df55 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 16 Dec 2025 11:00:51 +0100 Subject: [PATCH] Improve alang enum handling --- base/tools/amake/alang.js | 9 ++++++--- base/tools/amake/alang.ts | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/base/tools/amake/alang.js b/base/tools/amake/alang.js index 5c57f992..56cbe8eb 100644 --- a/base/tools/amake/alang.js +++ b/base/tools/amake/alang.js @@ -390,11 +390,12 @@ function read_type() { // Cursor at ":" } function enum_access(s) { - // Turn enum_t.VALUE into enum_t_VALUE + // Turn enum_t.VALUE into ENUM_VALUE if (s.indexOf("_t.") > -1) { for (let e of enums) { if (s.indexOf(e) > -1) { - s = s.replaceAll(".", "_"); + s = s.replace("_t.", "_"); + s = s.toUpperCase(); break; } } @@ -1159,7 +1160,9 @@ function write_enums() { break; } - out("\t" + enum_name + "_" + token); + let enum_base = strip(enum_name, 2); // _t + enum_base = enum_base.toUpperCase(); + out("\t" + enum_base + "_" + token); pos++; // = or , token = get_token(); diff --git a/base/tools/amake/alang.ts b/base/tools/amake/alang.ts index 484d0105..eaac42d4 100644 --- a/base/tools/amake/alang.ts +++ b/base/tools/amake/alang.ts @@ -390,12 +390,13 @@ function read_type(): string { // Cursor at ":" } function enum_access(s: string): string { - // Turn enum_t.VALUE into enum_t_VALUE + // Turn enum_t.VALUE into ENUM_VALUE if (string_index_of(s, "_t.") > -1) { for (let i: i32 = 0; i < enums.length; ++i) { let e: string = enums[i]; if (string_index_of(s, e) > -1) { - s = string_replace_all(s, ".", "_"); + s = string_replace_all(s, "_t.", "_"); + s = to_upper_case(s); break; } } @@ -1181,7 +1182,9 @@ function write_enums() { break; } - out("\t" + enum_name + "_" + token); + let enum_base: string = strip(enum_name, 2); // _t + enum_base = to_upper_case(enum_base); + out("\t" + enum_base + "_" + token); pos++; // = or , token = get_token();