Skip to content

SI-8325 Accept infix star type outside patterns #3576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,10 @@ self =>
def isIdentExcept(except: Name) = isIdent && in.name != except
def isIdentOf(name: Name) = isIdent && in.name == name

def isUnaryOp = isIdent && raw.isUnary(in.name)
def isRawStar = isIdent && in.name == raw.STAR
def isRawBar = isIdent && in.name == raw.BAR
def isUnaryOp = isIdent && raw.isUnary(in.name)
def isRawStar = isRawIdent && in.name == raw.STAR
def isRawBar = isRawIdent && in.name == raw.BAR
def isRawIdent = in.token == IDENTIFIER

def isIdent = in.token == IDENTIFIER || in.token == BACKQUOTED_IDENT
def isMacro = in.token == IDENTIFIER && in.name == nme.MACROkw
Expand Down Expand Up @@ -1001,19 +1002,30 @@ self =>
}

def infixTypeRest(t: Tree, mode: InfixMode.Value): Tree = {
if (isIdent && in.name != nme.STAR) {
val opOffset = in.offset
// Detect postfix star for repeated args.
// Only RPAREN can follow, but accept COMMA and EQUALS for error's sake.
// Take RBRACE as a paren typo.
def checkRepeatedParam = if (isRawStar) {
lookingAhead (in.token match {
case RPAREN | COMMA | EQUALS | RBRACE => t
case _ => EmptyTree
})
} else EmptyTree
def asInfix = {
val opOffset = in.offset
val leftAssoc = treeInfo.isLeftAssoc(in.name)
if (mode != InfixMode.FirstOp) checkAssoc(opOffset, in.name, leftAssoc = mode == InfixMode.LeftOp)
val op = identForType()
val tycon = atPos(opOffset) { Ident(op) }
if (mode != InfixMode.FirstOp)
checkAssoc(opOffset, in.name, leftAssoc = mode == InfixMode.LeftOp)
val tycon = atPos(opOffset) { Ident(identForType()) }
newLineOptWhenFollowing(isTypeIntroToken)
def mkOp(t1: Tree) = atPos(t.pos.start, opOffset) { AppliedTypeTree(tycon, List(t, t1)) }
if (leftAssoc)
infixTypeRest(mkOp(compoundType()), InfixMode.LeftOp)
else
mkOp(infixType(InfixMode.RightOp))
} else t
}
if (isIdent) checkRepeatedParam orElse asInfix
else t
}

/** {{{
Expand Down
10 changes: 10 additions & 0 deletions test/files/neg/t8325-b.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
t8325-b.scala:3: error: Unmatched closing brace '}' ignored here
def k(is: Int*} = ???
^
t8325-b.scala:3: error: ';' expected but '=' found.
def k(is: Int*} = ???
^
t8325-b.scala:4: error: eof expected but '}' found.
}
^
three errors found
4 changes: 4 additions & 0 deletions test/files/neg/t8325-b.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

trait Test {
def k(is: Int*} = ???
}
7 changes: 7 additions & 0 deletions test/files/neg/t8325-c.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
t8325-c.scala:3: error: identifier expected but ')' found.
def k(xx: Int`*`) = ???
^
t8325-c.scala:4: error: ')' expected but '}' found.
}
^
two errors found
4 changes: 4 additions & 0 deletions test/files/neg/t8325-c.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

trait Test {
def k(xx: Int`*`) = ???
}
15 changes: 15 additions & 0 deletions test/files/neg/t8325.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
t8325.scala:5: error: *-parameter must come last
def f(is: Int*, s: String) = ???
^
t8325.scala:7: error: *-parameter must come last
def h(is: Int * String *, s: String) = ???
^
t8325.scala:10: error: type mismatch;
found : Int(5)
required: Int*
def j(is: Int* = 5) = ???
^
t8325.scala:10: error: a parameter section with a `*'-parameter is not allowed to have default arguments
def j(is: Int* = 5) = ???
^
four errors found
11 changes: 11 additions & 0 deletions test/files/neg/t8325.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

trait Test {
type OK[A,B] = A Tuple2 B
type *[A,B] = A Tuple2 B
def f(is: Int*, s: String) = ???
def g(is: Int * String, s: String) = ??? // OK
def h(is: Int * String *, s: String) = ???
// won't recover from following
//def i(is: Int OK) = ??? //error: identifier expected but ')' found.
def j(is: Int* = 5) = ???
}
9 changes: 9 additions & 0 deletions test/files/pos/t8325.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

trait Test {
type +[A, B] = (A, B)
type *[A, B] = (A, B)

type X[A, B] = A + B
type Y[A, B] = A * B
type Z[A, B] = A `*` B
}