From 75b923e11e4d83b92edfcb6c17a39b83072c0cdd Mon Sep 17 00:00:00 2001
From: Jesper Gravgaard <jg@ramboll.com>
Date: Sun, 7 Oct 2018 12:03:45 +0200
Subject: [PATCH] Fixinf windows newlines in fragments

---
 .../AsmFragmentTemplateSynthesizer.java       | 24 ++++-----
 src/test/ref/fragments-assignment-binary.log  | 40 +++++++-------
 src/test/ref/fragments-assignment-copy.log    | 54 +++++++++----------
 src/test/ref/fragments-assignment-unary.log   | 26 ++++-----
 4 files changed, 70 insertions(+), 74 deletions(-)

diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java
index 2106f8072..dd1818a7e 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentTemplateSynthesizer.java
@@ -506,7 +506,7 @@ public class AsmFragmentTemplateSynthesizer {
             body = "";
          } else {
             CharStream fragmentCharStream = CharStreams.fromStream(fragmentStream);
-            body = removeTrailingNewlines(fragmentCharStream.toString());
+            body = fixNewlines(fragmentCharStream.toString());
 
          }
          return new AsmFragmentTemplate(signature, body);
@@ -518,21 +518,17 @@ public class AsmFragmentTemplateSynthesizer {
    }
 
    /**
-    * Remove any trailing newlines in the body
+    * Fix all newlines in the body.
+    * - Removes all '\r'
+    * - Removes all trailing newlines
+    *
     * @param body The body
-    * @return The body without trailing newlines
+    * @return The body with fixed newlines
     */
