diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-11-12 18:01:30 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-11-12 18:01:30 +0000 |
| commit | f5437e9a8bb543cf57b295739dd3abdebb7be651 (patch) | |
| tree | 82d04d9b9de6e798631dfbc12fa62f0f8be3dc02 /sources/scalac/typechecker | |
| parent | f8ed082d80fb662f96d9a95dad3d7481b7e88818 (diff) | |
| download | scala-f5437e9a8bb543cf57b295739dd3abdebb7be651.tar.gz scala-f5437e9a8bb543cf57b295739dd3abdebb7be651.tar.bz2 scala-f5437e9a8bb543cf57b295739dd3abdebb7be651.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/typechecker')
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 4 | ||||
| -rw-r--r-- | sources/scalac/typechecker/ConstantFolder.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index 64181df003..eff8af583f 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -2101,7 +2101,9 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { return copy.Assign(tree, lhs1, rhs1) .setType(definitions.UNIT_TYPE()); } else { - return error(tree.pos, "assignment to non-variable"); + if (lhs1.type != Type.ErrorType) + error(tree.pos, "assignment to non-variable "); + return errorTree(tree.pos); } case If(Tree cond, Tree thenp, Tree elsep): diff --git a/sources/scalac/typechecker/ConstantFolder.java b/sources/scalac/typechecker/ConstantFolder.java index 9131609c7d..125253a1b0 100644 --- a/sources/scalac/typechecker/ConstantFolder.java +++ b/sources/scalac/typechecker/ConstantFolder.java @@ -177,7 +177,7 @@ class ConstantFolder implements /*imports*/ TypeTags { } return (value != null) ? Type.constantType(value) : Type.NoType; } catch (ArithmeticException e) { - ana.unit.error(pos, e.toString()); + ana.unit.warning(pos, e.toString()); return Type.NoType; } } @@ -223,7 +223,7 @@ class ConstantFolder implements /*imports*/ TypeTags { } return (value != null) ? Type.constantType(value) : Type.NoType; } catch (ArithmeticException e) { - ana.unit.error(pos, e.toString()); + ana.unit.warning(pos, e.toString()); return Type.NoType; } } @@ -262,7 +262,7 @@ class ConstantFolder implements /*imports*/ TypeTags { return (value != null) ? new ConstantType(argtype, value) : Type.NoType; } catch (ClassCastException e) { - ana.unit.error(pos, e.toString()); + ana.unit.warning(pos, e.toString()); return Type.NoType; } } |