aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/util
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-05-07 12:40:31 +0200
committerMartin Odersky <odersky@gmail.com>2013-05-07 12:40:31 +0200
commit214eb8b650a86d1708b1257f89f53840a121de62 (patch)
tree47ae9eaeee75244902ebb8ecf83143676c01273f /src/dotty/tools/dotc/util
parentab39cb9f4d6451dd6e2a45e73f08db31a3cea5b3 (diff)
downloaddotty-214eb8b650a86d1708b1257f89f53840a121de62.tar.gz
dotty-214eb8b650a86d1708b1257f89f53840a121de62.tar.bz2
dotty-214eb8b650a86d1708b1257f89f53840a121de62.zip
Added a parser.
Synced parser and SyntaxSymmary. Parser now produces untyped trees that need to be desugared further. Also some tweaks to position to make it work well. This is a first version.
Diffstat (limited to 'src/dotty/tools/dotc/util')
-rw-r--r--src/dotty/tools/dotc/util/Positions.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/util/Positions.scala b/src/dotty/tools/dotc/util/Positions.scala
index bc3f6c83d..b04ccc523 100644
--- a/src/dotty/tools/dotc/util/Positions.scala
+++ b/src/dotty/tools/dotc/util/Positions.scala
@@ -43,7 +43,7 @@ object Positions {
def union(that: Position) =
if (!this.exists) that
else if (!that.exists) this
- else Position(this.start min that.start, this.end max that.end)
+ else Position(this.start min that.start, this.end max that.end, this.point)
/** Does the range of this position contain the one of that position? */
def contains(that: Position): Boolean =