Remove code accidentally added twice.
From-SVN: r15909
This commit is contained in:
parent
434fc96fca
commit
87a0d1ac69
1 changed files with 0 additions and 70 deletions
|
@ -293,9 +293,6 @@ string_prependn PARAMS ((string *, const char *, int));
|
|||
static int
|
||||
get_count PARAMS ((const char **, int *));
|
||||
|
||||
static int
|
||||
consume_count_with_underscores PARAMS ((const char**));
|
||||
|
||||
static int
|
||||
consume_count PARAMS ((const char **));
|
||||
|
||||
|
@ -345,42 +342,6 @@ consume_count (type)
|
|||
}
|
||||
|
||||
|
||||
/* Like consume_count, but for counts that are preceeded and followed
|
||||
by '_' if they are greater than 10. Also, -1 is returned for
|
||||
failure, since 0 can be a valid value. */
|
||||
|
||||
static int
|
||||
consume_count_with_underscores (mangled)
|
||||
const char **mangled;
|
||||
{
|
||||
int idx;
|
||||
|
||||
if (**mangled == '_')
|
||||
{
|
||||
(*mangled)++;
|
||||
if (!isdigit (**mangled))
|
||||
return -1;
|
||||
|
||||
idx = consume_count (mangled);
|
||||
if (**mangled != '_')
|
||||
/* The trailing underscore was missing. */
|
||||
return -1;
|
||||
|
||||
(*mangled)++;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (**mangled < '0' || **mangled > '9')
|
||||
return -1;
|
||||
|
||||
idx = **mangled - '0';
|
||||
(*mangled)++;
|
||||
}
|
||||
|
||||
return idx;
|
||||
}
|
||||
|
||||
|
||||
/* Like consume_count, but for counts that are preceeded and followed
|
||||
by '_' if they are greater than 10. Also, -1 is returned for
|
||||
failure, since 0 can be a valid value. */
|
||||
|
@ -2387,37 +2348,6 @@ do_type (work, mangled, result)
|
|||
}
|
||||
break;
|
||||
|
||||
case 'X':
|
||||
case 'Y':
|
||||
/* A template parm. We substitute the corresponding argument. */
|
||||
{
|
||||
int idx;
|
||||
int lvl;
|
||||
|
||||
(*mangled)++;
|
||||
idx = consume_count_with_underscores (mangled);
|
||||
|
||||
if (idx == -1
|
||||
|| (work->tmpl_argvec && idx >= work->ntmpl_args)
|
||||
|| consume_count_with_underscores (mangled) == -1)
|
||||
{
|
||||
success = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
if (work->tmpl_argvec)
|
||||
string_append (result, work->tmpl_argvec[idx]);
|
||||
else
|
||||
{
|
||||
char buf[10];
|
||||
sprintf(buf, "T%d", idx);
|
||||
string_append (result, buf);
|
||||
}
|
||||
|
||||
success = 1;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
success = demangle_fund_type (work, mangled, result);
|
||||
break;
|
||||
|
|
Loading…
Add table
Reference in a new issue