diff options
author | Martin Odersky <odersky@gmail.com> | 2009-06-25 11:13:12 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-06-25 11:13:12 +0000 |
commit | 6c0ba3ee65cb5669efd2cdde7ea5cc1b6d59adc7 (patch) | |
tree | 303c785fe0545c90360ec83397b175bf1d0d21e7 | |
parent | 24781591253de7a9f54a3fc7bcf6ae4b3e969098 (diff) | |
download | scala-6c0ba3ee65cb5669efd2cdde7ea5cc1b6d59adc7.tar.gz scala-6c0ba3ee65cb5669efd2cdde7ea5cc1b6d59adc7.tar.bz2 scala-6c0ba3ee65cb5669efd2cdde7ea5cc1b6d59adc7.zip |
fixed bug in Parser and updated check files.
-rwxr-xr-x | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 2 | ||||
-rw-r--r-- | test/files/neg/badtok-1.check | 6 | ||||
-rw-r--r-- | test/files/neg/badtok-2.check | 5 | ||||
-rw-r--r-- | test/files/neg/bug284.check | 6 | ||||
-rw-r--r-- | test/files/neg/bug877.check | 6 | ||||
-rw-r--r-- | test/files/neg/variances.check | 5 |
6 files changed, 14 insertions, 16 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 6246782e9f..442b9f5d5b 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -305,8 +305,6 @@ self => val msg = token2string(token) + " expected but " +token2string(in.token) + " found." syntaxErrorOrIncomplete(msg, true) - if (in.token == EOF) incompleteInputError(msg) - else syntaxError(in.offset, msg, false) if ((token == RPAREN || token == RBRACE || token == RBRACKET)) if (in.parenBalance(token) + assumedClosingParens(token) < 0) assumedClosingParens(token) += 1 diff --git a/test/files/neg/badtok-1.check b/test/files/neg/badtok-1.check index 318ba1fcbc..3bd93c47f5 100644 --- a/test/files/neg/badtok-1.check +++ b/test/files/neg/badtok-1.check @@ -1,7 +1,7 @@ -badtok-1.scala:2: error: expected class or object definition -'42' -^ badtok-1.scala:2: error: unclosed character literal '42' ^ +badtok-1.scala:2: error: expected class or object definition +'42' +^ two errors found diff --git a/test/files/neg/badtok-2.check b/test/files/neg/badtok-2.check index 5fb3bf660c..e6861c2407 100644 --- a/test/files/neg/badtok-2.check +++ b/test/files/neg/badtok-2.check @@ -1,7 +1,4 @@ badtok-2.scala:3: error: unclosed quoted identifier `x ^ -badtok-2.scala:3: error: '}' expected but eof found. -`x - ^ -two errors found +one error found diff --git a/test/files/neg/bug284.check b/test/files/neg/bug284.check index 7e54672365..821727b96a 100644 --- a/test/files/neg/bug284.check +++ b/test/files/neg/bug284.check @@ -1,8 +1,8 @@ bug284.scala:2: warning: Detected apparent refinement of Unit; are you missing an '=' sign? def f1(a: T): Unit { } ^ -bug284.scala:6: error: eof expected but '}' found. -} -^ +bug284.scala:5: error: Unmatched closing brace '}' ignored here + } + ^ one warning found one error found diff --git a/test/files/neg/bug877.check b/test/files/neg/bug877.check index e71041348c..ddd1154698 100644 --- a/test/files/neg/bug877.check +++ b/test/files/neg/bug877.check @@ -1,7 +1,7 @@ -bug877.scala:3: error: parents of traits may not have parameters -trait Foo extends A(22A, Bug!) {} - ^ bug877.scala:3: error: Invalid literal number trait Foo extends A(22A, Bug!) {} ^ +bug877.scala:3: error: parents of traits may not have parameters +trait Foo extends A(22A, Bug!) {} + ^ two errors found diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check index 5c8ddd5159..e6abdcbb53 100644 --- a/test/files/neg/variances.check +++ b/test/files/neg/variances.check @@ -7,4 +7,7 @@ variances.scala:14: error: covariant type A occurs in contravariant position in variances.scala:16: error: covariant type A occurs in invariant position in supertype test.C[A] with ScalaObject of object Baz object Baz extends C[A] ^ -three errors found +variances.scala:63: error: covariant type A occurs in contravariant position in type => test.Covariant.T[A]{def m: (A) => A} of value x + val x: T[A] { + ^ +four errors found |