aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2005-05-10 07:48:24 +0000
committerJan Beulich <jbeulich@novell.com>2005-05-10 07:48:24 +0000
commitbe03cc84730907d7cc7548ef08565130c78655d5 (patch)
tree532547deaf95e127a5f1baf235082432b8b1edf0
parent360e86f1eb32c6bd7569a9f02e823f499fbee66a (diff)
downloadgdb-be03cc84730907d7cc7548ef08565130c78655d5.zip
gdb-be03cc84730907d7cc7548ef08565130c78655d5.tar.gz
gdb-be03cc84730907d7cc7548ef08565130c78655d5.tar.bz2
gas/
2005-05-10 Jan Beulich <jbeulich@novell.com> * macro.c (get_any_string): Remove the two last parameters. Replace references to the former expand parameter by using macro_alternate. Simplify loop condition for checking for end-of-string. (get_string): Remove redunant call to sb_skip_white. (do_formals): Remove two last arguments to get_any_string. (macro_expand): Likewise. (expand_irp): Likewise.
-rw-r--r--gas/ChangeLog10
-rw-r--r--gas/macro.c37
2 files changed, 24 insertions, 23 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1825b4a..37d3aed 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,15 @@
2005-05-10 Jan Beulich <jbeulich@novell.com>
+ * macro.c (get_any_string): Remove the two last parameters. Replace
+ references to the former expand parameter by using macro_alternate.
+ Simplify loop condition for checking for end-of-string.
+ (get_string): Remove redunant call to sb_skip_white.
+ (do_formals): Remove two last arguments to get_any_string.
+ (macro_expand): Likewise.
+ (expand_irp): Likewise.
+
+2005-05-10 Jan Beulich <jbeulich@novell.com>
+
* read.c (s_macro): Move local variable 'local' to smaller scope.
Call sb_kill on it when done.
diff --git a/gas/macro.c b/gas/macro.c
index 76e3664..afc560f 100644
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -70,7 +70,7 @@ extern void *alloca ();
static int get_token (int, sb *, sb *);
static int getstring (int, sb *, sb *);
-static int get_any_string (int, sb *, sb *, int, int);
+static int get_any_string (int, sb *, sb *);
static formal_entry *new_formal (void);
static void del_formal (formal_entry *);
static int do_formals (macro_entry *, int, sb *);
@@ -304,8 +304,6 @@ get_token (int idx, sb *in, sb *name)
static int
getstring (int idx, sb *in, sb *acc)
{
- idx = sb_skip_white (idx, in);
-
while (idx < in->len
&& (in->ptr[idx] == '"'
|| (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
@@ -390,7 +388,7 @@ getstring (int idx, sb *in, sb *acc)
*/
static int
-get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted)
+get_any_string (int idx, sb *in, sb *out)
{
sb_reset (out);
idx = sb_skip_white (idx, in);
@@ -402,9 +400,7 @@ get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted)
while (!ISSEP (in->ptr[idx]))
sb_add_char (out, in->ptr[idx++]);
}
- else if (in->ptr[idx] == '%'
- && macro_alternate
- && expand)
+ else if (in->ptr[idx] == '%' && macro_alternate)
{
int val;
char buf[20];
@@ -421,9 +417,7 @@ get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted)
|| (in->ptr[idx] == '<' && (macro_alternate || macro_mri))
|| (macro_alternate && in->ptr[idx] == '\''))
{
- if (macro_alternate
- && ! macro_strip_at
- && expand)
+ if (macro_alternate && ! macro_strip_at)
{
/* Keep the quotes. */
sb_add_char (out, '\"');
@@ -439,14 +433,11 @@ get_any_string (int idx, sb *in, sb *out, int expand, int pretend_quoted)
else
{
while (idx < in->len
- && (in->ptr[idx] == '"'
- || in->ptr[idx] == '\''
- || pretend_quoted
- || (in->ptr[idx] != ' '
- && in->ptr[idx] != '\t'
- && in->ptr[idx] != ','
- && (in->ptr[idx] != '<'
- || (! macro_alternate && ! macro_mri)))))
+ && in->ptr[idx] != ' '
+ && in->ptr[idx] != '\t'
+ && in->ptr[idx] != ','
+ && (in->ptr[idx] != '<'
+ || (! macro_alternate && ! macro_mri)))
{
if (in->ptr[idx] == '"'
|| in->ptr[idx] == '\'')
@@ -555,7 +546,7 @@ do_formals (macro_entry *macro, int idx, sb *in)
if (idx < in->len && in->ptr[idx] == '=')
{
/* Got a default. */
- idx = get_any_string (idx + 1, in, &formal->def, 1, 0);
+ idx = get_any_string (idx + 1, in, &formal->def);
idx = sb_skip_white (idx, in);
if (formal->type == FORMAL_REQUIRED)
{
@@ -1040,7 +1031,7 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
n->next = m->formals;
m->formals = n;
- idx = get_any_string (idx, in, &n->actual, 1, 0);
+ idx = get_any_string (idx, in, &n->actual);
}
}
}
@@ -1090,7 +1081,7 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
m->name);
sb_reset (&ptr->actual);
}
- idx = get_any_string (idx + 1, in, &ptr->actual, 0, 0);
+ idx = get_any_string (idx + 1, in, &ptr->actual);
if (ptr->actual.len > 0)
++narg;
}
@@ -1129,7 +1120,7 @@ macro_expand (int idx, sb *in, macro_entry *m, sb *out)
}
if (f->type != FORMAL_VARARG)
- idx = get_any_string (idx, in, &f->actual, 1, 0);
+ idx = get_any_string (idx, in, &f->actual);
else
{
sb_add_buffer (&f->actual, in->ptr + idx, in->len - idx);
@@ -1350,7 +1341,7 @@ expand_irp (int irpc, int idx, sb *in, sb *out, int (*get_line) (sb *))
while (idx < in->len)
{
if (!irpc)
- idx = get_any_string (idx, in, &f.actual, 1, 0);
+ idx = get_any_string (idx, in, &f.actual);
else
{
if (in->ptr[idx] == '"')