Method and apparatus for reconciling conflicting translations by factoring and parameterizing differences

Claim 3

The method of claim 1 wherein said step of checking comprises calculating respective subsequences of differing tokens, said respective subsequences comprising said textual difference.

Claim 4

The method of claim 1 wherein said step of encapsulating comprises informing a user of said textual difference; and informing a user of said textual difference; and requesting a name for said new parameter.

Claim 5

The method of claim 1 wherein said step of encapsulating comprises modifying said source program to include said new parameter in a comment in said source program, leaving unaffected the behavior of said source program.

Claim 14

The method of claim 1, further comprising the steps of recognizing a second macro in said source program; recognizing no macro expansion in said virtual source corresponding to said second macro; and omitting a translation for said second macro in said target program.

Claim 15

The method of claim 7 wherein said step of adjusting a macro expansion fragment comprises traversing a first ordered list of elements in a shallow in-order manner, producing a first ordered yield of elements, and traversing a second ordered list in a shallow in-order manner, producing a second ordered yield of elements; comparing said first and second yields; identifying a first element in said first yield and a second element in said second yield, said first and second elements being the respective first element where said first and second yields differ; identifying a first sub-list of adjacent elements of said first yield beginning with said first element and a second sub-list of adjacent elements of said second yield beginning with said second element, such that removal of the first sub-list from the first yield and removal of the second sub-list from the second yield would cause the first and second removal-modified yields elements to be equivalent; removing the first sub-list from the first list, thus creating a former position of the first sub-list; inserting a first new element at the former position of the first sub-list, said first new element representing similarities between said first and second sub-lists and differences between the similarities and the first sub-list.

Claim 16

The method of claim 8 wherein said step of adjusting all macro expansion fragments comprises a. ordering all macro expansion fragments of said target macro, including first- and second-in-order macro expansion fragments; b. selecting said first- and second-in-order macro expansion fragments as the set and next-in-order macro expansion fragments, respectively; c. calculating ordered pairs of token subsequences which differ between said set- and said next-in-order macro expansion fragments; d. continuing from the step of selecting (29.m), if there is no pair of differing token subsequences; e. otherwise, selecting said first-in-order pair of token subsequences as the next-in-order pair of token subsequences; f. firstly determining whether a member of said next-in-order pair of token subsequences represents an invocation expression; g. encapsulating said representing member in a static fragment corresponding to the fragment that said invocation expression invokes, and continuing at the step of selecting (29.l), all if said first determination is TRUE; h. otherwise, secondly determining whether the first member of said next-in-order pair of token subsequences matches tokens in a first subordinate fragment; i. encapsulating each member of said next-in-order pair of token subsequences in respective instances of a new static fragment, and continuing at the step of selecting (29.l), all if said second determination is FALSE; j. otherwise, thirdly determining whether the second member of said next-in-order pair of token subsequences matches tokens in a second subordinate fragment corresponding to said set subordinate fragment; k. encapsulating the first and second members of said next-in-order pair of token subsequences in respective instances of static fragments corresponding to respective subordinate fragments; l. selecting the next-in-order pair of token subsequence, if any, and continuing from said step of firstly determining (29.f); m. otherwise, selecting either of said set and next-in-order macro expansion fragments whose token subsequence was encapsulated in said encapsulation of steps (29.g), (29.i) or (29.k) as the set macro expansion fragment, selecting the next-in-order macro expansion fragment, if any, and continuing from said step of calculating (29.c); n. otherwise, ending said method, if a next-in-order macro expansion fragment is not selectable.

Claim 17

The method of claim 5 wherein said step of adjusting a macro expansion fragment to encapsulate comprises allocating an encapsulation expansion fragment to encapsulate said textual mismatch; creating an invocation expression for said encapsulation expansion fragment; associating said invocation expression with said encapsulation fragment; removing the text of said textual mismatch from said macro expansion fragment; adding said encapsulation fragment to said macro expansion fragment where said text was removed from said macro expansion fragment; and adding said removed text to said encapsulation expansion fragment.

Claim 18

The method of claim 5 wherein said step of adjusting a macro expansion fragment to encapsulate comprises linking an invocation expression for an encapsulation fragment that is an instance of a static fragment to said encapsulation fragment; removing tokens from a location in a first fragment in which said token subsequence resides; adding said invocation expression to said first fragment at said location no longer occupied by said tokens; and placing token in said encapsulation fragment.