diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-11-20 13:39:25 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-11-20 13:39:25 +1000 |
| commit | 495fdb3d72194c8b5010e98a1186ccafc95fbd8a (patch) | |
| tree | 6087e755b15733b925cb2007d5521c2c216cee3d /src/compiler/scala/tools/nsc/ast/parser | |
| parent | 1810ac0bf47dcc40cc858f7a3c64356614f98110 (diff) | |
| parent | 8d175b907d41323333a5613e419303f10beddc76 (diff) | |
| download | scala-495fdb3d72194c8b5010e98a1186ccafc95fbd8a.tar.gz scala-495fdb3d72194c8b5010e98a1186ccafc95fbd8a.tar.bz2 scala-495fdb3d72194c8b5010e98a1186ccafc95fbd8a.zip | |
Merge pull request #4123 from retronym/ticket/8253
SI-8253 Fix incorrect parsing of <elem xmlns={f("a")}/>
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser')
| -rwxr-xr-x | src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala index 1abc0c860c..8cd915bf22 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala @@ -184,7 +184,8 @@ abstract class SymbolicXMLBuilder(p: Parsers#Parser, preserveWS: Boolean) { ) val uri1 = attrMap(z) match { - case Apply(_, List(uri @ Literal(Constant(_)))) => mkAssign(uri) + case Apply(Select(New(Select(Select(Select(Ident(nme.ROOTPKG), nme.scala_), nme.xml), tpnme.Text)), nme.CONSTRUCTOR), List(uri @ Literal(Constant(_)))) => + mkAssign(uri) case Select(_, nme.Nil) => mkAssign(const(null)) // allow for xmlns="" -- bug #1626 case x => mkAssign(x) } |