Skip to content
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.

Sign up for GitHub

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

Jump to bottom

SI-8285 use correct kind of map for quasiquote positions #3593

Merged
merged 1 commit into from Mar 1, 2014
Merged

SI-8285 use correct kind of map for quasiquote positions #3593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala
View file
Open in desktop
Expand Up @@ -30,15 +30,15 @@ trait Parsers { self: Quasiquotes =>


def correspondingPosition(offset: Int): Position = { def correspondingPosition(offset: Int): Position = {
val posMapList = posMap.toList val posMapList = posMap.toList
def containsOffset(start: Int, end: Int) = start <= offset && offset <= end def containsOffset(start: Int, end: Int) = start <= offset && offset < end
def fallbackPosition = posMapList match { def fallbackPosition = posMapList match {
case (pos1, (start1, end1)) :: _ if start1 > offset => pos1 case (pos1, (start1, end1)) :: _ if start1 > offset => pos1
case _ :+ ((pos2, (start2, end2))) if offset > end2 => pos2.withPoint(pos2.point + (end2 - start2)) case _ :+ ((pos2, (start2, end2))) if end2 <= offset => pos2.withPoint(pos2.point + (end2 - start2))
} }
posMapList.sliding(2).collect { posMapList.sliding(2).collect {
case (pos1, (start1, end1)) :: _ if containsOffset(start1, end1) => (pos1, offset - start1) case (pos1, (start1, end1)) :: _ if containsOffset(start1, end1) => (pos1, offset - start1)
case (pos1, (_, end1)) :: (_, (start2, _)) :: _ if containsOffset(end1, start2) => (pos1, end1) case (pos1, (start1, end1)) :: (pos2, (start2, _)) :: _ if containsOffset(end1, start2) => (pos1, end1 - start1)
case _ :: (pos2, (start2, end2)) :: _ if containsOffset(start2, end2) => (pos2, offset - start2) case _ :: (pos2, (start2, end2)) :: _ if containsOffset(start2, end2) => (pos2, offset - start2)
}.map { case (pos, offset) => }.map { case (pos, offset) =>
pos.withPoint(pos.point + offset) pos.withPoint(pos.point + offset)
}.toList.headOption.getOrElse(fallbackPosition) }.toList.headOption.getOrElse(fallbackPosition)
Expand Down
6 changes: 2 additions & 4 deletions src/compiler/scala/tools/reflect/quasiquotes/Placeholders.scala
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ trait Placeholders { self: Quasiquotes =>


// Step 1: Transform Scala source with holes into vanilla Scala source // Step 1: Transform Scala source with holes into vanilla Scala source


lazy val posMap = mutable.ListMap[Position, (Int, Int)]() lazy val posMap = mutable.LinkedHashMap[Position, (Int, Int)]()
lazy val code = { lazy val code = {
val sb = new StringBuilder() val sb = new StringBuilder()
val sessionSuffix = randomUUID().toString.replace("-", "").substring(0, 8) + "$" val sessionSuffix = randomUUID().toString.replace("-", "").substring(0, 8) + "$"
Expand All @@ -40,9 +40,7 @@ trait Placeholders { self: Quasiquotes =>


val iargs = method match { val iargs = method match {
case nme.apply => args case nme.apply => args
case nme.unapply => case nme.unapply => internal.subpatterns(args.head).get
val (dummy @ Ident(nme.SELECTOR_DUMMY)) :: Nil = args
internal.subpatterns(dummy).get
case _ => global.abort("unreachable") case _ => global.abort("unreachable")
} }


Expand Down
14 changes: 13 additions & 1 deletion test/files/neg/quasiquotes-syntax-error-position.check
View file
Open in desktop
Expand Up @@ -32,4 +32,16 @@ quasiquotes-syntax-error-position.scala:14: error: ')' expected but end of quote
quasiquotes-syntax-error-position.scala:15: error: ':' expected but ')' found. quasiquotes-syntax-error-position.scala:15: error: ':' expected but ')' found.
q"def foo(x)" q"def foo(x)"
^ ^
11 errors found quasiquotes-syntax-error-position.scala:16: error: illegal start of simple expression
q"$a(])"
^
quasiquotes-syntax-error-position.scala:17: error: in XML literal: '>' expected instead of '$'
q"foo bar <xml$a>"
^
quasiquotes-syntax-error-position.scala:19: error: ';' expected but '<:' found.
q"val $x: $x <: $x"
^
quasiquotes-syntax-error-position.scala:20: error: '=' expected but '.' found.
q"def f ( $x ) . $x"
^
15 errors found
5 changes: 5 additions & 0 deletions test/files/neg/quasiquotes-syntax-error-position.scala
View file
Open in desktop
Expand Up @@ -13,4 +13,9 @@ object test extends App {
cq"pattern => body ; case pattern2 =>" cq"pattern => body ; case pattern2 =>"
pq"$a(bar" pq"$a(bar"
q"def foo(x)" q"def foo(x)"
q"$a(])"
q"foo bar <xml$a>"
val x = q"x"
q"val $x: $x <: $x"
q"def f ( $x ) . $x"
} }