summaryrefslogtreecommitdiff
path: root/gdb/ada-lex.l
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2012-02-29 19:53:16 +0000
committerJoel Brobecker <brobecker@gnat.com>2012-02-29 19:53:16 +0000
commit26cda9aebc1fcbc0f3c72e195caa8b75612f6a96 (patch)
tree8e34ea6511902d68ca526db40e45d07989454d1f /gdb/ada-lex.l
parent1e2c5ed467f77e124ace65a936f867445a786dfd (diff)
downloadgdb-26cda9aebc1fcbc0f3c72e195caa8b75612f6a96.tar.gz
[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.
Diffstat (limited to 'gdb/ada-lex.l')
-rw-r--r--gdb/ada-lex.l15
1 files changed, 13 insertions, 2 deletions
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 48667d062b5..5102ff49f59 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -410,7 +410,9 @@ processReal (const char *num0)
/* 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:
+ Characters between '...' or <...> are transfered verbatim to
yylval.ssym.
@@ -430,8 +432,18 @@ processId (const char *name0, int len)
int i0, i;
struct stoken result;
+ result.ptr = name;
while (len > 0 && isspace (name0[len-1]))
len -= 1;
+
+ if (strstr (name0, "___") != NULL)
+ {
+ strncpy (name, name0, len);
+ name[len] = '\000';
+ result.length = len;
+ return result;
+ }
+
i = i0 = 0;
while (i0 < len)
{
@@ -471,7 +483,6 @@ processId (const char *name0, int len)
}
name[i] = '\000';
- result.ptr = name;
result.length = i;
return result;
}