bug169

R=ken
OCL=35899
CL=35899

diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 8cfa105ac3a39d59458199175792125e6ee9b62e..f356906e50df015ab16e0ceca0d57d5f842c5133 100644 (file)
--- 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
similarity index 100%
rename from test/bugs/bug169.go
rename to test/fixedbugs/bug169.go

diff --git a/test/golden.out b/test/golden.out
index 90f21172cf155f2fc7db2ff27a1a90e284e80655..6d70cb9e0d4d4d70618b85aabeed6eeebc329f0c 100644 (file)
--- 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'