Fix parsing of derived capabilities

Allow both .only[C] and .rd (in this order).

Author: odersky

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1634,37 +1634,40 @@ object Parsers {
     }
 
     /** CaptureRef  ::=  { SimpleRef `.` } SimpleRef [`*`] [CapFilter] [`.` `rd`] -- under captureChecking
-     *  CapFilter   ::=  `.` `as` `[` QualId `]`
+     *  CapFilter   ::=  `.` `only` `[` QualId `]`
      */
     def captureRef(): Tree =
 
-      def derived(ref: Tree): Tree =
-        atSpan(startOffset(ref)):
-          if in.isIdent(nme.raw.STAR) then
+      def reachOpt(ref: Tree): Tree =
+        if in.isIdent(nme.raw.STAR) then
+          atSpan(startOffset(ref)):
             in.nextToken()
             Annotated(ref, makeReachAnnot())
-          else if in.isIdent(nme.rd) then
+        else ref
+
+      def restrictedOpt(ref: Tree): Tree =
+        if in.token == DOT && in.lookahead.isIdent(nme.only) then
+          atSpan(startOffset(ref)):
             in.nextToken()
-            Annotated(ref, makeReadOnlyAnnot())
-          else if in.isIdent(nme.only) then
             in.nextToken()
             Annotated(ref, makeOnlyAnnot(inBrackets(convertToTypeId(qualId()))))
-          else assert(false)
+        else ref
 
-      def recur(ref: Tree): Tree =
-        if in.token == DOT then
-          in.nextToken()
-          if in.isIdent(nme.rd) || in.isIdent(nme.only) then derived(ref)
-          else recur(selector(ref))
-        else if in.isIdent(nme.raw.STAR) then
-          val reachRef = derived(ref)
-          val next = in.lookahead
-          if in.token == DOT && (next.isIdent(nme.rd) || next.isIdent(nme.only)) then
+      def readOnlyOpt(ref: Tree): Tree =
+        if in.token == DOT && in.lookahead.isIdent(nme.rd) then
+          atSpan(startOffset(ref)):
             in.nextToken()
-            derived(reachRef)
-          else reachRef
+            in.nextToken()
+            Annotated(ref, makeReadOnlyAnnot())
         else ref
 
+      def recur(ref: Tree): Tree =
+        val ref1 = readOnlyOpt(restrictedOpt(reachOpt(ref)))
+        if (ref1 eq ref) && in.token == DOT then
+          in.nextToken()
+          recur(selector(ref))
+        else ref1
+
       recur(simpleRef())
     end captureRef