Skip to content

Fix Global initialization and designators order in def_glob macro #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abelstuker wants to merge 2 commits into
base: main
Choose a base branch
from
+33 −21
Open

Fix Global initialization and designators order in def_glob macro #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0a8d5d
Fix global init designators and their order
abelstuker Apr 27, 2026
f5b44fb
Fix def_glob global name
abelstuker Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/Primitives/arduino.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,13 @@ int resolve_isr(int pin) {

int global_index = 0;

#define def_glob(name, type, mut, init_value) \
StackValue name##_sv{.value_type = type, init_value}; \
Global name = { \
.mutability = mut, .import_field = #name, .value = &name##_sv};
#define def_glob(name, type, mut, init_val) \
StackValue name##_sv = {.value_type = type, .value = {init_val}}; \
Global name = {.export_name = nullptr, \
.import_module = nullptr, \
.import_field = #name, \
.mutability = mut, \
.value = &name##_sv};

#define install_global(global_name) \
{ \
Expand Down
11 changes: 7 additions & 4 deletions src/Primitives/emulated.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@ int global_index = 0;

double sensor_emu = 0;

#define def_glob(name, type, mut, init_value) \
StackValue name##_sv{.value_type = type, init_value}; \
Global name = { \
.mutability = mut, .import_field = #name, .value = &name##_sv};
#define def_glob(name, type, mut, init_val) \
StackValue name##_sv = {.value_type = type, .value = {init_val}}; \
Global name = {.export_name = nullptr, \
.import_module = nullptr, \
.import_field = #name, \
.mutability = mut, \
.value = &name##_sv};

#define install_global(global_name) \
{ \
Expand Down
11 changes: 7 additions & 4 deletions src/Primitives/idf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@

int global_index = 0;

#define def_glob(name, type, mut, init_value) \
StackValue name##_sv{.value_type = type, init_value}; \
Global name = { \
.mutability = mut, .import_field = #name, .value = &name##_sv};
#define def_glob(name, type, mut, init_val) \
StackValue name##_sv = {.value_type = type, .value = {init_val}}; \
Global name = {.export_name = nullptr, \
.import_module = nullptr, \
.import_field = #name, \
.mutability = mut, \
.value = &name##_sv};

#define install_global(global_name) \
{ \
Expand Down
11 changes: 7 additions & 4 deletions src/Primitives/zephyr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@

int global_index = 0;

#define def_glob(name, type, mut, init_value) \
StackValue name##_sv{.value_type = type, init_value}; \
Global name = { \
.mutability = mut, .import_field = #name, .value = &name##_sv};
#define def_glob(name, type, mut, init_val) \
StackValue name##_sv = {.value_type = type, .value = {init_val}}; \
Global name = {.export_name = nullptr, \
.import_module = nullptr, \
.import_field = #name, \
.mutability = mut, \
.value = &name##_sv};

#define install_global(global_name) \
{ \
Expand Down
10 changes: 5 additions & 5 deletions src/WARDuino/internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ typedef struct Memory {
} Memory;

typedef struct Global {
char *export_name; // export name of the global
char *import_module; // import module name
char *import_field; // import field name
bool mutability; // 0: immutable, 1: mutable
StackValue *value; // current value
char *export_name; // export name of the global
char *import_module; // import module name
const char *import_field; // import field name
bool mutability; // 0: immutable, 1: mutable
StackValue *value; // current value
} Global;

typedef struct Options {
Expand Down
Loading