natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing early value initialization for IDE (which is not compatible with stubbing because the parser tests for ValDefs directly). 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@15509 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
mcdirmid 2008-07-09 10:47:23 +00:00
parent e1138c9e73
commit 25549d6f91
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
View File

@ -1926,6 +1926,12 @@ trait Parsers extends NewScanners with MarkupParsers {
defOrDcl(modifiers() withAnnotations annots)
}
def preNonLocalDefOrDcl : List[Tree] = {
val annots = annotations(true)
defOrDcl(modifiers() withAnnotations annots)
}
/** PatDef ::= Pattern2 {`,' Pattern2} [`:' Type] `=' Expr
* ValDcl ::= Id {`,' Id} `:' Type
* VarDef ::= PatDef | Id {`,' Id} `:' Type `=' `_'
@ -2224,7 +2230,8 @@ trait Parsers extends NewScanners with MarkupParsers {
def template(isTrait: Boolean): (List[Tree], List[List[Tree]], ValDef, List[Tree]) = {
newLineOptWhenFollowedBy(LBRACE)
if (inToken == LBRACE) {
val (self, body) = templateBody()
// @S: pre template body cannot stub like post body can!
val (self, body) = templateBody(true)
if (inToken == WITH && self.isEmpty) {
val vdefs: List[ValDef] = body flatMap {
case vdef @ ValDef(mods, name, tpt, rhs) if !(mods hasFlag Flags.DEFERRED) =>
@ -2284,17 +2291,16 @@ trait Parsers extends NewScanners with MarkupParsers {
/** TemplateBody ::= [nl] `{' TemplateStatSeq `}'
*/
def templateBody() = {
def templateBody(isPre : Boolean) = {
accept(LBRACE)
val result @ (self, stats) = templateStatSeq()
val result @ (self, stats) = templateStatSeq(isPre)
accept(RBRACE)
if (stats.isEmpty) (self, List(EmptyTree)) else result
}
def templateBodyOpt(traitParentSeen: Boolean): (ValDef, List[Tree]) = {
newLineOptWhenFollowedBy(LBRACE)
if (inToken == LBRACE) {
templateBody()
templateBody(false)
} else {
if (inToken == LPAREN)
syntaxError((if (traitParentSeen) "parents of traits" else "traits or objects")+
@ -2368,7 +2374,7 @@ trait Parsers extends NewScanners with MarkupParsers {
* | super ArgumentExprs {ArgumentExprs}
* |
*/
def templateStatSeq() = checkNoEscapingPlaceholders {
def templateStatSeq(isPre : Boolean) = checkNoEscapingPlaceholders {
var self: ValDef = emptyValDef
val stats = new ListBuffer[Tree]
if (isExprIntro) {
@ -2396,7 +2402,9 @@ trait Parsers extends NewScanners with MarkupParsers {
} else if (isExprIntro) {
stats += statement(InTemplate)
} else if (isDefIntro || isModifier || inToken == LBRACKET /*todo: remove */ || inToken == AT) {
stats ++= joinComment(nonLocalDefOrDcl)
if (isPre)
stats ++= joinComment(preNonLocalDefOrDcl)
else stats ++= joinComment(nonLocalDefOrDcl)
} else if (!isStatSep) {
syntaxErrorOrIncomplete("illegal start of definition", true)
}