-   private String removeTrailingNewlines(String body) {
-      boolean done = false;
-      while(!done) {
-         done  = true;
-         if(body.length() > 0) {
-            char lastChar = body.charAt(body.length() - 1);
-            if(lastChar == '\n' || lastChar == '\r') {
-               body = body.substring(0, body.length() - 1);
-               done = false;
-            }
-         }
+   private String fixNewlines(String body) {
+      body = body.replace("\r", "");
+      while(body.length() > 0 && body.charAt(body.length() - 1) == '\n') {
+         body = body.substring(0, body.length() - 1);
       }
       return body;
    }
diff --git a/src/test/ref/fragments-assignment-binary.log b/src/test/ref/fragments-assignment-binary.log
index 99a69b86a..15a93d752 100644
--- a/src/test/ref/fragments-assignment-binary.log
+++ b/src/test/ref/fragments-assignment-binary.log
@@ -272,7 +272,7 @@ vbuaa=vbuxx_bor_vbuxx < vbuaa=vbuaa_bor_vbuaa - clobber:A   cycles:2.0
 CANNOT SYNTHESIZE vbuaa=vbuxx_bxor_vbuxx
 *vbuaa=vbuxx_minus_vbuxx - clobber:A   cycles:2.0
   lda #0
-vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A   cycles:4.0
+*vbuaa=vbuxx_plus_vbuxx - clobber:A   cycles:4.0
   txa
   asl
 vbuaa=vbuxx_band_vbuyy < vbuaa=vbuaa_band_vbuyy - clobber:A   cycles:8.0
@@ -595,7 +595,7 @@ vbuaa=vbuyy_bor_vbuyy < vbuaa=vbuaa_bor_vbuaa - clobber:A   cycles:2.0
 CANNOT SYNTHESIZE vbuaa=vbuyy_bxor_vbuyy
 *vbuaa=vbuyy_minus_vbuyy - clobber:A   cycles:2.0
   lda #0
-vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A   cycles:4.0
+*vbuaa=vbuyy_plus_vbuyy - clobber:A   cycles:4.0
   tya
   asl
 vbuaa=vbuyy_band_vbuz1 < vbuaa=vbuaa_band_vbuz1 - clobber:A   cycles:5.0
@@ -7814,7 +7814,7 @@ CANNOT SYNTHESIZE vbuxx=vbuxx_bxor_vbuxx
 vbuxx=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A X   cycles:4.0
   lda #0
   tax
-vbuxx=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A X   cycles:6.0
+vbuxx=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A X   cycles:6.0
   txa
   asl
   tax
@@ -8171,7 +8171,7 @@ CANNOT SYNTHESIZE vbuxx=vbuyy_bxor_vbuyy
 vbuxx=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A X   cycles:4.0
   lda #0
   tax
-vbuxx=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A X   cycles:6.0
+vbuxx=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A X   cycles:6.0
   tya
   asl
   tax
@@ -15333,7 +15333,7 @@ CANNOT SYNTHESIZE vbuyy=vbuxx_bxor_vbuxx
 vbuyy=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A Y  cycles:4.0
   lda #0
   tay
-vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:6.0
+vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A Y  cycles:6.0
   txa
   asl
   tay
@@ -15689,7 +15689,7 @@ CANNOT SYNTHESIZE vbuyy=vbuyy_bxor_vbuyy
 vbuyy=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A Y  cycles:4.0
   lda #0
   tay
-vbuyy=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:6.0
+vbuyy=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A Y  cycles:6.0
   tya
   asl
   tay
@@ -23041,7 +23041,7 @@ CANNOT SYNTHESIZE vbuz1=vbuxx_bxor_vbuxx
 vbuz1=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A   cycles:5.0
   lda #0
   sta {z1}
-vbuz1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A   cycles:7.0
+vbuz1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A   cycles:7.0
   txa
   asl
   sta {z1}
@@ -23626,7 +23626,7 @@ CANNOT SYNTHESIZE vbuz1=vbuyy_bxor_vbuyy
 vbuz1=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A   cycles:5.0
   lda #0
   sta {z1}
-vbuz1=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A   cycles:7.0
+vbuz1=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A   cycles:7.0
   tya
   asl
   sta {z1}
@@ -39721,7 +39721,7 @@ _deref_pbuz1=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A Y  cycles:1
   lda #0
   ldy #0
   sta ({z1}),y
-_deref_pbuz1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:12.0
+_deref_pbuz1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A Y  cycles:12.0
   txa
   asl
   ldy #0
@@ -40335,7 +40335,7 @@ _deref_pbuz1=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A Y  cycles:1
   lda #0
   ldy #0
   sta ({z1}),y
-_deref_pbuz1=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:12.0
+_deref_pbuz1=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A Y  cycles:12.0
   tya
   asl
   ldy #0
@@ -55907,7 +55907,7 @@ CANNOT SYNTHESIZE _deref_pbuc1=vbuxx_bxor_vbuxx
 _deref_pbuc1=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A   cycles:6.0
   lda #0
   sta {c1}
-_deref_pbuc1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A   cycles:8.0
+_deref_pbuc1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A   cycles:8.0
   txa
   asl
   sta {c1}
@@ -56564,7 +56564,7 @@ CANNOT SYNTHESIZE _deref_pbuc1=vbuyy_bxor_vbuyy
 _deref_pbuc1=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A   cycles:6.0
   lda #0
   sta {c1}
-_deref_pbuc1=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A   cycles:8.0
+_deref_pbuc1=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A   cycles:8.0
   tya
   asl
   sta {c1}
@@ -75760,7 +75760,7 @@ pbuz1_derefidx_vbuaa=vbuaa_minus_vbuaa < pbuz1_derefidx_vbuaa=vbuxx_minus_vbuxx
   lda #0
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuaa=vbuaa_plus_vbuaa < pbuz1_derefidx_vbuaa=vbuxx_plus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A X Y  cycles:20.0
+pbuz1_derefidx_vbuaa=vbuaa_plus_vbuaa < pbuz1_derefidx_vbuaa=vbuxx_plus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A X Y  cycles:20.0
   tax
   tay
   sty $ff
@@ -76434,7 +76434,7 @@ pbuz1_derefidx_vbuaa=vbuxx_minus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_minus_vbuxx
   lda #0
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuaa=vbuxx_plus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:18.0
+pbuz1_derefidx_vbuaa=vbuxx_plus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A Y  cycles:18.0
   tay
   sty $ff
   
@@ -107418,7 +107418,7 @@ pbuz1_derefidx_vbuyy=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A Y
   lda #0
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:16.0
+pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A Y  cycles:16.0
   sty $ff
   
   txa
@@ -108157,7 +108157,7 @@ pbuz1_derefidx_vbuyy=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A Y
   lda #0
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuyy=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:16.0
+pbuz1_derefidx_vbuyy=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A Y  cycles:16.0
   sty $ff
   
   tya
@@ -125781,7 +125781,7 @@ pbuz1_derefidx_vbuz1=vbuxx_minus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_minus_vbuxx
   lda #0
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuz1=vbuxx_plus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:19.0
+pbuz1_derefidx_vbuz1=vbuxx_plus_vbuxx < pbuz1_derefidx_vbuyy=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A Y  cycles:19.0
   ldy {z1}
   sty $ff
   
@@ -146137,7 +146137,7 @@ pbuz1_derefidx_vbuz2=vbuxx_minus_vbuxx < vbuaa=vbuxx_minus_vbuxx - clobber:A Y
   lda #0
   ldy {z2}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:13.0
+pbuz1_derefidx_vbuz2=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A Y  cycles:13.0
   txa
   asl
   ldy {z2}
@@ -146982,7 +146982,7 @@ pbuz1_derefidx_vbuz2=vbuyy_minus_vbuyy < vbuaa=vbuyy_minus_vbuyy - clobber:A Y
   lda #0
   ldy {z2}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy < vbuaa=vbuaa_plus_vbuaa - clobber:A Y  cycles:13.0
+pbuz1_derefidx_vbuz2=vbuyy_plus_vbuyy < vbuaa=vbuyy_plus_vbuyy - clobber:A Y  cycles:13.0
   tya
   asl
   ldy {z2}
@@ -234104,7 +234104,7 @@ pbuc1_derefidx_vbuz1=vbuxx_minus_vbuxx < pbuc1_derefidx_vbuyy=vbuxx_minus_vbuxx
   ldy {z1}
   lda #0
   sta {c1},y
-pbuc1_derefidx_vbuz1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx < vbuaa=vbuaa_plus_vbuaa - clobber:A X   cycles:12.0
+pbuc1_derefidx_vbuz1=vbuxx_plus_vbuxx < vbuaa=vbuxx_plus_vbuxx - clobber:A X   cycles:12.0
   txa
   asl
   ldx {z1}
diff --git a/src/test/ref/fragments-assignment-copy.log b/src/test/ref/fragments-assignment-copy.log
index c52649db8..03cede9d1 100644
--- a/src/test/ref/fragments-assignment-copy.log
+++ b/src/test/ref/fragments-assignment-copy.log
@@ -6,7 +6,7 @@
   tya
 *vbuaa=vbuz1 - clobber:A   cycles:3.0
   lda {z1}
-vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:7.5
+*vbuaa=_deref_pbuz1 - clobber:A Y  cycles:7.5
   ldy #0
   lda ({z1}),y
 *vbuaa=_deref_pbuc1 - clobber:A   cycles:4.0
@@ -61,7 +61,7 @@ vbuxx=vbuyy < vbuaa=vbuyy - clobber:A X   cycles:4.0
   ldx $ff
 *vbuxx=vbuz1 - clobber:X   cycles:3.0
   ldx {z1}
-vbuxx=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A X Y  cycles:9.5
+vbuxx=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A X Y  cycles:9.5
   ldy #0
   lda ({z1}),y
   tax
@@ -121,7 +121,7 @@ vbuyy=vbuxx < vbuaa=vbuxx - clobber:A Y  cycles:4.0
   
 *vbuyy=vbuz1 - clobber:Y  cycles:3.0
   ldy {z1}
-vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:9.5
+vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:9.5
   ldy #0
   lda ({z1}),y
   tay
@@ -192,11 +192,11 @@ vbuz1=vbuz2 < vbuxx=vbuz1 - clobber:X   cycles:6.0
 vbuz1=vbuz2 < vbuyy=vbuz1 - clobber:Y  cycles:6.0
   ldy {z2}
   sty {z1}
-vbuz1=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:10.5
+vbuz1=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:10.5
   ldy #0
   lda ({z1}),y
   sta {z1}
-vbuz1=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:10.5
+vbuz1=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:10.5
   ldy #0
   lda ({z2}),y
   sta {z1}
@@ -313,7 +313,7 @@ vbuz1=vbuc1 < vbuxx=vbuc1 - clobber:X   cycles:5.0
 vbuz1=vbuc1 < vbuyy=vbuc1 - clobber:Y  cycles:5.0
   ldy #{c1}
   sty {z1}
-_deref_pbuz1=vbuaa < vbuaa=vbuaa - clobber:Y  cycles:8.0
+*_deref_pbuz1=vbuaa - clobber:Y  cycles:8.0
   ldy #0
   sta ({z1}),y
 _deref_pbuz1=vbuxx < vbuaa=vbuxx - clobber:A Y  cycles:10.0
@@ -324,20 +324,20 @@ _deref_pbuz1=vbuyy < vbuaa=vbuyy - clobber:A Y  cycles:10.0
   tya
   ldy #0
   sta ({z1}),y
-_deref_pbuz1=vbuz1 < _deref_pbuz1=vbuaa < vbuaa=vbuaa - clobber:A Y  cycles:11.0
+_deref_pbuz1=vbuz1 < _deref_pbuz1=vbuaa - clobber:A Y  cycles:11.0
   lda {z1}
   ldy #0
   sta ({z1}),y
-_deref_pbuz1=vbuz2 < _deref_pbuz1=vbuaa < vbuaa=vbuaa - clobber:A Y  cycles:11.0
+_deref_pbuz1=vbuz2 < _deref_pbuz1=vbuaa - clobber:A Y  cycles:11.0
   lda {z2}
   ldy #0
   sta ({z1}),y
-_deref_pbuz1=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:15.5
+_deref_pbuz1=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:15.5
   ldy #0
   lda ({z1}),y
   ldy #0
   sta ({z1}),y
-_deref_pbuz1=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:15.5
+_deref_pbuz1=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:15.5
   ldy #0
   lda ({z2}),y
   ldy #0
@@ -455,7 +455,7 @@ _deref_pbuc1=vbuz1 < _deref_pbuc1=vbuxx - clobber:X   cycles:7.0
 _deref_pbuc1=vbuz1 < _deref_pbuc1=vbuyy - clobber:Y  cycles:7.0
   ldy {z1}
   sty {c1}
-_deref_pbuc1=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:11.5
+_deref_pbuc1=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:11.5
   ldy #0
   lda ({z1}),y
   sta {c1}
@@ -583,7 +583,7 @@ pbuz1_derefidx_vbuaa=_deref_pbuz1 < pbuz1_derefidx_vbuxx=_deref_pbuz1 < pbuz1_de
   stx $ff
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuaa=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:21.5
+pbuz1_derefidx_vbuaa=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:21.5
   tay
   sty $ff
   
@@ -702,7 +702,7 @@ pbuz1_derefidx_vbuaa=vbuc1 < pbuz1_derefidx_vbuyy=vbuc1 < pbuz1_derefidx_vbuyy=v
   stx $ff
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuxx=vbuxx < pbuz1_derefidx_vbuaa=vbuaa - clobber:A Y  cycles:10.0
+*pbuz1_derefidx_vbuxx=vbuxx - clobber:A Y  cycles:10.0
   txa
   tay
   sta ({z1}),y
@@ -716,7 +716,7 @@ pbuz1_derefidx_vbuxx=vbuz1 < pbuz1_derefidx_vbuaa=vbuz1 < pbuz1_derefidx_vbuyy=v
   tay
   lda {z1}
   sta ({z1}),y
-pbuz1_derefidx_vbuxx=vbuz2 < pbuz1_derefidx_vbuaa=vbuz2 < pbuz1_derefidx_vbuyy=vbuz2 < pbuz1_derefidx_vbuyy=vbuaa - clobber:A Y  cycles:13.0
+*pbuz1_derefidx_vbuxx=vbuz2 - clobber:A Y  cycles:13.0
   txa
   tay
   lda {z2}
@@ -727,7 +727,7 @@ pbuz1_derefidx_vbuxx=_deref_pbuz1 < pbuz1_derefidx_vbuxx=vbuaa - clobber:A Y  cy
   stx $ff
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuxx=_deref_pbuz2 < pbuz1_derefidx_vbuaa=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:23.5
+pbuz1_derefidx_vbuxx=_deref_pbuz2 < pbuz1_derefidx_vbuaa=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:23.5
   txa
   tay
   sty $ff
@@ -863,7 +863,7 @@ pbuz1_derefidx_vbuyy=_deref_pbuz1 < pbuz1_derefidx_vbuaa=_deref_pbuz1 < pbuz1_de
   stx $ff
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:19.5
+pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:19.5
   sty $ff
   
   ldy #0
@@ -998,7 +998,7 @@ pbuz1_derefidx_vbuz1=_deref_pbuz1 < pbuz1_derefidx_vbuz1=vbuaa < pbuz1_derefidx_
   lda ({z1}),y
   ldy {z1}
   sta ({z1}),y
-pbuz1_derefidx_vbuz1=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:22.5
+pbuz1_derefidx_vbuz1=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:22.5
   ldy {z1}
   sty $ff
   
@@ -1104,7 +1104,7 @@ pbuz1_derefidx_vbuz1=vbuc1 < pbuz1_derefidx_vbuz1=vbuaa < pbuz1_derefidx_vbuyy=v
   lda #{c1}
   ldy {z1}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=vbuaa < pbuz1_derefidx_vbuyy=vbuaa - clobber:Y  cycles:9.0
+*pbuz1_derefidx_vbuz2=vbuaa - clobber:Y  cycles:9.0
   ldy {z2}
   sta ({z1}),y
 pbuz1_derefidx_vbuz2=vbuxx < pbuz1_derefidx_vbuyy=vbuxx < pbuz1_derefidx_vbuyy=vbuaa - clobber:A Y  cycles:11.0
@@ -1115,7 +1115,7 @@ pbuz1_derefidx_vbuz2=vbuyy < vbuaa=vbuyy - clobber:A Y  cycles:11.0
   tya
   ldy {z2}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=vbuz1 < pbuz1_derefidx_vbuz2=vbuaa < pbuz1_derefidx_vbuyy=vbuaa - clobber:A Y  cycles:12.0
+pbuz1_derefidx_vbuz2=vbuz1 < pbuz1_derefidx_vbuz2=vbuaa - clobber:A Y  cycles:12.0
   lda {z1}
   ldy {z2}
   sta ({z1}),y
@@ -1123,16 +1123,16 @@ pbuz1_derefidx_vbuz2=vbuz2 < pbuz1_derefidx_vbuaa=vbuaa - clobber:A Y  cycles:11
   lda {z2}
   tay
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=vbuz3 < pbuz1_derefidx_vbuz2=vbuaa < pbuz1_derefidx_vbuyy=vbuaa - clobber:A Y  cycles:12.0
+pbuz1_derefidx_vbuz2=vbuz3 < pbuz1_derefidx_vbuz2=vbuaa - clobber:A Y  cycles:12.0
   lda {z3}
   ldy {z2}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=_deref_pbuz1 < pbuz1_derefidx_vbuz2=vbuaa < pbuz1_derefidx_vbuyy=vbuaa - clobber:A Y  cycles:16.5
+pbuz1_derefidx_vbuz2=_deref_pbuz1 < pbuz1_derefidx_vbuz2=vbuaa - clobber:A Y  cycles:16.5
   ldy #0
   lda ({z1}),y
   ldy {z2}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:22.5
+pbuz1_derefidx_vbuz2=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:22.5
   ldy {z2}
   sty $ff
   
@@ -1140,12 +1140,12 @@ pbuz1_derefidx_vbuz2=_deref_pbuz2 < pbuz1_derefidx_vbuyy=_deref_pbuz2 < vbuaa=_d
   lda ({z2}),y
   ldy $ff
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=_deref_pbuz3 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:16.5
+pbuz1_derefidx_vbuz2=_deref_pbuz3 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:16.5
   ldy #0
   lda ({z3}),y
   ldy {z2}
   sta ({z1}),y
-pbuz1_derefidx_vbuz2=_deref_pbuc1 < pbuz1_derefidx_vbuz2=vbuaa < pbuz1_derefidx_vbuyy=vbuaa - clobber:A Y  cycles:13.0
+pbuz1_derefidx_vbuz2=_deref_pbuc1 < pbuz1_derefidx_vbuz2=vbuaa - clobber:A Y  cycles:13.0
   lda {c1}
   ldy {z2}
   sta ({z1}),y
@@ -1402,7 +1402,7 @@ pbuc1_derefidx_vbuaa=_deref_pbuz1 < pbuc1_derefidx_vbuxx=_deref_pbuz1 < pbuc1_de
   ldy #0
   lda ({z1}),y
   sta {c1},x
-pbuc1_derefidx_vbuaa=_deref_pbuz1 < pbuc1_derefidx_vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:20.5
+pbuc1_derefidx_vbuaa=_deref_pbuz1 < pbuc1_derefidx_vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:20.5
   tay
   sty $ff
   
@@ -1642,7 +1642,7 @@ pbuc1_derefidx_vbuyy=_deref_pbuz1 < pbuc1_derefidx_vbuaa=_deref_pbuz1 < pbuc1_de
   ldy #0
   lda ({z1}),y
   sta {c1},x
-pbuc1_derefidx_vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:18.5
+pbuc1_derefidx_vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:18.5
   sty $ff
   
   ldy #0
@@ -1802,7 +1802,7 @@ pbuc1_derefidx_vbuz1=_deref_pbuz2 < pbuc1_derefidx_vbuxx=_deref_pbuz1 < pbuc1_de
   ldy #0
   lda ({z2}),y
   sta {c1},x
-pbuc1_derefidx_vbuz1=_deref_pbuz2 < pbuc1_derefidx_vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 < vbuaa=vbuaa - clobber:A Y  cycles:21.5
+pbuc1_derefidx_vbuz1=_deref_pbuz2 < pbuc1_derefidx_vbuyy=_deref_pbuz1 < vbuaa=_deref_pbuz1 - clobber:A Y  cycles:21.5
   ldy {z1}
   sty $ff
   
diff --git a/src/test/ref/fragments-assignment-unary.log b/src/test/ref/fragments-assignment-unary.log
index 02446f377..0a68286cb 100644
--- a/src/test/ref/fragments-assignment-unary.log
+++ b/src/test/ref/fragments-assignment-unary.log
@@ -63,7 +63,7 @@ vbuaa=_inc__deref_pbuz1 < vbuaa=_inc_vbuaa < vbuaa=vbuaa_plus_1 - clobber:A Y  c
   adc #1
 CANNOT SYNTHESIZE vbuaa=_neg__deref_pbuz1
 CANNOT SYNTHESIZE vbuaa=_pos__deref_pbuz1
-vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A   cycles:6.0
+*vbuaa=_bnot__deref_pbuc1 - clobber:A   cycles:6.0
   lda {c1}
   eor #$ff
 vbuaa=_dec__deref_pbuc1 < vbuaa=_dec_vbuaa < vbuaa=vbuaa_minus_1 - clobber:A   cycles:8.0
@@ -279,7 +279,7 @@ vbuxx=_inc__deref_pbuz1 < vbuxx=_inc_vbuaa < vbuxx=_inc_vbuxx - clobber:A X Y  c
   inx
 CANNOT SYNTHESIZE vbuxx=_neg__deref_pbuz1
 CANNOT SYNTHESIZE vbuxx=_pos__deref_pbuz1
-vbuxx=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A X   cycles:8.0
+vbuxx=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 - clobber:A X   cycles:8.0
   lda {c1}
   eor #$ff
   tax
@@ -469,7 +469,7 @@ vbuyy=_inc__deref_pbuz1 < vbuyy=_inc_vbuaa < vbuyy=_inc_vbuyy - clobber:A Y  cyc
   iny
 CANNOT SYNTHESIZE vbuyy=_neg__deref_pbuz1
 CANNOT SYNTHESIZE vbuyy=_pos__deref_pbuz1
-vbuyy=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A Y  cycles:8.0
+vbuyy=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 - clobber:A Y  cycles:8.0
   lda {c1}
   eor #$ff
   tay
@@ -744,7 +744,7 @@ vbuz1=_inc__deref_pbuz2 < vbuaa=_inc__deref_pbuz1 < vbuaa=_inc_vbuaa < vbuaa=vbu
   sta {z1}
 CANNOT SYNTHESIZE vbuz1=_neg__deref_pbuz2
 CANNOT SYNTHESIZE vbuz1=_pos__deref_pbuz2
-vbuz1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A   cycles:9.0
+vbuz1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 - clobber:A   cycles:9.0
   lda {c1}
   eor #$ff
   sta {z1}
@@ -1159,7 +1159,7 @@ _deref_pbuz1=_inc__deref_pbuz2 < vbuaa=_inc__deref_pbuz1 < vbuaa=_inc_vbuaa < vb
   sta ({z1}),y
 CANNOT SYNTHESIZE _deref_pbuz1=_neg__deref_pbuz2
 CANNOT SYNTHESIZE _deref_pbuz1=_pos__deref_pbuz2
-_deref_pbuz1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A Y  cycles:14.0
+_deref_pbuz1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 - clobber:A Y  cycles:14.0
   lda {c1}
   eor #$ff
   ldy #0
@@ -1456,7 +1456,7 @@ _deref_pbuc1=_inc__deref_pbuz1 < vbuaa=_inc__deref_pbuz1 < vbuaa=_inc_vbuaa < vb
   sta {c1}
 CANNOT SYNTHESIZE _deref_pbuc1=_neg__deref_pbuz1
 CANNOT SYNTHESIZE _deref_pbuc1=_pos__deref_pbuz1
-_deref_pbuc1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A   cycles:10.0
+_deref_pbuc1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 - clobber:A   cycles:10.0
   lda {c1}
   eor #$ff
   sta {c1}
@@ -1466,7 +1466,7 @@ _deref_pbuc1=_bnot__deref_pbuc1 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa -
   inc {c1}
 CANNOT SYNTHESIZE _deref_pbuc1=_neg__deref_pbuc1
 CANNOT SYNTHESIZE _deref_pbuc1=_pos__deref_pbuc1
-_deref_pbuc1=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A   cycles:10.0
+_deref_pbuc1=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A   cycles:10.0
   lda {c2}
   eor #$ff
   sta {c1}
@@ -4469,12 +4469,12 @@ pbuc1_derefidx_vbuaa=_inc__deref_pbuc1 < pbuc1_derefidx_vbuyy=_inc__deref_pbuc1
   sta {c1},y
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuaa=_neg__deref_pbuc1
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuaa=_pos__deref_pbuc1
-pbuc1_derefidx_vbuaa=_bnot__deref_pbuc2 < pbuc1_derefidx_vbuxx=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A X   cycles:13.0
+pbuc1_derefidx_vbuaa=_bnot__deref_pbuc2 < pbuc1_derefidx_vbuxx=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A X   cycles:13.0
   tax
   lda {c2}
   eor #$ff
   sta {c1},x
-pbuc1_derefidx_vbuaa=_bnot__deref_pbuc2 < pbuc1_derefidx_vbuyy=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A Y  cycles:13.0
+pbuc1_derefidx_vbuaa=_bnot__deref_pbuc2 < pbuc1_derefidx_vbuyy=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A Y  cycles:13.0
   tay
   lda {c2}
   eor #$ff
@@ -4886,7 +4886,7 @@ pbuc1_derefidx_vbuxx=_inc__deref_pbuc1 < pbuc1_derefidx_vbuxx=_inc_vbuaa < vbuaa
   sta {c1},x
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuxx=_neg__deref_pbuc1
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuxx=_pos__deref_pbuc1
-pbuc1_derefidx_vbuxx=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A   cycles:11.0
+pbuc1_derefidx_vbuxx=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A   cycles:11.0
   lda {c2}
   eor #$ff
   sta {c1},x
@@ -5255,7 +5255,7 @@ pbuc1_derefidx_vbuyy=_inc__deref_pbuc1 < pbuc1_derefidx_vbuyy=_inc_vbuaa < vbuaa
   sta {c1},y
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuyy=_neg__deref_pbuc1
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuyy=_pos__deref_pbuc1
-pbuc1_derefidx_vbuyy=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A   cycles:11.0
+pbuc1_derefidx_vbuyy=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A   cycles:11.0
   lda {c2}
   eor #$ff
   sta {c1},y
@@ -5788,12 +5788,12 @@ pbuc1_derefidx_vbuz1=_inc__deref_pbuc1 < pbuc1_derefidx_vbuz1=_inc_vbuaa < pbuc1
   sta {c1},y
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuz1=_neg__deref_pbuc1
 CANNOT SYNTHESIZE pbuc1_derefidx_vbuz1=_pos__deref_pbuc1
-pbuc1_derefidx_vbuz1=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A X   cycles:14.0
+pbuc1_derefidx_vbuz1=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A X   cycles:14.0
   lda {c2}
   eor #$ff
   ldx {z1}
   sta {c1},x
-pbuc1_derefidx_vbuz1=_bnot__deref_pbuc2 < pbuc1_derefidx_vbuyy=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 < vbuaa=_bnot_vbuaa - clobber:A Y  cycles:14.0
+pbuc1_derefidx_vbuz1=_bnot__deref_pbuc2 < pbuc1_derefidx_vbuyy=_bnot__deref_pbuc2 < vbuaa=_bnot__deref_pbuc1 - clobber:A Y  cycles:14.0
   ldy {z1}
   lda {c2}
   eor #$ff