[Ada] processId: Do not modify already encoded IDs
The processID function is supposed to take a symbol name, and process it in a way that allows us to look that symbol up. This patch is adding a guard to make sure that we do not apply any transformation if we detect that we are given an already-encoded symbol name. For instance: gv___XR_pck__global_variable___XE This happens in the case where we are trying to print the value of a renaming. To do this, we simply parse and evaluate the XR symbol name as an expression. Without this change, the expression parser transforms gv___XR_pck__global_variable___XE into somethink like gv___xr_pck__global_variable___xe, which then screws up the rest of the renaming evaluation. gdb/ChangeLog: * ada-lex.p (processId): Do not modify already encoded IDs. Update function documentation.
This commit is contained in:
parent
739593e0ec
commit
718cb7da5d
2 changed files with 18 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2012-02-29 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
|
* ada-lex.p (processId): Do not modify already encoded IDs.
|
||||||
|
Update function documentation.
|
||||||
|
|
||||||
2012-02-29 Joel Brobecker <brobecker@adacore.com>
|
2012-02-29 Joel Brobecker <brobecker@adacore.com>
|
||||||
|
|
||||||
* ada-lang.h (ada_find_renaming_symbol): Replace parameter
|
* ada-lang.h (ada_find_renaming_symbol): Replace parameter
|
||||||
|
|
|
@ -410,7 +410,9 @@ processReal (const char *num0)
|
||||||
|
|
||||||
|
|
||||||
/* Store a canonicalized version of NAME0[0..LEN-1] in yylval.ssym. The
|
/* Store a canonicalized version of NAME0[0..LEN-1] in yylval.ssym. The
|
||||||
resulting string is valid until the next call to ada_parse. It differs
|
resulting string is valid until the next call to ada_parse. If
|
||||||
|
NAME0 contains the substring "___", it is assumed to be already
|
||||||
|
encoded and the resulting name is equal to it. Otherwise, it differs
|
||||||
from NAME0 in that:
|
from NAME0 in that:
|
||||||
+ Characters between '...' or <...> are transfered verbatim to
|
+ Characters between '...' or <...> are transfered verbatim to
|
||||||
yylval.ssym.
|
yylval.ssym.
|
||||||
|
@ -430,8 +432,18 @@ processId (const char *name0, int len)
|
||||||
int i0, i;
|
int i0, i;
|
||||||
struct stoken result;
|
struct stoken result;
|
||||||
|
|
||||||
|
result.ptr = name;
|
||||||
while (len > 0 && isspace (name0[len-1]))
|
while (len > 0 && isspace (name0[len-1]))
|
||||||
len -= 1;
|
len -= 1;
|
||||||
|
|
||||||
|
if (strstr (name0, "___") != NULL)
|
||||||
|
{
|
||||||
|
strncpy (name, name0, len);
|
||||||
|
name[len] = '\000';
|
||||||
|
result.length = len;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
i = i0 = 0;
|
i = i0 = 0;
|
||||||
while (i0 < len)
|
while (i0 < len)
|
||||||
{
|
{
|
||||||
|
@ -471,7 +483,6 @@ processId (const char *name0, int len)
|
||||||
}
|
}
|
||||||
name[i] = '\000';
|
name[i] = '\000';
|
||||||
|
|
||||||
result.ptr = name;
|
|
||||||
result.length = i;
|
result.length = i;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue