lcs: rename generic "diff" to lcs-diff

basis/lcs/lcs-docs.factor

@@ -9,7 +9,7 @@ HELP: lcs
 { $values { "seq1" sequence } { "seq2" sequence } { "lcs" "a longest common subsequence" } }
 { $description "Given two sequences, calculates a longest common subsequence between them. Note two things: this is only one of the many possible LCSs, and the LCS may not be contiguous." } ;
 
-HELP: diff
+HELP: lcs-diff
 { $values { "old" sequence } { "new" sequence } { "diff" "an edit script" } }
 { $description "Given two sequences, find a minimal edit script from the old to the new. There may be more than one minimal edit script, and this chooses one arbitrarily. This script is in the form of an array of the tuples of the classes " { $link retain } ", " { $link delete } " and " { $link insert } " which have their information stored in the 'item' slot." } ;
 
@@ -26,10 +26,10 @@ ARTICLE: "lcs" "LCS, diffing and distance"
 "This vocabulary provides words for three apparently unrelated but in fact very similar problems: finding a longest common subsequence between two sequences, getting a minimal edit script (diff) between two sequences, and calculating the Levenshtein distance between two sequences. The implementations of these algorithms are very closely related, and all running times are O(nm), where n and m are the lengths of the input sequences."
 { $subsections
     lcs
-    diff
+    lcs-diff
     levenshtein
 }
-"The " { $link diff } " word returns a sequence of tuples of the following classes. They all hold their contents in the 'item' slot."
+"The " { $link lcs-diff } " word returns a sequence of tuples of the following classes. They all hold their contents in the 'item' slot."
 { $subsections
     insert
     delete

basis/lcs/lcs-tests.factor

@@ -22,4 +22,4 @@ USING: tools.test lcs ;
         T{ retain f CHAR: d }
         T{ insert f CHAR: e }
         T{ insert f CHAR: f }
-} ] [ "faxbcd" "abdef" diff ] unit-test
+} ] [ "faxbcd" "abdef" lcs-diff ] unit-test

basis/lcs/lcs.factor

@@ -99,8 +99,8 @@ TUPLE: trace-state old new table i j ;
 
 PRIVATE>
 
-: diff ( old new -- diff )
+: lcs-diff ( old new -- diff )
     2dup [ lcs-initialize ] [ lcs-step ] run-lcs trace-diff ;
 
 : lcs ( seq1 seq2 -- lcs )
-    [ diff [ retain? ] filter ] keep [ item>> ] swap map-as ;
+    [ lcs-diff [ retain? ] filter ] keep [ item>> ] swap map-as ;