qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 12:07:56 -07:00
Code Releases Activity

allow an underscore to match centered dot (rune 00B7), so people don't have to

Browse Source 
type a centered dot when debugging.

SVN=124460
This commit is contained in:
Rob Pike 2008-06-24 21:42:54 -07:00
parent 10296166a5
commit 4061a7e9c7
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/libmach_amd64/sym.c
View File

@ -560,6 +560,29 @@ lookup(char *fn, char *var, Symbol *s)
} }
/*
* strcmp, but allow '_' to match center dot (rune 00b7 == bytes c2 b7)
*/
int
cdotstrcmp(char *sym, char *user) {
for (;;) {
while (*sym == *user) {
if (*sym++ == '\0')
return 0;
user++;
}
/* unequal - but maybe '_' matches center dot */
if (user[0] == '_' && (sym[0]&0xFF) == 0xc2 && (sym[1]&0xFF) == 0xb7) {
/* '_' matches center dot - advance and continue */
user++;
sym += 2;
continue;
}
break;
}
return *user - *sym;
}
/* /*
* find a function by name * find a function by name
*/ */
@ -569,7 +592,7 @@ findtext(char *name, Symbol *s)
int i; int i;
for(i = 0; i < ntxt; i++) { for(i = 0; i < ntxt; i++) {
if(strcmp(txt[i].sym->name, name) == 0) { if(cdotstrcmp(txt[i].sym->name, name) == 0) {
fillsym(txt[i].sym, s); fillsym(txt[i].sym, s);
s->handle = (void *) &txt[i]; s->handle = (void *) &txt[i];
s->index = i; s->index = i;
@ -587,7 +610,7 @@ findglobal(char *name, Symbol *s)
long i; long i;
for(i = 0; i < nglob; i++) { for(i = 0; i < nglob; i++) {
if(strcmp(globals[i]->name, name) == 0) { if(cdotstrcmp(globals[i]->name, name) == 0) {
fillsym(globals[i], s); fillsym(globals[i], s);
s->index = i; s->index = i;
return 1; return 1;
@ -622,7 +645,7 @@ findlocvar(Symbol *s1, char *name, Symbol *s2)
tp = (Txtsym *)s1->handle; tp = (Txtsym *)s1->handle;
if(tp && tp->locals) { if(tp && tp->locals) {
for(i = 0; i < tp->n; i++) for(i = 0; i < tp->n; i++)
if (strcmp(tp->locals[i]->name, name) == 0) { if (cdotstrcmp(tp->locals[i]->name, name) == 0) {
fillsym(tp->locals[i], s2); fillsym(tp->locals[i], s2);
s2->handle = (void *)tp; s2->handle = (void *)tp;
s2->index = tp->n-1 - i; s2->index = tp->n-1 - i;
@ -1166,7 +1189,7 @@ symcomp(const void *a, const void *b)
i = (*(Sym**)a)->value - (*(Sym**)b)->value; i = (*(Sym**)a)->value - (*(Sym**)b)->value;
if (i) if (i)
return i; return i;
return strcmp((*(Sym**)a)->name, (*(Sym**)b)->name); return cdotstrcmp((*(Sym**)a)->name, (*(Sym**)b)->name);
} }
/* /*