diff options
Diffstat (limited to 'sources/scalac')
-rw-r--r-- | sources/scalac/ast/parser/Parser.java | 10 | ||||
-rw-r--r-- | sources/scalac/util/Names.java | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java index d6dc8fd37a..9dacca3bc1 100644 --- a/sources/scalac/ast/parser/Parser.java +++ b/sources/scalac/ast/parser/Parser.java @@ -250,6 +250,14 @@ public class Parser implements Tokens { return make.Select(pos, scalaDot(pos, Names.Boolean), name); } + Tree scalaXmlDot(int pos, Name name) { + return make.Select(pos, scalaDot(pos, Names.xml), name); + } + + Tree scalaXmlNoBindingDot(int pos, Name name) { + return make.Select(pos, scalaXmlDot(pos, Names.nobinding), name); + } + Tree scalaObjectConstr(int pos) { return make.Apply( pos, scalaDot(pos, Names.Object.toTypeName()), Tree.EMPTY_ARRAY); @@ -624,7 +632,7 @@ public class Parser implements Tokens { new Tree[]{make.Literal(s.pos, s.name.toString())}); s.nextToken(); if (s.token == LPAREN || s.token == LBRACE) { - Tree labt = scalaDot(s.pos, Names.Labelled); + Tree labt = scalaXmlNoBindingDot(s.pos, Names.Element); if (isPattern) labt = convertToTypeId(labt); Tree listt = isPattern ? scalaDot(s.pos, Names.List.toTypeName()) : make.Select(s.pos, scalaDot(s.pos, Names.Predef), Names.List); diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java index c350b41e24..2b8f73c4c2 100644 --- a/sources/scalac/util/Names.java +++ b/sources/scalac/util/Names.java @@ -90,6 +90,7 @@ public class Names { public static final Name Boolean = Name.fromString("Boolean"); public static final Name Do = Name.fromString("Do"); public static final Name Double = Name.fromString("Double"); + public static final Name Element = Name.fromString("Element"); public static final Name Finally = Name.fromString("Finally"); public static final Name Float = Name.fromString("Float"); public static final Name Function = Name.fromString("Function"); @@ -138,11 +139,13 @@ public class Names { public static final Name length = Name.fromString("length"); public static final Name match = Name.fromString("match"); public static final Name map = Name.fromString("map"); + public static final Name nobinding = Name.fromString("nobinding"); public static final Name next = Name.fromString("next"); public static final Name null_ = Name.fromString("null"); public static final Name predef = Name.fromString("predef"); public static final Name runtime = Name.fromString("runtime"); public static final Name scala = Name.fromString("scala"); + public static final Name xml = Name.fromString("xml"); public static final Name scala_COLONCOLON = Name.fromString("scala." + COLONCOLON); public static final Name scala_All = Name.fromString("scala.All"); public static final Name scala_AllRef = Name.fromString("scala.AllRef"); |