Merge pull request #29 from milessabin/feature/prime-identifiers

Allow primes at the end of identifiers.

Author: non

src/compiler/scala/tools/nsc/ast/parser/Scanners.scala

@@ -637,6 +637,10 @@ trait Scanners extends ScannersCommon {
         putChar(ch)
         nextChar()
         getIdentOrOperatorRest()
+      case '\'' =>
+        putChar(ch)
+        nextChar()
+        getPrimeRest()
       case SU => // strangely enough, Character.isUnicodeIdentifierPart(SU) returns true!
         finishNamed()
       case _ =>
@@ -649,6 +653,13 @@ trait Scanners extends ScannersCommon {
         }
     }
 
+    private def getPrimeRest(): Unit =
+      if (ch == '\'') {
+        putChar(ch)
+        nextChar()
+        getPrimeRest()
+      } else finishNamed()
+
     private def getOperatorRest(): Unit = (ch: @switch) match {
       case '~' | '!' | '@' | '#' | '%' |
            '^' | '*' | '+' | '-' | '<' |

src/library/scala/reflect/NameTransformer.scala

@@ -54,6 +54,7 @@ object NameTransformer {
   enterOp('\\', "$bslash")
   enterOp('?', "$qmark")
   enterOp('@', "$at")
+  enterOp('\'', "$prime")
 
   /** Replace operator symbols by corresponding `\$opname`.
    *

test/files/neg/primed-identifiers.check

@@ -0,0 +1,7 @@
+primed-identifiers.scala:4: error: value b' is not a member of object a1
+  a1 b'c' // parses as a1 b' c'
+     ^
+primed-identifiers.scala:4: error: not found: value c'
+  a1 b'c' // parses as a1 b' c'
+       ^
+two errors found

test/files/neg/primed-identifiers.scala

@@ -0,0 +1,13 @@
+object a1 {
+  def b(c: Char) = ???
+
+  a1 b'c' // parses as a1 b' c'
+}
+
+object a2 {
+   def b'(c: Int) = ???
+   def b(c: Char) = ???
+
+  val c' = 23
+  a2 b'c' // parses as a2 b' c'
+}

test/files/pos/primed-identifiers.scala

@@ -0,0 +1,48 @@
+object Test {
+  val l = List("Identifiers", "with", "primes", "!")
+
+  val l' = l map(_.length)
+
+  val l'' = l zip l'
+
+  val l''' = l''.reverse
+
+  object a1 {
+    def b(c: Char) = ???
+
+    a1 b 'c'
+  }
+
+  object a2 {
+    def b'(c: Int) = ???
+    def b(c: Char) = ???
+
+    a2 b' 23
+    a2 b'23
+
+    val i = 23
+    a2 b'i
+
+    val c' = 23
+    a2 b'c' // parses as a2 b' c'
+
+    a2 b 'c'
+  }
+
+  case object Foo'
+  case class Bar'(i: Int)
+
+  ((): Any) match {
+    case foo': String => ???
+    case Foo' => ???
+    case Bar'(foo') => ???
+  }
+
+  val (x', y') = (13, 23)
+
+  for (z' <- List(x', y')) x'*2
+
+  type T' = Int
+  def foo[U', F'[_]](ft: F'[T'], fu: F'[U']) = (ft, fu)
+}
+