mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some lisp bugs

Browse source
This commit is contained in:
Jaroslav Kysela 2003-06-27 20:38:13 +00:00
parent 7a69ed8558
commit 1097c437a1
5 changed files with 48 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
alsalisp/alsalisp.c
View file

@ -65,7 +65,7 @@ static void interpret_filename(const char *file)
cfg.warning = warning; cfg.warning = warning;
cfg.debug = debug; cfg.debug = debug;
cfg.in = in; cfg.in = in;
cfg.out = cfg.vout = cfg.wout = cfg.dout = out; cfg.out = cfg.eout = cfg.vout = cfg.wout = cfg.dout = out;
cfg.root = root; cfg.root = root;
cfg.node = root; cfg.node = root;
err = alsa_lisp(&cfg); err = alsa_lisp(&cfg);
@ -73,7 +73,7 @@ static void interpret_filename(const char *file)
if (err < 0) if (err < 0)
fprintf(stderr, "alsa lisp returned error %i (%s)\n", err, strerror(err)); fprintf(stderr, "alsa lisp returned error %i (%s)\n", err, strerror(err));
else if (verbose) else if (verbose)
printf("file %s passed ok via alsa lisp interpreter", file); printf("file %s passed ok via alsa lisp interpreter\n", file);
snd_config_save(root, out); snd_config_save(root, out);
snd_output_close(out); snd_output_close(out);
snd_input_close(in); snd_input_close(in);

3
alsalisp/hello.lisp Normal file
View file

@ -0,0 +1,3 @@
(princ "Hello ALSA world\n")
(princ "One " 1 "\n")
(princ "Two " (+ 1 1) "\n")

1
include/alisp.h
View file

