Merge jv
authorMerge Script
Tue, 06 Oct 2015 06:43:07 +0200
branchjv
changeset 3912 9919eaafa258
parent 3910 b78046300b45 (current diff)
parent 3911 f89a36b30e5e (diff)
child 3913 3d160ce7bef3
Merge
VSEFileSourceWriter.st
--- a/VSEFileSourceWriter.st	Sun Oct 04 09:50:08 2015 +0100
+++ b/VSEFileSourceWriter.st	Tue Oct 06 06:43:07 2015 +0200
@@ -424,7 +424,7 @@
 !
 
 rewriteEOLComments
-    |tree parser eolComments|
+    |tree parser eolComments xlatedComment newSource|
 
     parser := Parser new.
     parser foldConstants:false.
@@ -443,7 +443,15 @@
             (source at:each endPosition) = $" ifTrue:[
                 "/ nothing to do...
             ] ifFalse:[
-                source := (source copyTo:(each endPosition)),'"',(source copyFrom:(each endPosition + 1))
+                xlatedComment := source copyFrom:(each startPosition+2) to:each endPosition.
+                (xlatedComment includes:$") ifTrue:[
+                    "/ self halt.
+                    xlatedComment := xlatedComment copyReplaceAll:$" with:$'.
+                ].
+                newSource := source copyTo:(each startPosition-1).
+                newSource := newSource,'"',xlatedComment,'"'.
+                newSource := newSource,(source copyFrom:(each endPosition + 1)).
+                source := newSource.
             ].
         ].
 
@@ -631,7 +639,7 @@
         ^ self
     ].
 
-    self halt.
+    "/ self halt.
 
     parser := Parser new. 
     parser foldConstants:false.