tuned;
authorwenzelm
Sat, 13 Nov 2010 16:46:00 +0100
changeset 40522 37b79d789d91
parent 40521 8896bd93488e
child 40523 1050315f6ee2
tuned;
src/Pure/General/symbol.scala
--- a/src/Pure/General/symbol.scala	Sat Nov 13 12:32:21 2010 +0100
+++ b/src/Pure/General/symbol.scala	Sat Nov 13 16:46:00 2010 +0100
@@ -31,9 +31,9 @@
   /* Symbol regexps */
 
   private val plain = new Regex("""(?xs)
-      [^\r\\ \ud800-\udfff] | [\ud800-\udbff][\udc00-\udfff] """)
+      [^\r\\\ud800-\udfff] | [\ud800-\udbff][\udc00-\udfff] """)
 
-  private val newline = new Regex("""(?xs) \r\n | \r """)
+  private val physical_newline = new Regex("""(?xs) \n | \r\n | \r """)
 
   private val symbol = new Regex("""(?xs)
       \\ < (?:
@@ -46,7 +46,7 @@
     """ \\ < (?: (?! \s | [\"`\\] | \(\* | \*\) | \{\* | \*\} ) . )*""")
 
   // total pattern
-  val regex = new Regex(plain + "|" + newline + "|" + symbol + "|" + bad_symbol + "| .")
+  val regex = new Regex(plain + "|" + physical_newline + "|" + symbol + "|" + bad_symbol + "| .")
 
 
   /* basic matching */
@@ -81,7 +81,8 @@
     private val matcher = new Matcher(text)
     private var i = 0
     def hasNext = i < text.length
-    def next = {
+    def next =
+    {
       val n = matcher(i, text.length)
       val s = text.subSequence(i, i + n)
       i += n