qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-24 15:20:16 -06:00
Code Releases Activity

half of bug193

Browse Source 
R=ken
OCL=33730
CL=33730
This commit is contained in:
Russ Cox 2009-08-23 18:09:44 -07:00
parent fd6cdbd807
commit ac9d833c1e
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd/gc/const.c
View File

@ -100,7 +100,12 @@ convlit1(Node **np, Type *t, int explicit)
case OLSH: case OLSH:
case ORSH: case ORSH:
convlit(&n->left, t); convlit(&n->left, t);
n->type = n->left->type; t = n->left->type;
if(t != T && !isint[t->etype]) {
yyerror("invalid operation: %#N (shift of type %T)", n, t);
t = T;
}
n->type = t;
return; return;
} }
// avoided repeated calculations, errors // avoided repeated calculations, errors
@ -728,7 +733,12 @@ defaultlit(Node **np, Type *t)
case OLSH: case OLSH:
case ORSH: case ORSH:
defaultlit(&n->left, t); defaultlit(&n->left, t);
n->type = n->left->type; t = n->left->type;
if(t != T && !isint[t->etype]) {
yyerror("invalid operation: %#N (shift of type %T)", n, t);
t = T;
}
n->type = t;
return; return;
default: default:
defaultlit(&n->left, t); defaultlit(&n->left, t);

5
src/cmd/gc/typecheck.c
View File

@ -335,6 +335,11 @@ reswitch:
yyerror("invalid operation: %#N (shift count type %T)", n, r->type); yyerror("invalid operation: %#N (shift count type %T)", n, r->type);
goto error; goto error;
} }
t = l->type;
if(t != T && t->etype != TIDEAL && !isint[t->etype]) {
yyerror("invalid operation: %#N (shift of type %T)", n, t);
goto error;
}
// no defaultlit for left // no defaultlit for left
// the outer context gives the type // the outer context gives the type
n->type = l->type; n->type = l->type;

4
test/golden.out
View File

@ -170,9 +170,7 @@ bugs/bug190.go:15: invalid recursive type func(S) (S)
BUG: should compile BUG: should compile
=========== bugs/bug193.go =========== bugs/bug193.go
BUG: errchk: bugs/bug193.go:13: error message does not match 'shift' BUG: errchk: bugs/bug193.go:14: missing expected error: 'shift'
bugs/bug193.go:13: fatal error: optoas: no entry LSH-float
errchk: bugs/bug193.go:14: missing expected error: 'shift'
=========== bugs/bug194.go =========== bugs/bug194.go
bugs/bug194.go:15: array index must be non-negative integer constant bugs/bug194.go:15: array index must be non-negative integer constant