Update app.py

app.py

@@ -1,5 +1,5 @@
-# verify_bug2_ver4.py
-# 実行方法: python verify_bug2_ver4.py
+# verify_bug2_ver5.py
+# 実行方法: python verify_bug2_ver5.py
 
 import re
 import difflib
@@ -19,13 +19,22 @@ CJK_COMPATIBILITY        = set(range(0x3300, 0x3400))
 ENCLOSED_ALPHANUMERICS   = set(range(0x2460, 0x2500))
 ENCLOSED_CJK_LETTERS     = set(range(0x3200, 0x3300))
 
-HYPHENS = set(['\u002D','\uFF0D','\u2010','\u2011','\u2013','\u2014'])
+HYPHENS = set([
+    '\u002D',  # 半角ハイフンマイナス
+    '\uFF0D',  # 全角ハイフンマイナス
+    '\u2010',  # HYPHEN
+    '\u2011',  # NON-BREAKING HYPHEN
+    '\u2012',  # FIGURE DASH
+    '\u2013',  # EN DASH
+    '\u2014',  # EM DASH
+])
+
 KANJI_NUMBERS = set('零一二三四五六七八九十')
 ARABIC_NUMBERS = set('0123456789０１２３４５６７８９')
 
 YAKUMONO = set(
-    '。、．，'
-    '〔〕《》〈〉【】［］（）()'
+    '。、．，.,'
+    '〔〕《》〈〉【】［］（）()[]'
     '「」『』｢｣'
     '〝〟'
     '！？・…―'
@@ -151,21 +160,14 @@ def merge_ranges(ranges):
 # ポストフィルタリング
 # ============================================================
 
-EQUAL_MERGE_THRESHOLD = 2  # この文字数以下のequal区間は差分に取り込む
+EQUAL_MERGE_THRESHOLD = 2
 
 def filter_opcodes(opcodes):
-    """
-    equal区間がTHRESHOLD以下の場合、前後の差分区間と結合する。
-    結果としてdiff区間のみのリストを返す。
-    """
-    # まずopcodeをリスト化
     ops = list(opcodes)
     n = len(ops)
     if n == 0:
-        return []
+        return [], []
 
-    # equal区間が短い場合にdiffとして扱うフラグ
-    # Trueはdiff扱い、Falseはequal扱い
     is_diff = []
     for tag, i1, i2, j1, j2 in ops:
         if tag == 'equal':
@@ -173,49 +175,33 @@ def filter_opcodes(opcodes):
         else:
             is_diff.append(True)
 
-    # 両端のequal（diff扱いになったもの）は差分にしない
-    # 先頭のequal
+    # 両端のequal区間はdiff扱いにしない
     for idx in range(n):
-        tag = ops[idx][0]
-        if tag == 'equal':
+        if ops[idx][0] == 'equal':
             is_diff[idx] = False
         else:
             break
-    # 末尾のequal
     for idx in range(n-1, -1, -1):
-        tag = ops[idx][0]
-        if tag == 'equal':
+        if ops[idx][0] == 'equal':
             is_diff[idx] = False
         else:
             break
 
-    # diff区間を結合して返す
     result_src = []
     result_dst = []
 
     i = 0
     while i < n:
         if is_diff[i]:
-            # 連続するdiff区間をまとめる
-            tag, i1, i2, j1, j2 = ops[i]
-            src_start, src_end = i1, i2
-            dst_start, dst_end = j1, j2
             j = i + 1
             while j < n and is_diff[j]:
-                _, ni1, ni2, nj1, nj2 = ops[j]
-                src_end = ni2
-                dst_end = nj2
                 j += 1
-            # src側に差分があるか
-            # equal扱いのdiffも含むのでsrc_start~src_endの中にreplaceやdeleteがあるか確認
-            has_src_diff = any(
-                ops[k][0] in ('replace', 'delete')
-                for k in range(i, j)
-            )
-            has_dst_diff = any(
-                ops[k][0] in ('replace', 'insert')
-                for k in range(i, j)
-            )
+            src_start = ops[i][1]
+            src_end   = ops[j-1][2]
+            dst_start = ops[i][3]
+            dst_end   = ops[j-1][4]
+            has_src_diff = any(ops[k][0] in ('replace', 'delete') for k in range(i, j))
+            has_dst_diff = any(ops[k][0] in ('replace', 'insert') for k in range(i, j))
             if has_src_diff:
                 result_src.append((src_start, src_end))
             if has_dst_diff:
@@ -247,7 +233,6 @@ def compare_texts(src, dst, settings):
     if src_active != '' or dst_active != '':
         matcher = difflib.SequenceMatcher(None, src_active, dst_active, autojunk=False)
         opcodes = matcher.get_opcodes()
-
         result_src, result_dst = filter_opcodes(opcodes)
 
         for a_start, a_end in result_src:
@@ -354,7 +339,7 @@ DST25 = (
 # ============================================================
 
 print("=" * 60)
-print("バグ2 検証スクリプト ver4")
+print("バグ2 検証スクリプト ver5")
 print("=" * 60)
 
 run_test("TEST-01 相違なし",