diff options
author | paltherr <paltherr@epfl.ch> | 2003-03-24 11:50:52 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-03-24 11:50:52 +0000 |
commit | 1a2828c106feef0a9870ac833cd1067f2fd91dcd (patch) | |
tree | a78f4293339c5165cbd8c49c3f3c0b26f44b518f /sources/scalac/ast | |
parent | 61150fa8aea97b7b98b4976178d44b136e60e53e (diff) | |
download | scala-1a2828c106feef0a9870ac833cd1067f2fd91dcd.tar.gz scala-1a2828c106feef0a9870ac833cd1067f2fd91dcd.tar.bz2 scala-1a2828c106feef0a9870ac833cd1067f2fd91dcd.zip |
- Removed fields True & False in class scala.Bo...
- Removed fields True & False in class scala.Boolean
Diffstat (limited to 'sources/scalac/ast')
-rw-r--r-- | sources/scalac/ast/TreeGen.java | 3 | ||||
-rw-r--r-- | sources/scalac/ast/parser/Parser.java | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java index 76f9e5c71d..0c9c47eb88 100644 --- a/sources/scalac/ast/TreeGen.java +++ b/sources/scalac/ast/TreeGen.java @@ -153,7 +153,8 @@ public class TreeGen implements Kinds, Modifiers { /** Build a boolean constant tree. */ public Tree mkBoolean(int pos, boolean bool) { - return mkRef(pos, bool ? definitions.TRUE() : definitions.FALSE()); + return make.Literal(pos, bool ? Boolean.TRUE : Boolean.FALSE). + setType(definitions.BOOLEAN_TYPE); } /** Build a tree to be used as a base class constructor for a template. diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java index 84bfea6689..f525398b3c 100644 --- a/sources/scalac/ast/parser/Parser.java +++ b/sources/scalac/ast/parser/Parser.java @@ -193,10 +193,6 @@ public class Parser implements Tokens { return make.Select(pos, make.Ident(pos, Names.scala), name); } - Tree scalaBooleanDot(int pos, Name name) { - return make.Select(pos, scalaDot(pos, Names.Boolean), name); - } - /** Create tree for for-comprehension <for (enums) do body> or * <for (enums) yield body> where mapName and flatmapName are chosen * corresponding to whether this is a for-do or a for-yield. @@ -457,10 +453,10 @@ public class Parser implements Tokens { t = make.Literal(s.pos, s.name.toString()); break; case TRUE: - t = scalaBooleanDot(s.pos, Names.True); + t = make.Literal(s.pos, Boolean.TRUE); break; case FALSE: - t = scalaBooleanDot(s.pos, Names.False); + t = make.Literal(s.pos, Boolean.FALSE); break; case NULL: t = make.Ident(s.pos, Names.null_); @@ -962,10 +958,10 @@ public class Parser implements Tokens { new Tree.CaseDef[]{ (CaseDef)make.CaseDef( rhs.pos, pat.duplicate(), Tree.Empty, - scalaBooleanDot(rhs.pos, Names.True)), + make.Literal(s.pos, Boolean.TRUE)), (CaseDef)make.CaseDef( rhs.pos, make.Ident(rhs.pos, Names.WILDCARD), Tree.Empty, - scalaBooleanDot(rhs.pos, Names.False))})}); + make.Literal(s.pos, Boolean.FALSE))})}); return make.PatDef(pos, 0, pat, rhs); } |