Miroirs/aocla
1
0
Fork 0
mirror of https://github.com/antirez/aocla synced 2024-12-27 09:58:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simpler C procedure prototype.

Browse source
This commit is contained in:
antirez 2022-12-21 08:26:54 +01:00
parent dcf2fd3d9b
commit 9465e08d20
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
aocla.c
View file

@ -44,7 +44,7 @@ struct aoclactx;
typedef struct aproc { typedef struct aproc {
const char *name; const char *name;
obj *proc; /* If not NULL it's an Aocla procedure (list object). */ obj *proc; /* If not NULL it's an Aocla procedure (list object). */
int (*cproc)(const char *, struct aoclactx *); /* C procedure. */ int (*cproc)(struct aoclactx *); /* C procedure. */
struct aproc *next; struct aproc *next;
} aproc; } aproc;
@ -478,7 +478,7 @@ int eval(aoclactx *ctx, obj *l) {
/* Call a procedure implemented in C. */ /* Call a procedure implemented in C. */
aproc *prev = ctx->frame->curproc; aproc *prev = ctx->frame->curproc;
ctx->frame->curproc = proc; ctx->frame->curproc = proc;
int err = proc->cproc(o->str.ptr,ctx); int err = proc->cproc(ctx);
ctx->frame->curproc = prev; ctx->frame->curproc = prev;
if (err) return err; if (err) return err;
} else { } else {
@ -556,7 +556,7 @@ aproc *newProc(aoclactx *ctx, const char *name) {
* not be null, depending on the fact the new procedure is implemented as * not be null, depending on the fact the new procedure is implemented as
* a C function or natively in Aocla. If the procedure already exists it * a C function or natively in Aocla. If the procedure already exists it
* is replaced with the new one. */ * is replaced with the new one. */
void addProc(aoclactx *ctx, const char *name, int(*cproc)(const char *, aoclactx *), obj *list) { void addProc(aoclactx *ctx, const char *name, int(*cproc)(aoclactx *), obj *list) {
assert((cproc != NULL) + (list != NULL) == 1); assert((cproc != NULL) + (list != NULL) == 1);
aproc *ap = lookupProc(ctx, name); aproc *ap = lookupProc(ctx, name);
if (ap) { if (ap) {
@ -581,12 +581,13 @@ int addProcString(aoclactx *ctx, const char *name, const char *prog) {
} }
/* Implements +, -, *, %, ... */ /* Implements +, -, *, %, ... */
int procBasicMath(const char *fname, aoclactx *ctx) { int procBasicMath(aoclactx *ctx) {
if (checkStackType(ctx,2,OBJ_TYPE_INT,OBJ_TYPE_INT)) return 1; if (checkStackType(ctx,2,OBJ_TYPE_INT,OBJ_TYPE_INT)) return 1;
obj *a = stackPop(ctx); obj *a = stackPop(ctx);
obj *b = stackPop(ctx); obj *b = stackPop(ctx);
int res; int res;
const char *fname = ctx->frame->curproc->name;
if (fname[0] == '+' && fname[1] == 0) res = a->i + b->i; if (fname[0] == '+' && fname[1] == 0) res = a->i + b->i;
if (fname[0] == '-' && fname[1] == 0) res = a->i - b->i; if (fname[0] == '-' && fname[1] == 0) res = a->i - b->i;
if (fname[0] == '*' && fname[1] == 0) res = a->i * b->i; if (fname[0] == '*' && fname[1] == 0) res = a->i * b->i;
@ -596,7 +597,7 @@ int procBasicMath(const char *fname, aoclactx *ctx) {
} }
/* Implements ==, >=, <=, !=. */ /* Implements ==, >=, <=, !=. */
int procCompare(const char *fname, aoclactx *ctx) { int procCompare(aoclactx *ctx) {
if (checkStackLen(ctx,2)) return 1; if (checkStackLen(ctx,2)) return 1;
obj *a = stackPop(ctx); obj *a = stackPop(ctx);
obj *b = stackPop(ctx); obj *b = stackPop(ctx);
@ -609,6 +610,7 @@ int procCompare(const char *fname, aoclactx *ctx) {
} }
int res; int res;
const char *fname = ctx->frame->curproc->name;
if (fname[1] == '=') { if (fname[1] == '=') {
switch(fname[0]) { switch(fname[0]) {
case '=': res = cmp == 0; break; case '=': res = cmp == 0; break;
@ -627,8 +629,7 @@ int procCompare(const char *fname, aoclactx *ctx) {
} }
/* Implements sort. Sorts a list in place. */ /* Implements sort. Sorts a list in place. */
int procSortList(const char *fname, aoclactx *ctx) { int procSortList(aoclactx *ctx) {
NOTUSED(fname);
if (checkStackType(ctx,1,OBJ_TYPE_LIST)) return 1; if (checkStackType(ctx,1,OBJ_TYPE_LIST)) return 1;
obj *l = stackPop(ctx); obj *l = stackPop(ctx);
l = getUnsharedObject(l); l = getUnsharedObject(l);
@ -639,8 +640,7 @@ int procSortList(const char *fname, aoclactx *ctx) {
/* "def" let Aocla define new procedures, binding a list to a /* "def" let Aocla define new procedures, binding a list to a
* symbol in the procedure table. */ * symbol in the procedure table. */
int procDef(const char *fname, aoclactx *ctx) { int procDef(aoclactx *ctx) {
NOTUSED(fname);
if (checkStackType(ctx,2,OBJ_TYPE_LIST,OBJ_TYPE_SYMBOL)) return 1; if (checkStackType(ctx,2,OBJ_TYPE_LIST,OBJ_TYPE_SYMBOL)) return 1;
obj *sym = stackPop(ctx); obj *sym = stackPop(ctx);
obj *code = stackPop(ctx); obj *code = stackPop(ctx);