gc: include full text of import path in error message

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/5783091

diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index b26f1e32c0011e3f0431f852ef7ed291dc18fdd7..22c371e53421172f7f12bbc630b08fa80ce4bba3 100644 (file)
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -3624,23 +3624,23 @@ isbadimport(Strlit *path)
        while(*s) {
                s += chartorune(&r, s);
                if(r == Runeerror) {
-                       yyerror("import path contains invalid UTF-8 sequence");
+                       yyerror("import path contains invalid UTF-8 sequence: \"%s\"", path->s);
                        return 1;
                }
                if(r < 0x20 || r == 0x7f) {
-                       yyerror("import path contains control character");
+                       yyerror("import path contains control character: \"%s\"", path->s);
                        return 1;
                }
                if(r == '\\') {
-                       yyerror("import path contains backslash; use slash");
+                       yyerror("import path contains backslash; use slash: \"%s\"", path->s);
                        return 1;
                }
                if(isspacerune(r)) {
-                       yyerror("import path contains space character");
+                       yyerror("import path contains space character: \"%s\"", path->s);
                        return 1;
                }
                if(utfrune("!\"#$%&'()*,:;<=>?[]^`{|}~", r)) {
-                       yyerror("import path contains invalid character '%C'", r);
+                       yyerror("import path contains invalid character '%C': \"%s\"", r, path->s);
                        return 1;
                }
        }