Skip to content

Add Support of Parsing Annotations without Arguments to Java Parser #6893

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

Merged
merged 5 commits into from
Oct 22, 2019
Merged

Add Support of Parsing Annotations without Arguments to Java Parser #6893

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1639251
Add Parsing Simple Annotations in JavaParser
noti0na1 Jul 10, 2019
27717fe
add tests for annotations in Java
noti0na1 Oct 17, 2019
4efc3ee
remove baces case; change list to listbuffer
noti0na1 Oct 21, 2019
c6a10f3
change bool variable; add tests
noti0na1 Oct 21, 2019
c40d901
remove var
noti0na1 Oct 21, 2019
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
49 changes: 38 additions & 11 deletions compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ object JavaParsers {
// ------------- general parsing ---------------------------

/** skip parent or brace enclosed sequence of things */
def skipAhead(): Unit = {
var nparens = 0
var nbraces = 0
def skipAhead(initnparens: Int, initnbraces: Int): Unit = {
var nparens = initnparens
var nbraces = initnbraces
while ({
in.token match {
case LPAREN =>
Expand All @@ -161,6 +161,8 @@ object JavaParsers {
()
}

def skipAhead(): Unit = skipAhead(0,0)

def skipTo(tokens: Int*): Unit =
while (!(tokens contains in.token) && in.token != EOF)
if (in.token == LBRACE) { skipAhead(); accept(RBRACE) }
Expand Down Expand Up @@ -329,20 +331,42 @@ object JavaParsers {
}

def annotations(): List[Tree] = {
//var annots = new ListBuffer[Tree]
var annots = new ListBuffer[Tree]
while (in.token == AT) {
in.nextToken()
annotation()
annotation() match {
case Some(anno) => annots += anno
case _ =>
}
}
List() // don't pass on annotations for now
annots.toList
}

/** Annotation ::= TypeName [`(` AnnotationArgument {`,` AnnotationArgument} `)`]
*/
def annotation(): Unit = {
qualId()
if (in.token == LPAREN) { skipAhead(); accept(RPAREN) }
else if (in.token == LBRACE) { skipAhead(); accept(RBRACE) }
def annotation(): Option[Tree] = {
val id = convertToTypeId(qualId())
var skipAnno = false

// only parse annotations without arguments
if (in.token == LPAREN) {
in.nextToken()
if (in.token != RPAREN) {
skipAnno = true
skipAhead(1, 0)
}
accept(RPAREN)
} else if (in.token == LBRACE) {
in.nextToken()
if (in.token != RBRACE) {
skipAnno = true
skipAhead(0, 1)
}
accept(RBRACE)
}

if (skipAnno) None
else Some(ensureApplied(Select(New(id), nme.CONSTRUCTOR)))
}

def modifiers(inInterface: Boolean): Modifiers = {
Expand All @@ -360,7 +384,10 @@ object JavaParsers {
in.token match {
case AT if (in.lookaheadToken != INTERFACE) =>
in.nextToken()
annotation()
annotation() match {
case Some(anno) => annots :+= anno
case _ =>
}
case PUBLIC =>
isPackageAccess = false
in.nextToken()
Expand Down