cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 11:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reject invalid map key types at compile time

Browse Source 
R=ken
OCL=25720
CL=25720
This commit is contained in:
Russ Cox 2009-03-04 17:38:37 -08:00
parent 0793c88371
commit 98b34e5bbd
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cmd/gc/go.h
View File

@ -657,6 +657,7 @@ int isslice(Type*);
int isinter(Type*); int isinter(Type*);
int isnilinter(Type*); int isnilinter(Type*);
int isddd(Type*); int isddd(Type*);
Type* maptype(Type*, Type*);
Type* dclmethod(Type*); Type* dclmethod(Type*);
Type* methtype(Type*); Type* methtype(Type*);
int methconv(Type*); int methconv(Type*);

16
src/cmd/gc/go.y
View File

@ -1019,9 +1019,7 @@ convtype:
| LMAP '[' type ']' type | LMAP '[' type ']' type
{ {
// map literal // map literal
$$ = typ(TMAP); $$ = maptype($3, $5);
$$->down = $3;
$$->type = $5;
} }
| structtype | structtype
| '(' type ')' | '(' type ')'
@ -1126,9 +1124,7 @@ Aothertype:
} }
| LMAP '[' type ']' Atype | LMAP '[' type ']' Atype
{ {
$$ = typ(TMAP); $$ = maptype($3, $5);
$$->down = $3;
$$->type = $5;
} }
| '*' Atype | '*' Atype
{ {
@ -1160,9 +1156,7 @@ Bothertype:
} }
| LMAP '[' type ']' Btype | LMAP '[' type ']' Btype
{ {
$$ = typ(TMAP); $$ = maptype($3, $5);
$$->down = $3;
$$->type = $5;
} }
| '*' Btype | '*' Btype
{ {
@ -1806,9 +1800,7 @@ hidden_type1:
} }
| LMAP '[' hidden_type ']' hidden_type | LMAP '[' hidden_type ']' hidden_type
{ {
$$ = typ(TMAP); $$ = maptype($3, $5);
$$->down = $3;
$$->type = $5;
} }
| LSTRUCT '{' ohidden_structdcl_list '}' | LSTRUCT '{' ohidden_structdcl_list '}'
{ {

19
src/cmd/gc/subr.c
View File

@ -305,6 +305,25 @@ algtype(Type *t)
return a; return a;
} }
Type*
maptype(Type *key, Type *val)
{
Type *t;
if(key != nil && key->etype != TANY && algtype(key) == ANOEQ)
yyerror("invalid map key type %T", key);
t = typ(TMAP);
t->down = key;
t->type = val;
return t;
}
int
iskeytype(Type *t)
{
return algtype(t) != ANOEQ;
}
Node* Node*
list(Node *a, Node *b) list(Node *a, Node *b)
{ {