[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU M4 source repository branch, branch-1_4, updated. branch-cvs-r
|
From: |
Eric Blake |
|
Subject: |
[SCM] GNU M4 source repository branch, branch-1_4, updated. branch-cvs-readonly-29-gd28166a |
|
Date: |
Mon, 10 Dec 2007 13:39:36 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=d28166a2233b32f0f37bdd486a590a814209b765
The branch, branch-1_4 has been updated
via d28166a2233b32f0f37bdd486a590a814209b765 (commit)
from bd9900d65eb9cd5add0f107e94b513fa267495ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d28166a2233b32f0f37bdd486a590a814209b765
Author: Eric Blake <address@hidden>
Date: Thu Oct 25 08:27:28 2007 -0600
Stage 6: convert builtins to push arg at a time.
* src/m4.h (includes): Include <limits.h> here, instead of in
individual files.
(input_block): New typedef.
(trace_pre, trace_post, push_string_finish): Update prototypes.
(obstack_print, input_print, push_arg, push_args): New
prototypes.
* src/input.c (push_string_finish): Change return type.
(input_print): New function.
* src/debug.c (trace_format): Add %B specifier, and use new
function.
(trace_pre): Remove redundant argc parameter.
(trace_post): Likewise, and change signature.
(obstack_print): New function.
* src/macro.c (expand_macro): Update caller.
(push_arg, push_args): New functions.
* src/builtin.c (m4_ifdef, m4_ifelse, m4_shift, m4_substr)
(m4_patsubst, expand_user_macro): Use new functions.
(mkstemp_helper, m4_maketemp): Avoid extra trailing NULs.
* src/m4.c (max_debug_argument_length, main): Set to INT_MAX, not
0, for unlimited.
* src/output.c: Update includes.
* src/symtab.c: Likewise.
(cherry picked from commit 6dcf7d2e3c5deac2d16ee9a29b6a307474603dc7)
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 26 ++++++++++++++++++
src/builtin.c | 53 ++++++++++++-------------------------
src/debug.c | 70 +++++++++++++++++++++++++++++++++++--------------
src/input.c | 80 ++++++++++++++++++++++++++++++++++++++++----------------
src/m4.c | 5 +--
src/m4.h | 14 ++++++++--
src/macro.c | 56 +++++++++++++++++++++++++++++++++++++--
src/output.c | 1 -
src/symtab.c | 1 -
9 files changed, 216 insertions(+), 90 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8838ac5..c6f5b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2007-12-10 Eric Blake <address@hidden>
+
+ Stage 6: convert builtins to push arg at a time.
+ * src/m4.h (includes): Include <limits.h> here, instead of in
+ individual files.
+ (input_block): New typedef.
+ (trace_pre, trace_post, push_string_finish): Update prototypes.
+ (obstack_print, input_print, push_arg, push_args): New
+ prototypes.
+ * src/input.c (push_string_finish): Change return type.
+ (input_print): New function.
+ * src/debug.c (trace_format): Add %B specifier, and use new
+ function.
+ (trace_pre): Remove redundant argc parameter.
+ (trace_post): Likewise, and change signature.
+ (obstack_print): New function.
+ * src/macro.c (expand_macro): Update caller.
+ (push_arg, push_args): New functions.
+ * src/builtin.c (m4_ifdef, m4_ifelse, m4_shift, m4_substr)
+ (m4_patsubst, expand_user_macro): Use new functions.
+ (mkstemp_helper, m4_maketemp): Avoid extra trailing NULs.
+ * src/m4.c (max_debug_argument_length, main): Set to INT_MAX, not
+ 0, for unlimited.
+ * src/output.c: Update includes.
+ * src/symtab.c: Likewise.
+
2007-12-07 Eric Blake <address@hidden>
Minor security fix: Quote output of mkstemp.
diff --git a/src/builtin.c b/src/builtin.c
index 87f8c2f..e8edc4b 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -731,28 +731,11 @@ static void
m4_ifdef (struct obstack *obs, int argc, macro_arguments *argv)
{
symbol *s;
- const char *result;
- size_t len = 0;
if (bad_argc (ARG (0), argc, 2, 3))
return;
s = lookup_symbol (ARG (1), SYMBOL_LOOKUP);
-
- if (s != NULL && SYMBOL_TYPE (s) != TOKEN_VOID)
- {
- result = ARG (2);
- len = arg_len (argv, 2);
- }
- else if (argc >= 4)
- {
- result = ARG (3);
- len = arg_len (argv, 3);
- }
- else
- result = NULL;
-
- if (result != NULL)
- obstack_grow (obs, result, len);
+ push_arg (obs, argv, (s && SYMBOL_TYPE (s) != TOKEN_VOID) ? 2 : 3);
}
static void
@@ -774,7 +757,7 @@ m4_ifelse (struct obstack *obs, int argc, macro_arguments
*argv)
{
if (arg_equal (argv, index, index + 1))
{
- obstack_grow (obs, ARG (index + 2), arg_len (argv, index + 2));
+ push_arg (obs, argv, index + 2);
return;
}
switch (argc)
@@ -784,7 +767,7 @@ m4_ifelse (struct obstack *obs, int argc, macro_arguments
*argv)
case 4:
case 5:
- obstack_grow (obs, ARG (index + 3), arg_len (argv, index + 3));
+ push_arg (obs, argv, index + 3);
return;
default:
@@ -1173,7 +1156,6 @@ m4_eval (struct obstack *obs, int argc, macro_arguments
*argv)
obstack_1grow (obs, '0');
while (value-- != 0)
obstack_1grow (obs, '1');
- obstack_1grow (obs, '\0');
return;
}
@@ -1323,8 +1305,7 @@ m4_shift (struct obstack *obs, int argc, macro_arguments
*argv)
{
if (bad_argc (ARG (0), argc, 1, -1))
return;
- /* TODO push a $@ reference. */
- dump_args (obs, 2, argv, ",", true);
+ push_args (obs, argv, true, true);
}
/*--------------------------------------------------------------------------.
@@ -1450,9 +1431,8 @@ mkstemp_helper (struct obstack *obs, const char *me,
const char *pattern,
obstack_grow (obs, lquote.string, lquote.length);
obstack_grow (obs, pattern, len);
for (i = 0; len > 0 && i < 6; i++)
- if (pattern[len - i - 1] != 'X')
+ if (pattern[--len] != 'X')
break;
- len += 6 - i;
obstack_grow0 (obs, "XXXXXX", 6 - i);
name = (char *) obstack_base (obs) + lquote.length;
@@ -1505,7 +1485,7 @@ m4_maketemp (struct obstack *obs, int argc,
macro_arguments *argv)
str = ntoa ((int32_t) getpid (), 10);
len2 = strlen (str);
if (len2 > len - i)
- obstack_grow0 (obs, str + len2 - (len - i), len - i);
+ obstack_grow (obs, str + len2 - (len - i), len - i);
else
{
while (i++ < len - len2)
@@ -1823,7 +1803,7 @@ m4_substr (struct obstack *obs, int argc, macro_arguments
*argv)
{
/* builtin(`substr') is blank, but substr(`abc') is abc. */
if (argc == 2)
- obstack_grow (obs, ARG (1), arg_len (argv, 1));
+ push_arg (obs, argv, 1);
return;
}
@@ -1909,7 +1889,7 @@ m4_translit (struct obstack *obs, int argc,
macro_arguments *argv)
{
/* builtin(`translit') is blank, but translit(`abc') is abc. */
if (argc == 2)
- obstack_grow (obs, ARG (1), arg_len (argv, 1));
+ push_arg (obs, argv, 1);
return;
}
@@ -2146,7 +2126,7 @@ m4_patsubst (struct obstack *obs, int argc,
macro_arguments *argv)
{
/* builtin(`patsubst') is blank, but patsubst(`abc') is abc. */
if (argc == 2)
- obstack_grow (obs, ARG (1), arg_len (argv, 1));
+ push_arg (obs, argv, 1);
return;
}
@@ -2158,7 +2138,7 @@ m4_patsubst (struct obstack *obs, int argc,
macro_arguments *argv)
replacement, we need not waste time with it. */
if (!*regexp && !*repl)
{
- obstack_grow (obs, victim, arg_len (argv, 1));
+ push_arg (obs, argv, 1);
return;
}
@@ -2212,9 +2192,12 @@ m4_patsubst (struct obstack *obs, int argc,
macro_arguments *argv)
offset = regs->end[0];
if (regs->start[0] == regs->end[0])
- obstack_1grow (obs, victim[offset++]);
+ {
+ if (offset < length)
+ obstack_1grow (obs, victim[offset]);
+ offset++;
+ }
}
- obstack_1grow (obs, '\0');
}
/* Finally, a placeholder builtin. This builtin is not installed by
@@ -2276,8 +2259,7 @@ expand_user_macro (struct obstack *obs, symbol *sym,
for (i = 0; isdigit (to_uchar (*text)); text++)
i = i * 10 + (*text - '0');
}
- if (i < argc)
- obstack_grow (obs, ARG (i), arg_len (argv, i));
+ push_arg (obs, argv, i);
break;
case '#': /* number of arguments */
@@ -2287,8 +2269,7 @@ expand_user_macro (struct obstack *obs, symbol *sym,
case '*': /* all arguments */
case '@': /* ... same, but quoted */
- /* TODO push a $@ reference. */
- dump_args (obs, 1, argv, ",", *text == '@');
+ push_args (obs, argv, false, *text == '@');
text++;
break;
diff --git a/src/debug.c b/src/debug.c
index c4f701d..2ca7a0d 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -239,21 +239,21 @@ debug_message_prefix (void)
output from interfering with other debug messages generated by the
various builtins. */
-/*---------------------------------------------------------------------.
-| Tracing output is formatted here, by a simplified printf-to-obstack |
-| function trace_format (). Understands only %S, %s, %d, %l (optional |
-| left quote) and %r (optional right quote). |
-`---------------------------------------------------------------------*/
+/*-------------------------------------------------------------------.
+| Tracing output to the obstack is formatted here, by a simplified |
+| printf-like function trace_format (). Understands only %B (1 arg: |
+| input block), %S (1 arg: length-limited text), %s (1 arg: text), |
+| %d (1 arg: integer), %l (0 args: optional left quote) and %r (0 |
+| args: optional right quote). |
+`-------------------------------------------------------------------*/
static void
trace_format (const char *fmt, ...)
{
va_list args;
char ch;
-
int d;
const char *s;
- int slen;
int maxlen;
va_start (args, fmt);
@@ -266,9 +266,14 @@ trace_format (const char *fmt, ...)
if (ch == '\0')
break;
- maxlen = 0;
+ maxlen = INT_MAX;
switch (*fmt++)
{
+ case 'B':
+ s = "";
+ input_print (&trace, va_arg (args, input_block *));
+ break;
+
case 'S':
maxlen = max_debug_argument_length;
/* fall through */
@@ -295,14 +300,8 @@ trace_format (const char *fmt, ...)
break;
}
- slen = strlen (s);
- if (maxlen == 0 || maxlen > slen)
- obstack_grow (&trace, s, slen);
- else
- {
- obstack_grow (&trace, s, maxlen);
- obstack_grow (&trace, "...", 3);
- }
+ if (obstack_print (&trace, s, SIZE_MAX, &maxlen))
+ break;
}
va_end (args);
@@ -362,10 +361,11 @@ trace_prepre (const char *name, int id)
`-----------------------------------------------------------------------*/
void
-trace_pre (const char *name, int id, int argc, macro_arguments *argv)
+trace_pre (const char *name, int id, macro_arguments *argv)
{
int i;
const builtin *bp;
+ int argc = arg_argc (argv);
trace_header (id);
trace_format ("%s", name);
@@ -417,9 +417,11 @@ trace_pre (const char *name, int id, int argc,
macro_arguments *argv)
`-------------------------------------------------------------------*/
void
-trace_post (const char *name, int id, int argc, macro_arguments *argv,
- const char *expanded)
+trace_post (const char *name, int id, macro_arguments *argv,
+ const input_block *expanded)
{
+ int argc = arg_argc (argv);
+
if (debug_level & DEBUG_TRACE_CALL)
{
trace_header (id);
@@ -427,6 +429,34 @@ trace_post (const char *name, int id, int argc,
macro_arguments *argv,
}
if (expanded && (debug_level & DEBUG_TRACE_EXPANSION))
- trace_format (" -> %l%S%r", expanded);
+ trace_format (" -> %l%B%r", expanded);
trace_flush ();
}
+
+/* Dump the string STR of length LEN to the obstack OBS. If LEN is
+ SIZE_MAX, use strlen (STR) instead. If MAX_LEN is non-NULL,
+ truncate the dump at MAX_LEN bytes and return true if MAX_LEN was
+ reached; otherwise, return false and update MAX_LEN as
+ appropriate. */
+bool
+obstack_print (struct obstack *obs, const char *str, size_t len, int *max_len)
+{
+ int max = max_len ? *max_len : INT_MAX;
+
+ if (len == SIZE_MAX)
+ len = strlen (str);
+ if (len < max)
+ {
+ obstack_grow (obs, str, len);
+ max -= len;
+ }
+ else
+ {
+ obstack_grow (obs, str, max);
+ obstack_grow (obs, "...", 3);
+ max = 0;
+ }
+ if (max_len)
+ *max_len = max;
+ return max == 0;
+}
diff --git a/src/input.c b/src/input.c
index 551b43d..4e5d299 100644
--- a/src/input.c
+++ b/src/input.c
@@ -77,7 +77,7 @@ typedef enum input_type input_type;
/* A block of input to be scanned. */
struct input_block
{
- struct input_block *prev; /* Previous input_block on the input stack. */
+ input_block *prev; /* Previous input_block on the input stack. */
input_type type; /* See enum values. */
const char *file; /* File where this input is from. */
int line; /* Line where this input is from. */
@@ -101,8 +101,6 @@ struct input_block
u;
};
-typedef struct input_block input_block;
-
/* Current input file name. */
const char *current_file;
@@ -208,8 +206,7 @@ push_file (FILE *fp, const char *title, bool close)
if (debug_level & DEBUG_TRACE_INPUT)
DEBUG_MESSAGE1 ("input read from %s", title);
- i = (input_block *) obstack_alloc (current_input,
- sizeof (struct input_block));
+ i = (input_block *) obstack_alloc (current_input, sizeof *i);
i->type = INPUT_FILE;
i->file = (char *) obstack_copy0 (&file_names, title, strlen (title));
i->line = 1;
@@ -242,8 +239,7 @@ push_macro (builtin_func *func)
next = NULL;
}
- i = (input_block *) obstack_alloc (current_input,
- sizeof (struct input_block));
+ i = (input_block *) obstack_alloc (current_input, sizeof *i);
i->type = INPUT_MACRO;
i->file = current_file;
i->line = current_line;
@@ -267,8 +263,7 @@ push_string_init (void)
while (isp && pop_input (false));
/* Reserve the next location on the obstack. */
- next = (input_block *) obstack_alloc (current_input,
- sizeof (struct input_block));
+ next = (input_block *) obstack_alloc (current_input, sizeof *next);
next->type = INPUT_STRING;
next->file = current_file;
next->line = current_line;
@@ -281,30 +276,35 @@ push_string_init (void)
| push_file () or push_macro () has invalidated the previous call to |
| push_string_init (), so we just give up. If the new object is |
| void, we do not push it. The function push_string_finish () |
-| returns a pointer to the finished object. This pointer is only |
-| for temporary use, since reading the next token might release the |
-| memory used for the object. |
+| returns an opaque pointer to the finished object, which can then |
+| be printed with input_print when tracing is enabled. This pointer |
+| is only for temporary use, since reading the next token will |
+| invalidate the object. |
`-------------------------------------------------------------------*/
-const char *
+const input_block *
push_string_finish (void)
{
- const char *ret = NULL;
+ input_block *ret = NULL;
+ size_t len = obstack_object_size (current_input);
if (next == NULL)
- return NULL;
+ {
+ assert (!len);
+ return NULL;
+ }
- if (obstack_object_size (current_input) > 0)
+ if (len)
{
obstack_1grow (current_input, '\0');
next->u.u_s.string = (char *) obstack_finish (current_input);
next->prev = isp;
isp = next;
- ret = isp->u.u_s.string; /* for immediate use only */
input_change = true;
+ ret = isp;
}
else
- obstack_free (current_input, next); /* people might leave garbage on it. */
+ obstack_free (current_input, next);
next = NULL;
return ret;
}
@@ -322,8 +322,7 @@ void
push_wrapup (const char *s)
{
input_block *i;
- i = (input_block *) obstack_alloc (wrapup_stack,
- sizeof (struct input_block));
+ i = (input_block *) obstack_alloc (wrapup_stack, sizeof *i);
i->prev = wsp;
i->type = INPUT_STRING;
i->file = current_file;
@@ -421,7 +420,7 @@ pop_wrapup (void)
}
current_input = wrapup_stack;
- wrapup_stack = (struct obstack *) xmalloc (sizeof (struct obstack));
+ wrapup_stack = (struct obstack *) xmalloc (sizeof *wrapup_stack);
obstack_init (wrapup_stack);
isp = wsp;
@@ -443,6 +442,41 @@ init_macro_token (token_data *td)
TOKEN_DATA_TYPE (td) = TOKEN_FUNC;
TOKEN_DATA_FUNC (td) = isp->u.func;
}
+
+/*--------------------------------------------------------------.
+| Dump a representation of INPUT to the obstack OBS, for use in |
+| tracing. |
+`--------------------------------------------------------------*/
+void
+input_print (struct obstack *obs, const input_block *input)
+{
+ int maxlen = max_debug_argument_length;
+
+ assert (input);
+ switch (input->type)
+ {
+ case INPUT_STRING:
+ obstack_print (obs, input->u.u_s.string, SIZE_MAX, &maxlen);
+ break;
+ case INPUT_FILE:
+ obstack_grow (obs, "<file: ", strlen ("<file: "));
+ obstack_grow (obs, input->file, strlen (input->file));
+ obstack_1grow (obs, '>');
+ break;
+ case INPUT_MACRO:
+ {
+ const builtin *bp = find_builtin_by_addr (input->u.func);
+ assert (bp);
+ obstack_1grow (obs, '<');
+ obstack_grow (obs, bp->name, strlen (bp->name));
+ obstack_1grow (obs, '>');
+ }
+ break;
+ default:
+ assert (!"input_print");
+ abort ();
+ }
+}
/*-----------------------------------------------------------------.
@@ -680,9 +714,9 @@ input_init (void)
current_file = "";
current_line = 0;
- current_input = (struct obstack *) xmalloc (sizeof (struct obstack));
+ current_input = (struct obstack *) xmalloc (sizeof *current_input);
obstack_init (current_input);
- wrapup_stack = (struct obstack *) xmalloc (sizeof (struct obstack));
+ wrapup_stack = (struct obstack *) xmalloc (sizeof *wrapup_stack);
obstack_init (wrapup_stack);
obstack_init (&file_names);
diff --git a/src/m4.c b/src/m4.c
index 0c7f33f..2cfed19 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -22,7 +22,6 @@
#include "m4.h"
#include <getopt.h>
-#include <limits.h>
#include <signal.h>
#include <stdarg.h>
@@ -48,7 +47,7 @@ int no_gnu_extensions = 0;
int prefix_all_builtins = 0;
/* Max length of arguments in trace output (-lsize). */
-int max_debug_argument_length = 0;
+int max_debug_argument_length = INT_MAX;
/* Suppress warnings about missing arguments. */
int suppress_warnings = 0;
@@ -553,7 +552,7 @@ main (int argc, char *const *argv, char *const *envp)
case 'l':
max_debug_argument_length = atoi (optarg);
if (max_debug_argument_length <= 0)
- max_debug_argument_length = 0;
+ max_debug_argument_length = INT_MAX;
break;
case 'o':
diff --git a/src/m4.h b/src/m4.h
index d7b6e08..f7b0d37 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -28,6 +28,7 @@
#include <assert.h>
#include <ctype.h>
#include <errno.h>
+#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
@@ -96,6 +97,7 @@ typedef struct string STRING;
(OBS)->object_base = (char *) (OBJECT))
/* These must come first. */
+typedef struct input_block input_block;
typedef struct token_data token_data;
typedef struct macro_arguments macro_arguments;
typedef void builtin_func (struct obstack *, int, macro_arguments *);
@@ -245,8 +247,11 @@ bool debug_set_output (const char *, const char *);
void debug_message_prefix (void);
void trace_prepre (const char *, int);
-void trace_pre (const char *, int, int, macro_arguments *);
-void trace_post (const char *, int, int, macro_arguments *, const char *);
+void trace_pre (const char *, int, macro_arguments *);
+void trace_post (const char *, int, macro_arguments *,
+ const input_block *);
+
+bool obstack_print (struct obstack *, const char *, size_t, int *);
/* File: input.c --- lexical definitions. */
@@ -341,9 +346,10 @@ void skip_line (const char *);
void push_file (FILE *, const char *, bool);
void push_macro (builtin_func *);
struct obstack *push_string_init (void);
-const char *push_string_finish (void);
+const input_block *push_string_finish (void);
void push_wrapup (const char *);
bool pop_wrapup (void);
+void input_print (struct obstack *, const input_block *);
/* current input file, and line */
extern const char *current_file;
@@ -447,6 +453,8 @@ size_t arg_len (macro_arguments *, unsigned int);
builtin_func *arg_func (macro_arguments *, unsigned int);
macro_arguments *make_argv_ref (macro_arguments *, const char *, size_t,
bool, bool);
+void push_arg (struct obstack *, macro_arguments *, unsigned int);
+void push_args (struct obstack *, macro_arguments *, bool, bool);
/* File: builtin.c --- builtins. */
diff --git a/src/macro.c b/src/macro.c
index ec43bc1..e5c7099 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -415,7 +415,7 @@ expand_macro (symbol *sym)
unsigned int argv_size; /* Size of argv_stack on entry. */
macro_arguments *argv;
struct obstack *expansion;
- const char *expanded;
+ const input_block *expanded;
bool traced;
int my_call_id;
@@ -459,14 +459,14 @@ expand_macro (symbol *sym)
current_line = loc_open_line;
if (traced)
- trace_pre (SYMBOL_NAME (sym), my_call_id, argv->argc, argv);
+ trace_pre (SYMBOL_NAME (sym), my_call_id, argv);
expansion = push_string_init ();
call_macro (sym, argv->argc, argv, expansion);
expanded = push_string_finish ();
if (traced)
- trace_post (SYMBOL_NAME (sym), my_call_id, argv->argc, argv, expanded);
+ trace_post (SYMBOL_NAME (sym), my_call_id, argv, expanded);
current_file = loc_close_file;
current_line = loc_close_line;
@@ -709,3 +709,53 @@ make_argv_ref (macro_arguments *argv, const char *argv0,
size_t argv0_len,
new_argv->quote_age = argv->quote_age;
return new_argv;
}
+
+/* Push argument INDEX from ARGV, which must be a text token, onto the
+ expansion stack OBS for rescanning. */
+void
+push_arg (struct obstack *obs, macro_arguments *argv, unsigned int index)
+{
+ token_data *token;
+
+ if (index == 0)
+ {
+ obstack_grow (obs, argv->argv0, argv->argv0_len);
+ return;
+ }
+ if (index >= argv->argc)
+ return;
+ token = arg_token (argv, index);
+ /* TODO handle func tokens? */
+ assert (TOKEN_DATA_TYPE (token) == TOKEN_TEXT);
+ /* TODO push a reference, rather than copying data. */
+ obstack_grow (obs, TOKEN_DATA_TEXT (token), TOKEN_DATA_LEN (token));
+}
+
+/* Push series of comma-separated arguments from ARGV, which should
+ all be text, onto the expansion stack OBS for rescanning. If SKIP,
+ then don't push the first argument. If QUOTE, the rescan also
+ includes quoting around each arg. */
+void
+push_args (struct obstack *obs, macro_arguments *argv, bool skip, bool quote)
+{
+ token_data *token;
+ unsigned int i;
+ bool comma = false;
+
+ /* TODO push reference, rather than copying data. */
+ for (i = skip ? 2 : 1; i < argv->argc; i++)
+ {
+ token = arg_token (argv, i);
+ if (comma)
+ obstack_1grow (obs, ',');
+ else
+ comma = true;
+ /* TODO handle func tokens? */
+ assert (TOKEN_DATA_TYPE (token) == TOKEN_TEXT);
+ if (quote)
+ obstack_grow (obs, lquote.string, lquote.length);
+ obstack_grow (obs, TOKEN_DATA_TEXT (token), TOKEN_DATA_LEN (token));
+ if (quote)
+ obstack_grow (obs, rquote.string, rquote.length);
+ }
+}
diff --git a/src/output.c b/src/output.c
index 478d3b2..4c8c9de 100644
--- a/src/output.c
+++ b/src/output.c
@@ -21,7 +21,6 @@
#include "m4.h"
-#include <limits.h>
#include <sys/stat.h>
#include "gl_avltree_oset.h"
diff --git a/src/symtab.c b/src/symtab.c
index d65d4c5..e8a027f 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -32,7 +32,6 @@
will then always be the first found. */
#include "m4.h"
-#include <limits.h>
#ifdef DEBUG_SYM
/* When evaluating hash table performance, this profiling code shows
hooks/post-receive
--
GNU M4 source repository
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU M4 source repository branch, branch-1_4, updated. branch-cvs-readonly-29-gd28166a,
Eric Blake <=