@ -25,6 +25,7 @@ struct alisp_cfg {
debug: 1; debug: 1;
snd_input_t *in; /* program code */ snd_input_t *in; /* program code */
snd_output_t *out; /* program output */ snd_output_t *out; /* program output */
snd_output_t *eout; /* error output */
snd_output_t *vout; /* verbose output */ snd_output_t *vout; /* verbose output */
snd_output_t *wout; /* warning output */ snd_output_t *wout; /* warning output */
snd_output_t *dout; /* debug output */ snd_output_t *dout; /* debug output */

55
src/alisp/alisp.c
View file

@ -64,6 +64,20 @@ static void lisp_verbose(struct alisp_instance *instance, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
snd_output_printf(instance->vout, "alisp: "); snd_output_printf(instance->vout, "alisp: ");
snd_output_vprintf(instance->vout, fmt, ap); snd_output_vprintf(instance->vout, fmt, ap);
snd_output_putc(instance->vout, '\n');
va_end(ap);
}
static void lisp_error(struct alisp_instance *instance, const char *fmt, ...)
{
va_list ap;
if (!instance->warning)
return;
va_start(ap, fmt);
snd_output_printf(instance->eout, "alisp error: ");
snd_output_vprintf(instance->eout, fmt, ap);
snd_output_putc(instance->eout, '\n');
va_end(ap); va_end(ap);
} }
@ -76,6 +90,7 @@ static void lisp_warn(struct alisp_instance *instance, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
snd_output_printf(instance->wout, "alisp warning: "); snd_output_printf(instance->wout, "alisp warning: ");
snd_output_vprintf(instance->wout, fmt, ap); snd_output_vprintf(instance->wout, fmt, ap);
snd_output_putc(instance->wout, '\n');
va_end(ap); va_end(ap);
} }
@ -88,6 +103,7 @@ static void lisp_debug(struct alisp_instance *instance, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
snd_output_printf(instance->dout, "alisp debug: "); snd_output_printf(instance->dout, "alisp debug: ");
snd_output_vprintf(instance->dout, fmt, ap); snd_output_vprintf(instance->dout, fmt, ap);
snd_output_putc(instance->dout, '\n');
va_end(ap); va_end(ap);
} }
@ -173,9 +189,9 @@ void alsa_lisp_init_objects(void)
static int xgetc(struct alisp_instance *instance) static int xgetc(struct alisp_instance *instance)
{ {
if (instance->lex_bufp > instance->lex_buf)
*--(instance->lex_bufp);
instance->charno++; instance->charno++;
if (instance->lex_bufp > instance->lex_buf)
return *--(instance->lex_bufp);
return snd_input_getc(instance->in); return snd_input_getc(instance->in);
} }
@ -357,13 +373,17 @@ static struct alisp_object * parse_form(struct alisp_instance *instance)
*/ */
if (thistoken == '.') { if (thistoken == '.') {
thistoken = gettoken(instance); thistoken = gettoken(instance);
if (prev == NULL) if (prev == NULL) {
errx(1, "unexpected `.'"); lisp_error(instance, "unexpected `.'");
return NULL;
}
prev->value.c.cdr = parse_object(instance, 1); prev->value.c.cdr = parse_object(instance, 1);
if (prev->value.c.cdr == NULL) if (prev->value.c.cdr == NULL)
return NULL; return NULL;
if ((thistoken = gettoken(instance)) != ')') if ((thistoken = gettoken(instance)) != ')') {
errx(1, "expected `)'"); lisp_error(instance, "expected `)'");
return NULL;
}
break; break;
} }
@ -380,7 +400,7 @@ static struct alisp_object * parse_form(struct alisp_instance *instance)
if (p->value.c.car == NULL) if (p->value.c.car == NULL)
return NULL; return NULL;
prev = p; prev = p;
}; }
if (first == NULL) if (first == NULL)
return &alsa_lisp_nil; return &alsa_lisp_nil;
@ -560,12 +580,12 @@ static void print_obj_lists(struct alisp_instance *instance, snd_output_t *out)
{ {
struct alisp_object * p; struct alisp_object * p;
snd_output_printf(out, "** used objects"); snd_output_printf(out, "** used objects\n");
for (p = instance->used_objs_list; p != NULL; p = p->next) for (p = instance->used_objs_list; p != NULL; p = p->next)
snd_output_printf(out, "** %p (%s)", p, obj_type_str(p)); snd_output_printf(out, "** %p (%s)\n", p, obj_type_str(p));
snd_output_printf(out, "** free objects"); snd_output_printf(out, "** free objects\n");
for (p = instance->free_objs_list; p != NULL; p = p->next) for (p = instance->free_objs_list; p != NULL; p = p->next)
snd_output_printf(out, "** %p (%s)", p, obj_type_str(p)); snd_output_printf(out, "** %p (%s)\n", p, obj_type_str(p));
} }
static void dump_obj_lists(struct alisp_instance *instance, const char *fname) static void dump_obj_lists(struct alisp_instance *instance, const char *fname)
@ -1537,7 +1557,7 @@ static struct alisp_object * eval_cons(struct alisp_instance *instance, struct a
{ {
struct alisp_object * p1 = car(p), * p2 = cdr(p), * p3; struct alisp_object * p1 = car(p), * p2 = cdr(p), * p3;
if (p1 != &alsa_lisp_nil && p1->type == ALISP_IDENTIFIER) { if (p1 != &alsa_lisp_nil && p1->type == ALISP_OBJ_IDENTIFIER) {
struct intrinsic key, *item; struct intrinsic key, *item;
if (!strcmp(p1->value.id, "lambda")) if (!strcmp(p1->value.id, "lambda"))
@ -1597,6 +1617,7 @@ int alsa_lisp(struct alisp_cfg *cfg)
instance->in = cfg->in; instance->in = cfg->in;
instance->out = cfg->out; instance->out = cfg->out;
instance->vout = cfg->vout; instance->vout = cfg->vout;
instance->eout = cfg->eout;
instance->wout = cfg->wout; instance->wout = cfg->wout;
instance->dout = cfg->dout; instance->dout = cfg->dout;
@ -1605,11 +1626,17 @@ int alsa_lisp(struct alisp_cfg *cfg)
for (;;) { for (;;) {
if ((p = parse_object(instance, 0)) == NULL) if ((p = parse_object(instance, 0)) == NULL)
break; break;
if (instance->verbose) if (instance->verbose) {
lisp_verbose(instance, "** code");
princ_object(instance->vout, p); princ_object(instance->vout, p);
snd_output_putc(instance->vout, '\n');
}
p1 = eval(instance, p); p1 = eval(instance, p);
if (instance->verbose) if (instance->verbose) {
lisp_verbose(instance, "** result");
princ_object(instance->vout, p1); princ_object(instance->vout, p1);
snd_output_putc(instance->vout, '\n');
}
if (instance->debug) { if (instance->debug) {
lisp_debug(instance, "** objects before collection"); lisp_debug(instance, "** objects before collection");
print_obj_lists(instance, instance->dout); print_obj_lists(instance, instance->dout);

1
src/alisp/alisp_local.h
View file

@ -66,6 +66,7 @@ struct alisp_instance {
/* i/o */ /* i/o */
snd_input_t *in; snd_input_t *in;
snd_output_t *out; snd_output_t *out;
snd_output_t *eout; /* error output */
snd_output_t *vout; /* verbose output */ snd_output_t *vout; /* verbose output */
snd_output_t *wout; /* warning output */ snd_output_t *wout; /* warning output */
snd_output_t *dout; /* debug output */ snd_output_t *dout; /* debug output */