*** empty log message ***

1 files changed, 22 insertions, 11 deletions

diff --git a/sources/scalac/ast/parser/Scanner.scala b/sources/scalac/ast/parser/Scanner.scala
index d7376395eb..5181812b9c 100644
--- a/sources/scalac/ast/parser/Scanner.scala
+++ b/sources/scalac/ast/parser/Scanner.scala
@@ -202,6 +202,13 @@ class Scanner(unit: Unit) extends TokenData {
 	nextch();
 	getOperatorRest(index);
 	return;
+      case `\\' =>
+	nextch();
+        if (ch == '"')//"
+	  getStringLit();
+        else
+	  syntaxError(pos, "illegal character");
+	return;
       case '/' =>
 	nextch();
 	if (!skipComment()) {
@@ -222,17 +229,7 @@ class Scanner(unit: Unit) extends TokenData {
 	getNumber(index, 10);
 	return;
       case '\"' => //"   scala-mode: need to understand literals
-	nextch();
-	litlen = 0;
-	while (ch != '\"'/*"*/ && ch != CR && ch != LF && ch != SU)
-	  getlitch();
-	if (ch == '\"'/*"*/) {
-	  token = STRINGLIT;
-	  name = Name.fromSource(lit, 0, litlen);
-	  nextch();
-	} else {
-	  syntaxError("unclosed character literal");
-	}
+	getStringLit();
 	return;
       case '\'' =>
 	nextch();
@@ -446,6 +443,20 @@ class Scanner(unit: Unit) extends TokenData {
     }
   }
 
+  private def getStringLit(): unit = {
+    nextch();
+    litlen = 0;
+    while (ch != '\"'/*"*/ && ch != CR && ch != LF && ch != SU)
+      getlitch();
+    if (ch == '\"'/*"*/) {
+      token = STRINGLIT;
+      name = Name.fromSource(lit, 0, litlen);
+      nextch();
+    } else {
+      syntaxError("unclosed character literal");
+    }
+  }
+
   /** returns true if argument corresponds to a keyword.
   *  Used in dtd2scala tool.
   */