Skip to content

fix failings builds in GCC15+ compilers #18

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
jurassicLizard wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix failings builds in GCC15+ compilers #18

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
4ad4d89
fix failings builds in GCC15+ compilers
jurassicLizard Jan 26, 2026
36aaca9
change nullptr back to NULL
jurassicLizard Jan 26, 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
6 changes: 3 additions & 3 deletions pcalc.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ list:
;


junk: IBUILTIN str { (*($1->u.iptr))($2->u.str) ; }
junk: IBUILTIN str { (*($1->u.iptr.func_str))($2->u.str) ; }
| IBUILTIN { }
| IBUILTIN VAR { (*($1->u.iptr))($2->u.val) ; }
| IBUILTIN expr { (*($1->u.iptr))($2) ; }
| IBUILTIN VAR { (*($1->u.iptr.func_dbl))($2->u.val) ; }
| IBUILTIN expr { (*($1->u.iptr.func_dbl))($2) ; }
| STR { printf("%s", $1->name);}
| STRVAR { printf("%s", $1->u.str);}
;
Expand Down
23 changes: 11 additions & 12 deletions symbol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CONSTS consts[] =
typedef struct
{
char *name ;
long double (*func)();
long double (*func)(long double);
}
BUILTINS;

Expand Down Expand Up @@ -80,29 +80,28 @@ BUILTINS builtins[] =
typedef struct
{
char *name ;
int (*ifunc)() ;
IFUNC_UNION ifunc ;
}
IBUILTINS;

IBUILTINS ibuiltins[] =

{

{"date", ddate},
{"print", print},
{"echo", echo},
{"_echo", echo_nl},
{"date", {ddate}},
{"print", {.func_dbl = print}},
{"echo", {echo}},
{"_echo", {echo_nl}},

{"DATE", ddate},
{"PRINT", print},
{"ECHO", echo},
{"_ECHO", echo_nl},
{"DATE", {ddate}},
{"PRINT", {.func_dbl = print}},
{"ECHO", {echo}},
{"_ECHO", {echo_nl}},

{NULL, (void *) 0}
{NULL, (void *) 0}
} ;



void init_sym(void)

{
Expand Down
10 changes: 8 additions & 2 deletions symbol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

/* -------- Macros: ------------------------------------------------------ */

typedef union
{
int (*func_str)(const char*);
int (*func_dbl)(long double);
} IFUNC_UNION;

typedef struct Symbol { /* symbol table entry */
char *name ;
short type ; /* VAR, BLTIN, UNDEF */
Expand All @@ -13,8 +19,8 @@ typedef struct Symbol { /* symbol table entry */
int ival; /* if VAR */
long long lval; /* if VAR */
long double val; /* if VAR */
long double (*ptr)(); /* if BUILTIN */
int (*iptr)(); /* if IBUILTIN */
long double (*ptr)(long double); /* if BUILTIN */
IFUNC_UNION iptr; /* if IBUILTIN */
} u ;
struct Symbol *next ;
} Symbol ;
Expand Down