move diff to tests/tools/diff

Simn · Simn · commit f2546fc19214 · 2026-03-07T08:53:19.000+01:00
diff --git a/tests/misc/compile.hxml b/tests/misc/compile.hxml
@@ -1,4 +1,5 @@
 -p src
+-p ../tools
 #-D MISC_TEST_FILTER=4270
 -main Main
 --interp 
diff --git a/tests/misc/compiler_loops/run.hxml b/tests/misc/compiler_loops/run.hxml
@@ -1,3 +1,4 @@
 -cp ../src
+-cp ../../tools
 -D timeout=3
 --run Main
diff --git a/tests/misc/cpp/run.hxml b/tests/misc/cpp/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/flash/run.hxml b/tests/misc/flash/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/hl/run.hxml b/tests/misc/hl/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/hlc/run.hxml b/tests/misc/hlc/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/java/run.hxml b/tests/misc/java/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/js/run.hxml b/tests/misc/js/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/lua/run.hxml b/tests/misc/lua/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/neko/run.hxml b/tests/misc/neko/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/php/run.hxml b/tests/misc/php/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/python/run.hxml b/tests/misc/python/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/misc/resolution/run.hxml b/tests/misc/resolution/run.hxml
@@ -1,2 +1,3 @@
 -cp ../src
+-cp ../../tools
 --run Main
