[PATCH] Minor cleanup

[Piotr Piastucki <leech miranda gmail com>]

Hi,

I am attaching a small patch that cleans up the code in matchers module 
a bit.

Cheers,
Piotr

>From ad9f33df14ac9e192fa57393ca754ea120381d6f Mon Sep 17 00:00:00 2001
From: Piotr Piastucki <the_leech users berlios de>
Date: Mon, 17 Dec 2012 17:21:28 +0100
Subject: [PATCH] Clean up matchers.py 
 This commit removes "snakes" array which was useful for 
 debugging but it is not needed anymore and adds some 
 documentation to postprocess() method.

---
 meld/matchers.py |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/meld/matchers.py b/meld/matchers.py
index 2dc716e..01e7ee5 100644
--- a/meld/matchers.py
+++ b/meld/matchers.py
@@ -65,8 +65,8 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
         self.b = b
         self.matching_blocks = self.opcodes = None
         #fields needed by preprocessor so that preprocessing may shared by more than 1 LCS algorithm
-        self.aindex = {}
-        self.bindex = {}
+        self.aindex = []
+        self.bindex = []
         self.common_prefix = self.common_suffix = 0
         self.lines_discarded = False
 
@@ -136,6 +136,11 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
         return self.preprocess_discard_nonmatching_lines(a, b)
 
     def postprocess(self):
+        """
+        Perform some post-processing cleanup to reduce 'chaff' and make the result more human-readable. 
+        Since Myers diff is a greedy algorithm backward scanning of matching chunks might reveal some smaller chunks that
+        can be combined together. 
+        """
         mb = [self.matching_blocks[-1]]
         i = len(self.matching_blocks) - 2
         while i >= 0:
@@ -157,7 +162,7 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
         mb.reverse()
         self.matching_blocks = mb
 
-    def build_matching_blocks(self, lastsnake, snakes):
+    def build_matching_blocks(self, lastsnake):
         """
         Build list of matching blocks based on snakes taking into consideration all preprocessing
         optimizations:
@@ -171,7 +176,7 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
         aindex = self.aindex
         bindex = self.bindex
         while lastsnake != None:
-            lastsnake, x, y, snake = snakes[lastsnake]
+            lastsnake, x, y, snake = lastsnake
             if self.lines_discarded:
                 # split snakes if needed because of discarded lines
                 x += snake - 1
@@ -220,7 +225,6 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
         delta = n - m + middle
         dmin = min(middle, delta)
         dmax = max(middle, delta)
-        snakes = []
         if n > 0 and m > 0:
             size = n + m + 2
             fp = [(-1, None)] * size
@@ -247,8 +251,7 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
                             x += 1
                             yv += 1
                         snake = x - snake
-                        snakes.append((node, x - snake, yv - snake, snake))
-                        node = len(snakes) - 1
+                        node = (node, x - snake, yv - snake, snake)
                     fp[km] = (yv, node)
                 # move along horizontal edge
                 yh = -1
@@ -267,8 +270,7 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
                             x += 1
                             yh += 1
                         snake = x - snake
-                        snakes.append((node, x - snake, yh - snake, snake))
-                        node = len(snakes) - 1
+                        node = (node, x - snake, yh - snake, snake)
                     fp[km] = (yh, node)
                 # point on the diagonal that leads to the sink
                 if yv < yh:
@@ -285,13 +287,12 @@ class MyersSequenceMatcher(difflib.SequenceMatcher):
                         x += 1
                         y += 1
                     snake = x - snake
-                    snakes.append((node, x - snake, y - snake, snake))
-                    node = len(snakes) - 1
+                    node = (node, x - snake, y - snake, snake)
                 fp[delta] = (y, node)
                 if y >= n:
                     lastsnake = node
                     break
-        self.build_matching_blocks(lastsnake, snakes)
+        self.build_matching_blocks(lastsnake)
         self.postprocess()
         yield 1
 
-- 
1.7.10.4