parse.y: refine error messages

* parse.y (parser_read_escape, parser_tok_hex): refine error
  messages.  point from the backslash up to the invalid char.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 15 insertions, 6 deletions

diff --git a/parse.y b/parse.y
index 3c76d99585..c681d41a74 100644
--- a/parse.y
+++ b/parse.y
@@ -5636,6 +5636,7 @@ parser_tok_hex(struct parser_params *parser, size_t *numlen)
 
     c = scan_hex(lex_p, 2, numlen);
     if (!*numlen) {
+	parser->tokp = lex_p;
 	yyerror("invalid hex escape");
 	return 0;
     }
@@ -5780,7 +5781,6 @@ parser_read_escape(struct parser_params *parser, int flags,
       case 'M':
 	if (flags & ESCAPE_META) goto eof;
 	if ((c = nextc()) != '-') {
-	    pushback(c);
 	    goto eof;
 	}
 	if ((c = nextc()) == '\\') {
@@ -5794,7 +5794,6 @@ parser_read_escape(struct parser_params *parser, int flags,
 
       case 'C':
 	if ((c = nextc()) != '-') {
-	    pushback(c);
 	    goto eof;
 	}
       case 'c':
@@ -5811,6 +5810,7 @@ parser_read_escape(struct parser_params *parser, int flags,
       eof:
       case -1:
         yyerror("Invalid escape character syntax");
+	pushback(c);
 	return '\0';
 
       default:
@@ -6045,6 +6045,9 @@ parser_tokadd_string(struct parser_params *parser,
 	}
 	else if (c == '\\') {
 	    const char *beg = lex_p - 1;
+#ifndef RIPPER
+	    parser->tokp = beg;
+#endif
 	    c = nextc();
 	    switch (c) {
 	      case '\n':
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index d6850f4bfd..46d9470287 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -484,21 +484,27 @@ class TestParse < Test::Unit::TestCase
   end
 
   def test_string
-    assert_raise(SyntaxError) do
+    mesg = 'from the backslash through the invalid char'
+
+    e = assert_raise_with_message(SyntaxError, /hex escape/) do
       eval '"\xg1"'
     end
+    assert_equal('   ^', e.message.lines.last, mesg)
 
-    assert_raise(SyntaxError) do
+    e = assert_raise(SyntaxError) do
       eval '"\u{1234"'
     end
+    assert_match(' ^~~~~~~', e.message.lines.last, mesg)
 
-    assert_raise(SyntaxError) do
+    e = assert_raise_with_message(SyntaxError, /escape character syntax/) do
       eval '"\M1"'
     end
+    assert_equal(' ^~~', e.message.lines.last, mesg)
 
-    assert_raise(SyntaxError) do
+    e = assert_raise_with_message(SyntaxError, /escape character syntax/) do
       eval '"\C1"'
     end
+    assert_equal(' ^~~', e.message.lines.last, mesg)
 
     assert_equal("\x81", eval('"\C-\M-a"'))
     assert_equal("\177", eval('"\c?"'))