cleanup in preparation for order patches

Author: paulfitz

coopy/CellInfo.hx

@@ -8,6 +8,20 @@ class CellInfo {
     public var pretty_value : String;
     public var category : String;
     public var category_given_tr : String;
+    
+    // relevant to updates, conflicts
+    public var separator : String;
+    public var updated : Bool;
+    public var conflicted : Bool;
+    public var pvalue : String;
+    public var lvalue : String;
+    public var rvalue : String;
 
     public function new() : Void {}
+
+    public function toString() : String {
+        if (!updated) return value;
+        if (!conflicted) return lvalue + "::" + rvalue;
+        return pvalue + "||" + lvalue + "::" + rvalue;
+    }
 }

coopy/CompareFlags.hx

@@ -7,13 +7,17 @@ class CompareFlags {
     public var always_show_header : Bool;
     public var show_unchanged : Bool;
     public var unchanged_context : Int;
-    public var show_rc_numbers : Bool;
+    public var always_show_order : Bool;
+    public var never_show_order : Bool;
+    public var ordered : Bool;
 
     public function new() {
         always_show_header = true;
         show_unchanged = false;
         unchanged_context = 1;
-        show_rc_numbers = false;
+        always_show_order = false;
+        never_show_order = true;
+        ordered = true;
     }
 }
 

coopy/DiffRender.hx

@@ -72,15 +72,19 @@ class DiffRender {
     }
 
 
-    private static function examineCell(x: Int,
-                                        y: Int,
-                                        value : String,
-                                        vcol : String,
-                                        vrow : String,
-                                        vcorner : String,
-                                        cell : CellInfo) : Void {
+    public static function examineCell(x: Int,
+                                       y: Int,
+                                       value : String,
+                                       vcol : String,
+                                       vrow : String,
+                                       vcorner : String,
+                                       cell : CellInfo) : Void {
         cell.category = "";
         cell.category_given_tr = "";
+        cell.separator = "";
+        cell.conflicted = false;
+        cell.updated = false;
+        cell.pvalue = cell.lvalue = cell.rvalue = null;
         cell.value = value;
         if (cell.value==null) cell.value = "";
         cell.pretty_value = cell.value;
@@ -117,10 +121,18 @@ class DiffRender {
                         if (cell.value.indexOf(full)>=0) {
                             div = full;
                             cat = "conflict";
+                            cell.conflicted = true;
                         }
                     }
-                    cell.pretty_value = cell.pretty_value.split(div).join(String.fromCharCode(8594));
+                    cell.updated = true;
+                    cell.separator = div;
+                    tokens = cell.pretty_value.split(div);
+                    cell.pretty_value = tokens.join(String.fromCharCode(8594));
                     cell.category_given_tr = cell.category = cat;
+                    var offset : Int = cell.conflicted?1:0;
+                    cell.lvalue = tokens[offset];
+                    cell.rvalue = tokens[offset+1];
+                    if (cell.conflicted) cell.pvalue = tokens[0];
                 }
             }
         }