From 498a07fcd8d922545e942b817d3fbd16ef56809b Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 16 Apr 2015 12:07:02 -0700
Subject: SI-3368 Default to coalescing for 2.11

Preserve current behavior (no PCData nodes, only Text)
for 2.11.

The coalescing flag is on if enabled or if source level
is not 2.12 and no flag was supplied.

The subtle change is that adjacent Text nodes are thereby
coalesced. This happens in the presence of CData sections,
but this is at the discretion of the parser anyway.

Also, no PCData nodes are emitted under coalescing, even
if there were no sibling text nodes. That is the correct
behavior: the general idea is that coalescing mode says,
I only want to deal with text.
---
 test/files/run/t3368.check | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

(limited to 'test/files/run/t3368.check')

diff --git a/test/files/run/t3368.check b/test/files/run/t3368.check
index 1d9dd677f6..e0c10cc0dd 100644
--- a/test/files/run/t3368.check
+++ b/test/files/run/t3368.check
@@ -6,8 +6,8 @@ package <empty> {
     };
     def x = {
       val $buf = new _root_.scala.xml.NodeBuffer();
-      $buf.$amp$plus(new _root_.scala.xml.PCData("hi & bye"));
-      $buf.$amp$plus(new _root_.scala.xml.PCData("red & black"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("hi & bye"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("red & black"));
       $buf
     }
   };
@@ -41,6 +41,45 @@ package <empty> {
         }: _*))
       }
     }
+  };
+  abstract trait Z extends scala.AnyRef {
+    def $init$() = {
+      ()
+    };
+    def d = new _root_.scala.xml.Text("hello, world");
+    def e = {
+      val $buf = new _root_.scala.xml.NodeBuffer();
+      $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+      $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+      $buf
+    };
+    def f = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("xhello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def g = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("hello, world"));
+          $buf
+        }: _*))
+      }
+    };
+    def h = {
+      {
+        new _root_.scala.xml.Elem(null, "foo", _root_.scala.xml.Null, $scope, false, ({
+          val $buf = new _root_.scala.xml.NodeBuffer();
+          $buf.$amp$plus(new _root_.scala.xml.Text("hello, worldhello, world"));
+          $buf
+        }: _*))
+      }
+    }
   }
 }
 
-- 
cgit v1.2.3