This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch devs/dimmus/meson
in repository efl.
View the commit online.
commit 07bc2a9214f37b5e0a5797e63cb978d8a5da6f4a
Author: Carsten Haitzler <ras...@rasterman.com>
AuthorDate: Sat May 3 15:02:45 2025 +0100
emrbyo - new gcc 15 breaks builds - new keyword constexpr
gcc 15 default policy of breaking existing code. adapt.
---
src/bin/embryo/embryo_cc_sc.h | 2 +-
src/bin/embryo/embryo_cc_sc1.c | 28 ++++++++++++++--------------
src/bin/embryo/embryo_cc_sc2.c | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/bin/embryo/embryo_cc_sc.h b/src/bin/embryo/embryo_cc_sc.h
index f6271afec0..19fc084501 100644
--- a/src/bin/embryo/embryo_cc_sc.h
+++ b/src/bin/embryo/embryo_cc_sc.h
@@ -432,7 +432,7 @@ symbol *fetchfunc(char *name, int tag);
char *operator_symname(char *symname, char *opername, int tag1,
int tag2, int numtags, int resulttag);
char *funcdisplayname(char *dest, char *funcname);
-int constexpr(cell * val, int *tag);
+int constexpress(cell * val, int *tag);
constvalue *append_constval(constvalue * table, char *name, cell val,
short index);
constvalue *find_constval(constvalue * table, char *name, short index);
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 9fbeb4dcf0..4cc0da293f 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -1513,7 +1513,7 @@ init(int ident, int *tag)
} /* if */
*tag = 0;
}
- else if (constexpr(&i, tag))
+ else if (constexpress(&i, tag))
{
stowlit(i); /* store _expression_ result in literal table */
} /* if */
@@ -1532,7 +1532,7 @@ needsub(int *tag)
*tag = 0;
if (matchtoken(']')) /* we've already seen "[" */
return 0; /* null size (like "char msg[]") */
- constexpr(&val, tag); /* get value (must be constant _expression_) */
+ constexpress(&val, tag); /* get value (must be constant _expression_) */
if (val < 0)
{
error(9); /* negative array size is invalid; assumed zero */
@@ -1561,7 +1561,7 @@ decl_const(int vclass)
strncpy(constname, str, sizeof(constname) - 1); /* save symbol name */
constname[sizeof(constname) - 1] = 0;
needtoken('=');
- constexpr(&val, &exprtag); /* get value */
+ constexpress(&val, &exprtag); /* get value */
needtoken(tTERM);
/* add_constant() checks for duplicate definitions */
if (!matchtag(tag, exprtag, FALSE))
@@ -1627,15 +1627,15 @@ decl_enum(int vclass)
{
if (matchtoken(taADD))
{
- constexpr(&increment, NULL);
+ constexpress(&increment, NULL);
}
else if (matchtoken(taMULT))
{
- constexpr(&multiplier, NULL);
+ constexpress(&multiplier, NULL);
}
else if (matchtoken(taSHL))
{
- constexpr(&lexval, NULL);
+ constexpress(&lexval, NULL);
while (lexval-- > 0)
multiplier *= 2;
} /* if */
@@ -1659,9 +1659,9 @@ decl_enum(int vclass)
constname[sNAMEMAX] = 0;
size = increment; /* default increment of 'val' */
if (tok == tLABEL || matchtoken(':'))
- constexpr(&size, NULL); /* get size */
+ constexpress(&size, NULL); /* get size */
if (matchtoken('='))
- constexpr(&enumvalue, NULL); /* get value */
+ constexpress(&enumvalue, NULL); /* get value */
/* add_constant() checks whether a variable (global or local) or
* a constant with the same name already exists */
add_constant(constname, enumvalue, vclass, tag);
@@ -2137,7 +2137,7 @@ funcstub(int native)
}
else
{
- constexpr(&val, NULL);
+ constexpress(&val, NULL);
sym->addr = val;
/*
* ?? Must mark this address, so that it won't be generated again
@@ -2758,7 +2758,7 @@ doarg(char *name, int ident, int offset, int tags[], int numtags,
}
else
{
- constexpr(&arg->defvalue.val, &arg->defvalue_tag);
+ constexpress(&arg->defvalue.val, &arg->defvalue_tag);
assert(numtags > 0);
if (!matchtag(tags[0], arg->defvalue_tag, TRUE))
error(213); /* tagname mismatch */
@@ -3391,10 +3391,10 @@ doexpr(int comma, int chkeffect, int allowarray, int mark_endexpr,
} /* if */
}
-/* constexpr
+/* constexpress
*/
int
-constexpr(cell * val, int *tag)
+constexpress(cell * val, int *tag)
{
int constant, idx;
cell cidx;
@@ -3728,7 +3728,7 @@ doswitch(void)
* parse all expressions until that special token.
*/
- constexpr(&val, NULL);
+ constexpress(&val, NULL);
/* Search the insertion point (the table is kept in sorted
* order, so that advanced abstract machines can sift the
* case table with a binary search). Check for duplicate
@@ -3753,7 +3753,7 @@ doswitch(void)
{
cell end;
- constexpr(&end, NULL);
+ constexpress(&end, NULL);
if (end <= val)
error(50); /* invalid range */
while (++val <= end)
diff --git a/src/bin/embryo/embryo_cc_sc2.c b/src/bin/embryo/embryo_cc_sc2.c
index 5a51655a54..f0416e86c9 100644
--- a/src/bin/embryo/embryo_cc_sc2.c
+++ b/src/bin/embryo/embryo_cc_sc2.c
@@ -742,7 +742,7 @@ preproc_expr(cell * val, int *tag)
term = strchr(pline, '\0');
assert(term != NULL);
chrcat(pline, PREPROC_TERM); /* the "DEL" code (see SC.H) */
- result = constexpr(val, tag); /* get value (or 0 on error) */
+ result = constexpress(val, tag); /* get value (or 0 on error) */
*term = '\0'; /* erase the token (if still present) */
lexclr(FALSE); /* clear any "pushed" tokens */
return result;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
