Applied second patch by asloane.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/library/scala/util/parsing/combinator/RegexParsers.scala b/src/library/scala/util/parsing/combinator/RegexParsers.scala
index fd3996a342..134e7e6323 100644
--- a/src/library/scala/util/parsing/combinator/RegexParsers.scala
+++ b/src/library/scala/util/parsing/combinator/RegexParsers.scala
@@ -45,8 +45,10 @@ trait RegexParsers extends Parsers {
       }
       if (i == s.length)
         Success(source.subSequence(start, j).toString, in.drop(j - offset))
-      else
-        Failure("`"+s+"' expected but `"+in.first+"' found", in.drop(start - offset))
+      else  {
+        val found = if (start == source.length()) "end of source" else "`"+source.charAt(start)+"'"
+        Failure("`"+s+"' expected but "+found+" found", in.drop(start - offset))
+      }
     }
   }
 
@@ -61,7 +63,8 @@ trait RegexParsers extends Parsers {
           Success(source.subSequence(start, start + matched.end).toString,
                   in.drop(start + matched.end - offset))
         case None =>
-          Failure("string matching regex `"+r+"' expected but `"+in.first+"' found", in.drop(start - offset))
+          val found = if (start == source.length()) "end of source" else "`"+source.charAt(start)+"'"
+          Failure("string matching regex `"+r+"' expected but "+found+" found", in.drop(start - offset))
       }
     }
   }