luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try out some better error messages for build.sbt in a few common situations. fixes #58

This commit is contained in:
Mark Harrah 2011-06-16 22:15:29 -04:00
parent 02d11e3115
commit 52cd688de6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compile/Eval.scala
View File

@ -8,7 +8,7 @@ import io.{AbstractFile, PlainFile, VirtualDirectory}
import ast.parser.Tokens
import reporters.{ConsoleReporter, Reporter}
import util.BatchSourceFile
import Tokens.EOF
import Tokens.{EOF, NEWLINE, NEWLINES, SEMI}
import java.io.File
import java.nio.ByteBuffer
import java.net.URLClassLoader
@ -153,9 +153,22 @@ final class Eval(optionsNoncp: Seq[String], classpath: Seq[File], mkReporter: Se
private[this] def parseExpr(unit: CompilationUnit) =
{
val parser = new syntaxAnalyzer.UnitParser(unit)
val tree: Tree = parser.expr()
val extra = parser.in.token match {
case EOF => " Ensure that there are no blank lines within a setting."
case _ => ""
}
checkError("Error parsing expression." + extra)
parser.accept(EOF)
checkError("Error parsing expression.")
val extra2 = parser.in.token match {
case SEMI => " Note that settings are expressions and do not end with semicolons. (Semicolons are fine within {} blocks, however.)"
case NEWLINE | NEWLINES => " Ensure that settings are separated by blank lines."
case _ => ""
}
checkError("Error parsing expression." + extra2)
(parser, tree)
}
private[this] def parseType(tpe: String): Tree =