diff --git a/tests/tools/diff/Analyze.hx b/tests/tools/diff/Analyze.hx
@@ -0,0 +1,132 @@
+package diff;
+
+import haxe.ds.Vector;
+import diff.Diffseq;
+
+class Analyze {
+	static function discardConfusingLines(file1:FileData, file2:FileData) {}
+
+	static function analyzeHunk(ctx:Context, script:Array<Change>) {
+		var showFrom = 0;
+		var showTo = 0;
+
+		final first0 = script[0].line0;
+		final first1 = script[0].line1;
+
+		var l0 = 0;
+		var l1 = 0;
+		for (next in script) {
+			l0 = next.line0 + next.deleted - 1;
+			l1 = next.line1 + next.inserted - 1;
+			showFrom += next.deleted;
+			showTo += next.inserted;
+		}
+
+		return {
+			first0: first0,
+			first1: first1,
+			last0: l0,
+			last1: l1,
+			showFrom: showFrom > 0,
+			showTo: showTo > 0
+		}
+	}
+
+	static function buildScript(ctx:Context) {
+		var currentChange = null;
+		var firstChange = null;
+		function addChange(line0:Int, line1:Int, deleted:Int, inserted:Int) {
+			var change:Change = {
+				line0: line0,
+				line1: line1,
+				deleted: deleted,
+				inserted: inserted
+			};
+			if (currentChange == null) {
+				currentChange = change;
+				firstChange = change;
+			} else {
+				currentChange.next = change;
+				currentChange = change;
+			}
+		};
+		final changed0 = ctx.file1.changed;
+		final changed1 = ctx.file2.changed;
+		final len0 = ctx.file1.lines.length;
+		final len1 = ctx.file2.lines.length;
+		var i0 = 0;
+		var i1 = 0;
+		while (i0 < len0 || i1 < len1) {
+			if (changed0[i0] | changed1[i1] != 0) {
+				final line0 = i0;
+				final line1 = i1;
+				while (changed0[i0] != 0) {
+					++i0;
+				}
+				while (changed1[i1] != 0) {
+					++i1;
+				}
+				addChange(line0, line1, i0 - line0, i1 - line1);
+			}
+			i0++;
+			i1++;
+		}
+		return firstChange;
+	}
+
+	static function printNormalHunk(ctx:Context, script:Array<Change>) {
+		// final changes = analyzeHunk(ctx, script);
+		var buf = new StringBuf();
+		for (change in script) {
+			if (change.deleted > 0) {
+				for (i in change.line0...change.line0 + change.deleted) {
+					final line = ctx.file1.lines[i];
+					buf.add("< ");
+					buf.add(ctx.file1.data.sub(line.pos, line.length));
+					buf.addChar("\n".code);
+				}
+			}
+			buf.add("---\n");
+			if (change.inserted > 0) {
+				for (i in change.line1...change.line1 + change.inserted) {
+					final line = ctx.file2.lines[i];
+					buf.add("> ");
+					buf.add(ctx.file2.data.sub(line.pos, line.length).toString());
+					buf.addChar("\n".code);
+				}
+			}
+		}
+		return buf.toString();
+	}
+
+	static public function diff2Files(ctx:Context) {
+		Io.readFiles(ctx);
+		final flagSpace = new Vector(ctx.file1.lines.length + ctx.file2.lines.length + 4);
+		for (i in 0...flagSpace.length) {
+			flagSpace[i] = 0;
+		}
+		ctx.file1.changed = new IndexVector(flagSpace, 1);
+		ctx.file2.changed = new IndexVector(flagSpace, ctx.file1.lines.length + 3);
+		// TODO: discardConfusingLines
+		final diags = ctx.file1.equivs.length + ctx.file2.equivs.length + 3;
+		var fdiag = new IndexVector(new Vector(diags * 2), 0);
+		var bdiag = fdiag + diags;
+		fdiag += ctx.file2.equivs.length + 1;
+		bdiag += ctx.file2.equivs.length + 1;
+		var dCtx:DiffseqContext = {
+			xvec: ctx.file1.equivs,
+			yvec: ctx.file2.equivs,
+			fdiag: fdiag,
+			bdiag: bdiag,
+			NOTE_INSERT: (d) -> {
+				ctx.file2.markChange(d);
+			},
+			NOTE_DELETE: (d) -> {
+				ctx.file1.markChange(d);
+			}
+		}
+		Diffseq.compareseq(0, ctx.file1.equivs.length, 0, ctx.file2.equivs.length, dCtx);
+		// TODO: shiftBoundaries
+		return buildScript(ctx);
+	}
+}
diff --git a/tests/tools/diff/Change.hx b/tests/tools/diff/Change.hx
@@ -0,0 +1,15 @@
+package diff;
+
+@:structInit
+class Change {
+	@:optional
+	public var next:Null<Change>;
+	public var inserted:Int;
+	public var deleted:Int;
+	public var line0:Int;
+	public var line1:Int;
+
+	public function toString() {
+		return '[CHANGE inserted: $inserted, deleted: $deleted, line0: $line0, line1: $line1]';
+	}
+}
diff --git a/tests/tools/diff/Context.hx b/tests/tools/diff/Context.hx
@@ -0,0 +1,8 @@
+package diff;
+
+@:structInit
+class Context {
+	public final file1:FileData;
+	public final file2:FileData;
+	public var context:Int;
+}
diff --git a/tests/tools/diff/Diffseq.hx b/tests/tools/diff/Diffseq.hx
@@ -0,0 +1,176 @@
+package diff;
+
+import haxe.ds.Vector;
+
+@:structInit
+private class Parition {
+	public var xmid:Int;
+	public var ymid:Int;
+
+	function toString() {
+		return '[Partition xmid: $xmid, ymid: $ymid]';
+	}
+}
+
+final OFFSET_MAX = 1 << 30;
+
+@:structInit
+class DiffseqContext {
+	public final xvec:Vector<Int>;
+	public final yvec:Vector<Int>;
+	public final fdiag:IndexVector;
+	public final bdiag:IndexVector;
+	public final NOTE_DELETE:(Int) -> Void;
+	public final NOTE_INSERT:(Int) -> Void;
+}
+
+class Diffseq {
+	static public function diag(xoff:Int, xlim:Int, yoff:Int, ylim:Int, ctxt:DiffseqContext):Parition {
+		var fd = ctxt.fdiag;
+		var bd = ctxt.bdiag;
+		var xv = ctxt.xvec;
+		var yv = ctxt.yvec;
+		inline function XREF_YREF_EQUAL(x, y) {
+			return xv[x] == yv[y];
+		}
+		final dmin = xoff - ylim;
+		final dmax = xlim - yoff;
+		final fmid = xoff - yoff;
+		final bmid = xlim - ylim;
+		var fmin = fmid;
+		var fmax = fmid;
+		var bmin = bmid;
+		var bmax = bmid;
+		var odd = ((fmid - bmid) & 1) != 0;
+		fd[fmid] = xoff;
+		bd[bmid] = xlim;
+		while (true) {
+			var d;
+			if (fmin > dmin) {
+				fd[--fmin - 1] = -1;
+			} else {
+				++fmin;
+			}
+			if (fmax < dmax) {
+				fd[++fmax + 1] = -1;
+			} else {
+				--fmax;
+			}
+			d = fmax;
+			while (d >= fmin) {
+				var tlo = fd[d - 1];
+				var thi = fd[d + 1];
+				var x0 = tlo < thi ? thi : tlo + 1;
+				var x = x0;
+				var y = x0 - d;
+				while (x < xlim && y < ylim && XREF_YREF_EQUAL(x, y)) {
+					x++;
+					y++;
+				}
+				fd[d] = x;
+				if (odd && bmin <= d && d <= bmax && bd[d] <= x) {
+					return {
+						xmid: x,
+						ymid: y
+					}
+				}
+				d -= 2;
+			}
+
+			if (bmin > dmin) {
+				bd[--bmin - 1] = OFFSET_MAX;
+			} else {
+				++bmin;
+			}
+			if (bmax < dmax) {
+				bd[++bmax + 1] = OFFSET_MAX;
+			} else {
+				--bmax;
+			}
+			d = bmax;
+			while (d >= bmin) {
+				var tlo = bd[d - 1];
+				var thi = bd[d + 1];
+				var x0 = tlo < thi ? tlo : thi - 1;
+				var x = x0;
+				var y = x0 - d;
+				while (xoff < x && yoff < y && XREF_YREF_EQUAL(x - 1, y - 1)) {
+					x--;
+					y--;
+				}
+				bd[d] = x;
+				if (!odd && fmin <= d && d <= fmax && x <= fd[d]) {
+					return {
+						xmid: x,
+						ymid: y
+					}
+				}
+				d -= 2;
+			}
+		}
+	}
+
+	static public function compareseq(xoff:Int, xlim:Int, yoff:Int, ylim:Int, ctxt:DiffseqContext) {
+		final xv = ctxt.xvec;
+		final yv = ctxt.yvec;
+		inline function XREF_YREF_EQUAL(x, y) {
+			return xv[x] == yv[y];
+		}
+		while (true) {
+			while (xoff < xlim && yoff < ylim && XREF_YREF_EQUAL(xoff, yoff)) {
+				xoff++;
+				yoff++;
+			}
+
+			while (xoff < xlim && yoff < ylim && XREF_YREF_EQUAL(xlim - 1, ylim - 1)) {
+				xlim--;
+				ylim--;
+			}
+
+			if (xoff == xlim) {
+				while (yoff < ylim) {
+					ctxt.NOTE_INSERT(yoff);
+					yoff++;
+				}
+				break;
+			}
+			if (yoff == ylim) {
+				while (xoff < xlim) {
+					ctxt.NOTE_DELETE(xoff);
+					xoff++;
+				}
+				break;
+			}
+
+			var part = diag(xoff, xlim, yoff, ylim, ctxt);
+
+			var xoff1, xlim1, yoff1, ylim1, xoff2, xlim2, yoff2, ylim2;
+			if ((xlim + ylim) - (part.xmid + part.ymid) < (part.xmid + part.ymid) - (xoff + yoff)) {
+				xoff1 = part.xmid;
+				xlim1 = xlim;
+				yoff1 = part.ymid;
+				ylim1 = ylim;
+				xoff2 = xoff;
+				xlim2 = part.xmid;
+				yoff2 = yoff;
+				ylim2 = part.ymid;
+			} else {
+				xoff1 = xoff;
+				xlim1 = part.xmid;
+				yoff1 = yoff;
+				ylim1 = part.ymid;
+				xoff2 = part.xmid;
+				xlim2 = xlim;
+				yoff2 = part.ymid;
+				ylim2 = ylim;
+			}
+			compareseq(xoff1, xlim1, yoff1, ylim1, ctxt);
+
+			xoff = xoff2;
+			xlim = xlim2;
+			yoff = yoff2;
+			ylim = ylim2;
+		}
+		return false;
+	}
+}
diff --git a/tests/tools/diff/FileData.hx b/tests/tools/diff/FileData.hx
diff --git a/tests/tools/diff/IndexVector.hx b/tests/tools/diff/IndexVector.hx
diff --git a/tests/tools/diff/Io.hx b/tests/tools/diff/Io.hx
diff --git a/tests/tools/diff/Printer.hx b/tests/tools/diff/Printer.hx

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`-cp ../src`
	`2`	`+-cp ../../tools`
`2`	`3`	`--run Main`