* This file is part of DisOrder
* Copyright (C) 2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file lib/macros.c
* @brief Macro expansion
*/
-#include <config.h>
-#include "types.h"
+#include "common.h"
-#include <string.h>
#include <ctype.h>
-#include <assert.h>
-#include <stdio.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
* consist of alnums and '-'. We don't permit whitespace between the '@'
* and the name. */
dynstr_init(d);
- if(input == end || !isalnum((unsigned char)*input))
- fatal(0, "%s:%d: invalid expansion", filename, e->line);
+ if(input == end)
+ disorder_fatal(0, "%s:%d: invalid expansion syntax (truncated)",
+ filename, e->line);
+ if(!isalnum((unsigned char)*input))
+ disorder_fatal(0, "%s:%d: invalid expansion syntax (unexpected %#x)",
+ filename, e->line, (unsigned char)*input);
while(input < end && (isalnum((unsigned char)*input) || *input == '-'))
dynstr_append(d, *input++);
dynstr_terminate(d);
}
if(input >= end) {
/* We ran out of input without encountering a balanced cbracket */
- fatal(0, "%s:%d: unterminated expansion argument '%.*s'",
- filename, argument_start_line,
- (int)(input - argument_start), argument_start);
+ disorder_fatal(0, "%s:%d: unterminated expansion argument '%.*s'",
+ filename, argument_start_line,
+ (int)(input - argument_start), argument_start);
}
/* Consistency check */
assert(*input == cbracket);
e->args = args;
e->callback = callback;
e->definition = definition;
- return hash_add(expansions, name, &e,
- ((flags & EXP_TYPE_MASK) == EXP_MACRO)
- ? HASH_INSERT : HASH_INSERT_OR_REPLACE);
+ return hash_add(expansions, name, &e, HASH_INSERT_OR_REPLACE);
}
/** @brief Register a simple expansion rule
const struct mx_node *definition) {
if(mx__register(EXP_MACRO, name, nargs, nargs, args, 0/*callback*/,
definition)) {
+#if 0
/* This locates the error to the definition, which may be a line or two
* beyond the @define command itself. The backtrace generated by
* mx_expand() may help more. */
- error(0, "%s:%d: duplicate definition of '%s'",
- definition->filename, definition->line, name);
+ disorder_error(0, "%s:%d: duplicate definition of '%s'",
+ definition->filename, definition->line, name);
+#endif
return -2;
}
return 0;
case MX_EXPANSION:
rc = 0;
if(!(e = hash_find(expansions, m->name))) {
- error(0, "%s:%d: unknown expansion name '%s'",
- m->filename, m->line, m->name);
+ disorder_error(0, "%s:%d: unknown expansion name '%s'",
+ m->filename, m->line, m->name);
if(sink_printf(output, "[['%s' unknown]]", m->name) < 0)
return -1;
} else if(m->nargs < e->min) {
- error(0, "%s:%d: expansion '%s' requires %d args, only %d given",
- m->filename, m->line, m->name, e->min, m->nargs);
+ disorder_error(0, "%s:%d: expansion '%s' requires %d args, only %d given",
+ m->filename, m->line, m->name, e->min, m->nargs);
if(sink_printf(output, "[['%s' too few args]]", m->name) < 0)
return -1;
} else if(m->nargs > e->max) {
- error(0, "%s:%d: expansion '%s' takes at most %d args, but %d given",
+ disorder_error(0, "%s:%d: expansion '%s' takes at most %d args, but %d given",
m->filename, m->line, m->name, e->max, m->nargs);
if(sink_printf(output, "[['%s' too many args]]", m->name) < 0)
return -1;
if(rc) {
/* For non-IO errors we generate some backtrace */
if(rc != -1)
- error(0, " ...in @%s at %s:%d",
- m->name, m->filename, m->line);
+ disorder_error(0, " ...in @%s at %s:%d",
+ m->name, m->filename, m->line);
return rc;
}
break;
} else
*sp = 0;
if(rc && rc != -1 && what)
- error(0, " ...in %s at %s:%d", what, m->filename, m->line);
+ disorder_error(0, " ...in %s at %s:%d", what, m->filename, m->line);
return rc;
}
const struct mx_node *m;
if((fd = open(path, O_RDONLY)) < 0)
- fatal(errno, "error opening %s", path);
+ disorder_fatal(errno, "error opening %s", path);
if(fstat(fd, &sb) < 0)
- fatal(errno, "error statting %s", path);
+ disorder_fatal(errno, "error statting %s", path);
if(!S_ISREG(sb.st_mode))
- fatal(0, "%s: not a regular file", path);
+ disorder_fatal(0, "%s: not a regular file", path);
sofar = 0;
b = xmalloc_noptr(sb.st_size);
while(sofar < sb.st_size) {
if(n > 0)
sofar += n;
else if(n == 0)
- fatal(0, "unexpected EOF reading %s", path);
+ disorder_fatal(0, "unexpected EOF reading %s", path);
else if(errno != EINTR)
- fatal(errno, "error reading %s", path);
+ disorder_fatal(errno, "error reading %s", path);
}
xclose(fd);
m = mx_parse(path, 1, b, b + sb.st_size);
rc = mx_expand(m, output, u);
if(rc && rc != -1)
/* Mention inclusion in backtrace */
- error(0, " ...in inclusion of file '%s'", path);
+ disorder_error(0, " ...in inclusion of file '%s'", path);
return rc;
}
*/
const struct mx_node *mx_rewrite(const struct mx_node *definition,
hash *h) {
- const struct mx_node *head = 0, **tailp = &head, *argvalue, *m, *mm;
+ const struct mx_node *head = 0, **tailp = &head, *argvalue, *m, *mm, **ap;
struct mx_node *nm;
int n;
break;
case MX_EXPANSION:
if(m->nargs == 0
- && (argvalue = *(const struct mx_node **)hash_find(h, m->name))) {
+ && (ap = hash_find(h, m->name))) {
/* This expansion has no arguments and its name matches one of the
* macro arguments. (Even if it's a valid expansion name we override
* it.) We insert its value at this point. We do NOT recursively
* We need to recreate the list structure but a shallow copy will
* suffice here.
*/
+ argvalue = *ap;
for(mm = argvalue; mm; mm = mm->next) {
nm = xmalloc(sizeof *nm);
*nm = *mm;
~mdw / disorder / blobdiff