summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-10-19 19:55:17 -0700
committerRuss Cox <rsc@golang.org>2009-10-19 19:55:17 -0700
commiteff7eb45b923a3df857b0358e9ca1a65087cdeb4 (patch)
tree35f7020a114f14af799689df490b523280434774
parent678a14f74c2ed666fb48049a0a2ec4be68cf57a3 (diff)
downloadgolang-eff7eb45b923a3df857b0358e9ca1a65087cdeb4.tar.gz
bug169
R=ken OCL=35899 CL=35899
-rw-r--r--src/cmd/gc/lex.c6
-rw-r--r--test/fixedbugs/bug169.go (renamed from test/bugs/bug169.go)0
-rw-r--r--test/golden.out3
3 files changed, 4 insertions, 5 deletions
diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 8cfa105ac..f356906e5 100644
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -537,8 +537,10 @@ l0:
case '\'':
/* '.' */
- if(escchar('\'', &escflag, &v))
- v = '\''; // allow '''
+ if(escchar('\'', &escflag, &v)) {
+ yyerror("empty character literal or unescaped ' in character literal");
+ v = '\'';
+ }
if(!escchar('\'', &escflag, &v)) {
yyerror("missing '");
ungetc(v);
diff --git a/test/bugs/bug169.go b/test/fixedbugs/bug169.go
index c42727f38..c42727f38 100644
--- a/test/bugs/bug169.go
+++ b/test/fixedbugs/bug169.go
diff --git a/test/golden.out b/test/golden.out
index 90f21172c..6d70cb9e0 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -147,9 +147,6 @@ BUG: errchk: command succeeded unexpectedly
123
BUG: should fail
-=========== bugs/bug169.go
-BUG: errchk: command succeeded unexpectedly
-
=========== bugs/bug193.go
BUG: errchk: bugs/bug193.go:14: missing expected error: 'shift'