JPH0981371A - Automatic version-up method and device for source code - Google Patents

Abstract

PROBLEM TO BE SOLVED: To perform the automatic version-up of a source code. SOLUTION: When the files 11, 12-1 and 12-2 are designated as an original file, a 1st derived file and a 2nd derived file respectively, these files 11, 12-1 and 12-2 are read into a difference information generation mechanism 21 from a magnetic disk device 1. Then the differences are calculated between the files 11 and 12-1 and also between the files 11 and 12-2 respectively. The correspondence is secured between the rows of both files 12-1 and 12-2 via the file 11 based on those calculated differences, so that the difference information 210 is generated. A merge mechanism 22 adds a changed part of the file 12-1 to the file 12-2, for example, to generate an output file 220 based on the information 210 and both files 12-1 and 12-2.

Description

Detailed Description of the Invention

[0001]

BACKGROUND OF THE INVENTION 1. Field of the Invention The present invention relates to an automatic source code upgrade method and apparatus suitable for upgrading source code.

[0002]

2. Description of the Related Art Conventionally, source code files have been merged by the method shown in FIG. 21 as follows. That is, when two files (derivation versions) 62-1 and 62-2 derived from a certain original file 61 exist, these two derivation files 62-1 and 62-2 are compared and the difference is detected. Then, the files are merged based on the difference and a new file (new version) 63 is generated.

[0003]

Therefore, by using the merging method as shown in FIG. 21, for example, the derived file 6
2-1 is already working, but the derived file 62-2 is not working yet.
If the changed part in the derived file 62-2 can be incorporated in -1, it is effective to reduce the occurrence of troubles when the source code is upgraded.

However, in the conventional file merging method described above, the derived files 62-1 and 62-2 are arranged at the same level, and the derived files 62-1 and 6-2 are arranged at the same level.
Although the difference between 2-2 is known, it is not known which change is caused in which derived file, so the derived file 62-1 and the derived file 62-2 as described above are not known. Incorporating the changes made in, unless the user sequentially directs them to do so
It was impossible.

Further, in the conventional merging method, information such as what kind of file the original file 61 is, and what difference the original file 61 has and the derived files 62-1 and 62-2 are different. It was not taken into consideration at once. Therefore, it is not possible to determine whether the difference between each of the derived files 62-1 and 62-2 is due to the collision of the changed parts, or the change of only one file, and the user separately needs the source code. It was necessary to compare and judge.

The present invention has been made in consideration of the above circumstances, and an object thereof is to upgrade a source code, and in particular, one of two derived files derived from an original file of the source code and a changed portion of the other file. It is an object of the present invention to provide a source code automatic version upgrade device and method capable of automatically performing a merge process of capturing a new version and creating a new version.

[0007]

The configuration according to the first aspect of the present invention is to check a difference between an original file of source code and a first derived file derived from the original file,
The first difference information indicating the corresponding positional relationship is generated, and the difference between the original file and the second derived file derived from the original file is checked to obtain the second difference information indicating the corresponding positional relationship. After the generation, the third difference information indicating the positional relationship corresponding to the difference between the first and second derivative files is generated from the first and second difference information,
Based on the third difference information and the first and second derived files, one of the first and second derived files contains the changed portion of the other file in the source code. It is characterized in that a merged file is generated to generate an upgraded output file. Here, when the changed portion of the other file is loaded into the one file, identification information (mark information) indicating that the changed portion is loaded from the other file may be added to, for example, each line of the changed portion.

A configuration according to a second aspect of the present invention is the same as the configuration according to the first aspect, in which a difference between the first and second derived files is examined and a positional relationship corresponding to the difference is shown. 4 is added, and the validity of the merge is verified by referring to the fourth difference information at the time of merging.

According to a third aspect of the present invention, the output file and each input file (the original file, the first and second derivative files) are compared with the configuration according to the first aspect. Then, a process for verifying whether or not the output files are correctly merged is added.

According to a fourth aspect of the present invention, each input file (original file, first and second derivative files) is used.
Is decomposed for each function to generate a function list for each file, and then the difference between the function list of the original file and the function list of the first derived file in each of these function lists is checked, and a first positional relationship indicating the corresponding positional relationship is determined. While generating the difference information, the difference between both function lists of the original file and the second derivative file is checked, and the second difference information indicating the corresponding positional relationship is generated,
Further, from the first and second difference information, the first and second
3rd difference information indicating the positional relationship corresponding to the difference between both function lists of the derived file is generated, and based on this 3rd difference information and the 1st and 2nd derived files, It is characterized in that the source code is merged into any one of the second derived files so as to incorporate the changed portion of the other file to generate an upgraded output file.

In the configuration according to the fifth aspect of the present invention, the difference between the original file and the first derived file is checked, the first difference information indicating the corresponding positional relationship is generated, and The difference between the second derivative files is checked, the second difference information indicating the corresponding positional relationship is generated, and the difference between the first and second derivative files is generated from the first and second difference information. While the third difference information indicating the positional relationship corresponding to is generated, while searching for a place where the same pattern is always changed between the original file and the first and second derived files, The pattern correspondence information is generated as the standard replacement information, and the third difference information,
Based on the first and second derivative files, the source code is merged in such a way that one of the first and second derivative files incorporates the changed part of the other file, and the version is upgraded. When the output file is generated, the source code portion that matches the pre-change pattern indicated by the standard replacement information is replaced with the changed pattern (standard pattern) indicated by the standard replacement information.

In the configuration according to the first aspect, one of the first and second derived files derived from the original file is used as a base, and the changed portion of the other file is added to the source code. It is possible to merge with. This can reduce the occurrence of defects in the source code after merging. Also, by detecting the difference between the original file and the first and second derived files,
From the corresponding first and second difference information, it is possible to specify the place where the first and second derivative files have made their own changes, and also specify the collision part of each changed portion. Furthermore, if a mark information is added to each line of the changed portion of the other file added to the above one file, the changed portion can be automatically detected by searching the mark information with a text editor. Therefore, the correctness of the changed part can be easily verified.

In the configuration according to the second aspect described above, by verifying the difference information (fourth difference information) of the first and second derivative files at the time of merging, the validity of the merge can be verified in more detail. The accuracy of the output file is increased.

In the configuration according to the third aspect, the legitimacy of the output file is evaluated by comparing the output file with each input file, thus reducing the burden on the user.

In the configuration according to the fourth aspect, the merging operation is performed for each function, so that the merging of functional units is realized. In the configuration according to the fifth aspect, when the changed part of the other file captured in the one file always includes the source code to be replaced with the same pattern (standard pattern), the part is changed. Since the standard pattern is automatically replaced, it is not necessary for the user to search for and correct such a part.

[0016]

BEST MODE FOR CARRYING OUT THE INVENTION Embodiments of the present invention will be described below with reference to the drawings. [First Embodiment] FIG. 1 is a block diagram showing the overall configuration of a source code automatic version upgrade apparatus according to a first embodiment of the present invention. The source code automatic version upgrade apparatus of FIG. 1 is realized by a computer (information processing apparatus) to which a difference detection command (diff command) for detecting a difference between two files can be applied.

In FIG. 1, reference numeral 1 is an external storage device such as a magnetic disk device. It is assumed that files 11, 12-1 and 12-2 are stored in the magnetic disk device 1 (a magnetic disk that is a storage medium mounted therein). Here, the file 11 is the original file and the file 12
-1 is the first derived file derived from the original file 11,
The file 12-2 is a second derived file derived from the original file 11. Each file 11, 12-1, 12-2
Consists of source code as shown in FIG.

Reference numeral 2 is an automatic version upgrade mechanism directly related to the present invention. This automatic version upgrade mechanism 2
Is realized by a computer (central CPU) executing an automatic version upgrade program. The automatic version upgrade mechanism 2 targets the files (here, the original file and the two derived files derived from it) necessary for the automatic version upgrade designated by the user, and shows the differences between the files and the corresponding relationship. Two functional elements: a difference information generation mechanism 21 that generates information (hereinafter, referred to as difference information) 210, and a merge mechanism 22 that merges source codes based on the difference information generated by the difference information generation mechanism 21. Composed of.

FIG. 3 shows a case where the file 11 is designated as the original file, the file 12-1 is designated as the first derivative file, and the derivative file 12-2 is designated as the second derivative file in the automatic version upgrade. 2 shows a processing flow and a data flow in the automatic version upgrade mechanism 2.

First, the specified original file 11 and the derived files 12-1 and 12-2 are read from the magnetic disk device 1 by the difference information generating mechanism 21. The difference information generation mechanism 21 generates difference information 210 indicating differences between files read from the magnetic disk device 1 and correspondences, and sends the difference information 210 to the merge mechanism 22. In addition to the difference information 210, the derivative files 12-1 and 12-2 are input to the merge mechanism 22. The merging mechanism 22 merges the source codes based on the difference information 210 and the derivative files 12-1 and 12-2 to create an output file 220, and outputs the output file 220 to the magnetic disk device 1.

FIG. 4 shows the internal functional structure of the difference information generating mechanism 21. The difference information generation mechanism 21 compares the first derivation file (12-1) with the original file (11) to generate difference information 211-1, and the difference information generation unit 212-1 and the original file (11). Difference information generation unit 21 for generating difference information 211-2 by comparing with the second derived file (12-2)
2-2, and a difference information generation unit 213 that generates difference information 210 that is finally used (used by the merge mechanism 22) from the difference information 211-1 and 211-2. Here, the difference information generation units 212-1 and 212-2 are responsible for the first-stage difference information generation process in the difference information generation mechanism 21, and the difference information generation unit 213 is responsible for the second-stage difference information generation process. Take charge.

FIG. 5 shows the difference information generators 212-1 and 212-2.
The functional structure inside is shown. Difference information generation unit 212-1, 2
Reference numeral 12-2 denotes a difference detection unit 21 that detects a difference between the first and second files (source files) designated by the command by executing the diff command of the format shown in FIG.
2a and an information conversion unit 212b that converts the output of the difference detection unit 212a (output of the diff command) into difference information 211-1 and 211-2. Note that diff
The command is a command for comparing and checking two files specified by the command, and if there is a difference between the files, the type of the difference, the position, and the content of the difference portion are output. .

Next, the operation of the embodiment will be described. First, at the time of automatic version upgrade, the file 11 is derived as the original file, the file 12-1 is derived as the first derivative file, and the second derivative file is derived as the second derivative file to the automatic version upgrade mechanism 2 by the user's keyboard operation or the like. It is assumed that the file 12-2 is designated.

In this case, the difference information generation mechanism 21 in the automatic version upgrade mechanism 2 uses the original file 11 and the derived files 12-1, 12 designated by the magnetic disk device 1.
-2 is read, and the original file 11 and the derived file 12-1 are compared with each other as shown in FIG.
And the derivative file 12-2. Then, the difference information generation mechanism 21 generates difference information 210 from this comparison result and outputs it to the merge mechanism 22.

Next, details of the operation of the difference information generating mechanism 21 will be described. In this embodiment, the difference information generation mechanism 2
The difference information generation in 1 is performed in two stages. The difference information generation in the first stage is performed by the difference information generation units 212-1 and 212-2 in the difference information generation mechanism 21 using the diff command in the format shown in FIG. 6 as follows.
Here, diff used in the difference information generation unit 212-1
The command (referred to as diff command # 1) is the first
Derived file 12 as a file (source file) of
It is assumed that -1 designates the original file 11 as the second file (source file). Similarly, the diff command (diff) used in the difference information generation unit 212-2
Command # 2), the original file 11 is used as the first file and the derived file 1 is used as the second file.
2-2 shall be specified.

First, the difference detecting unit 212a in the difference information generating unit 212-1 sequentially compares the two input files designated by the diff command # 1, that is, the derivative file 12-1 and the original file 11 from the first line. The difference is checked, and if there is a difference between the files, the type and position of the difference and the content of the difference portion are transmitted as a diff command output. The diff command output from the difference detection unit 212a in the difference information generation unit 212-1 is received by the information conversion unit 212b in the same difference information generation unit 212-1.

On the other hand, the difference detection unit 212a in the difference information generation unit 212-2 uses the 2 specified by the diff command # 2.
The two input files, that is, the original file 11 and the derived file 12-2 are sequentially compared from the first line to check the difference. If there is a difference between the files, the type, position and difference portion of the difference are recorded. Send the contents as the diff command output. The diff command output from the difference detection unit 212a in the difference information generation unit 212-2 is received by the information conversion unit 212b in the same difference information generation unit 212-2.

Here, an example of the output of the diff command is shown in FIG. In the figure, data "2, 4c" indicated by reference numeral 81
1,3 "indicates that the 2nd to 4th lines of the first file are different from the 1st to 3rd lines of the second file (here, they are different depending on the replacement" c "). Position information (correspondence between rows), of the data group from “<line 2” to “> third line” indicated by reference numeral 82, the data group above the delimiter 83 is the first file. Show the contents of the second to fourth lines,
The data group below the delimiter 83 indicates the contents from the first line to the third line of the second file. The types of differences include "a" indicating addition and "d" indicating deletion, in addition to the above "c" indicating replacement.

Now, the difference information generators 212-1 and 212-2
Each of the information conversion units 212b in the same difference information generation unit 21
2-1 and diff from the difference detection unit 212a in 212-2
When the command output is received, the difference type and position information is extracted from the diff command output and set in the corresponding information area in (the structure of) the difference information in the format as shown in FIG. That is, in the case of the diff command output of FIG.
The difference type “c” (replacement) (between the first file and the second file) in “2,4c1,3” as the position information 81 is set in the type information area, and “2,4” is set. The start line S1 and the end line E1 of the corresponding part of the first file are set in the area, and "1, 3" is set to the start line S of the corresponding part of the second file.
2. Set in the area of the end row E2. Although the difference information (structure thereof) of FIG. 9 is provided with an overlap / inclusion information area, at this stage (first stage), information setting to the overlap / inclusion information area is not performed. Not done

In this way, the difference information generator 212-
Each diff from the difference detection unit 212a in 1, 212-2
The command output is the difference information generation units 212-1 and 212.
The information conversion unit 212b in -2 converts the difference information 211-1 and 211-2 (of a structure) in the format shown in FIG. The difference information 211-1 and 211-2 are sent to the difference information generation unit 213.

Upon receiving the difference information 211-1 and 211-2 from the difference information generating units 212-1 and 212-2 (internal information converting unit 212b), the difference information generating unit 213 receives the two types of difference information. Based on 211-1 and 211-2, the difference information between the derivative files 12-1 and 12-2 (here, the difference information 210) is obtained by associating the lines of the derivative file 12-1 and the derivative file 12-2. The second step of generating difference information is performed. Here, the difference information 211-1 is the difference information between the derived file 12-1 and the original file 11, and is the difference information 211-2.
Is the difference information between the original file 11 and the derived file 12-2, so in the second stage, as shown in FIG. Correspondence of -2 line will be taken.

In FIG. 10, line A of the derivative file 12-1
B corresponds to lines a and b of the original file 11, and lines a and b of this original file 11 are lines a'and b'of the derived file 12-2.
It is shown that it corresponds to.

Here, for example, the line A is the original file 11
Source code part 1 shown with diagonal lines in (source file)
It is the head of the line number to which 01 is added. Derivation file 12
For -1, only the source code portion 101 indicated by diagonal lines is added to the original file 11, so the correspondence from line A to line a can be easily obtained. Specifically, in the example of FIG. 10, as a pair of the start line S1 and the end line E1 of the difference information 211-1 in the format shown in FIG. 9, the start line (= line A) of the shaded source code portion 101, Since the end line is set and the line a of the original file 11 is set as a pair of the start line S2 and the end line E2, the difference information 211-1 indicates the line A.
To the row a is determined.

On the other hand, the derived file 1 from the original file 11
Changes to 2-2 are not limited to simple additions. Even in this case, since the derived file 12-2 is generated by changing the original file 11, the difference information 211
Correspondence of lines can be obtained by -2.

From the above, the correspondence relationship shown in FIG. 10 is obtained by associating the difference information 211-1 and 211-2 generated by the difference information generating units 212-1 and 212-2 in the first stage. Be examined. That is, the difference information generation unit 213 determines that the row A → the row a obtained from the difference information 211-1 and 211-2.
→ From the correspondence of row a ′, the relationship of row A → row a ′ is obtained, and the second
It is generated as the difference information 210 of the stage. This difference information 2
Similarly to the difference information 211-1 and 211-2, 10 has the data format shown in FIG. However, the difference information 210
In the second stage in which is generated, the difference information 211-1 and 211
Unlike the first stage in which -2 is generated, information is set in the overlap / inclusion information area. This difference information 210
The information set in the overlap / inclusion information area is the changed part from the original file 11 to the derived file 12-1 (the changed part when the derived file 12-1 is generated by making a change to the original file 11). ) Indicates whether or not the changed portion from the original file 11 to the derived file 12-2 overlaps or is included.

Information setting in the overlap / inclusion information area will be described with reference to FIG. Note that FIG.
The shaded portion in the middle shows the changed portion with respect to the original file 11. First, change the original file 11 and change the derived file 12
-1 and the derived file 12-2 are generated, the original file 1
Changes from 1 to derivative file 12-1 and original file 1
At least some of the changed parts from 1 to the derived file 12-2 overlap each other as shown in FIG.
The modified part from the original file 11 to the derived file 12-1 may be included in the modified part to the derived file 12-2 as shown in FIG.

Therefore, the difference information generation unit 213 determines that the modification start line of the derivative file 12-1 is before the modification start line of the derivative file 12-2 and the modification end line of the derivative file 12-1 is the derivative file 12-2. Between the change start line and the change end line of the derived file 12-1 or between the change start line of the derived file 12-1 and the change start line of the derived file 12-2, and the change end line of the derived file 12-1. If the condition that is after the end-of-change line in the derived file 12-2 is satisfied (Fig. 11)
(See (a)), it is determined that there is an overlap, and the information is difference information 2
It is set in the overlap / inclusion information area in 10.

Similarly, the difference information generating section 213 has a condition that the modification start line and modification end line of the derivative file 12-1 are both between the modification start line and modification end line of the derivative file 12-2. If it holds (see FIG. 11B),
It is determined to be included, and the information is overlapped in the difference information 210 /
Set in the inclusion information area.

By the way, when there are a plurality of changed parts,
The difference information in the format shown in FIG. 9 is generated by the number of changed portions. Therefore, in the present embodiment, the difference information is as shown in FIG.
As shown in, the structure (structure storing the difference information of the basic unit in the format of FIG. 9) is expressed using a list structure in which pointers (previous pointer and next pointer) are bidirectionally linked. When necessary, this difference information structure is allocated using, for example, the memory allocation function provided by the operating system, and added to the difference information list structure (link structure) as shown in FIG.

In FIG. 12, the previous pointer (link to the previous) in the difference information structure is a pointer to the difference information structure linked immediately before the difference information structure. Similarly, the next pointer (link to the next) in the difference information structure
Is a pointer to the difference information structure linked immediately after the difference information structure. When there is no connection destination, these pointers are set to special pointers (NULL pointers) indicating that fact. As is clear
When the previous pointer is NULL, it indicates that the corresponding structure is the head of the difference information list. Similarly, when the next pointer is NULL, it indicates that the corresponding structure is the end of the difference information list.

In this embodiment, although the information to be held in each of the difference information generation in the first stage and the second stage is different, the same template (shape) is used for the difference information structure. Then, for example, "0" (NULL in the case of a pointer) is set to the member (information area) that is not used at each stage.
To store.

In this embodiment, a valid value is set in the type information area in (the structure of) the difference information, but it is not used. The reason is that the original file 11
This is because the change made at the stage of generating the derived file 12-1 from is basically only addition (“a”), and the automatic version upgrade mechanism 2 is configured to perform processing only for addition. Has been done.

A flowchart of FIG. 13 shows the procedure of the second stage difference information generation processing in the difference information generation unit 213 (in the difference information generation mechanism 21) described above. This figure 1
As shown in the flowchart of FIG.
3 is the difference information 211- (having the structure shown in FIG. 12) generated by the difference information generation units 212-1 and 212-2.
1, 211-2, the derived file 12-1 and the derived file 1 through the original file 11 as shown in FIG.
Perform the operation to associate the line numbers of 2-2 (step S
1) If there is a corresponding line (step S2), the corresponding information of the line number is stored in the difference information structure shown in FIG. 9 (step S3). At this time, the difference information generation unit 21
3 checks the above-mentioned overlap / inclusion, and sets the information in the overlap / inclusion information area in the structure of the difference information according to the result. The difference information generation unit 213 repeats the above processing until the end of the difference information 211-1 and 211-2 (step S4). If there is no corresponding line, an error message is displayed (step S5).

Now, the difference information 210 generated by the difference information generating process of the second stage in the difference information generating unit 213 (in the difference information generating mechanism 21) is sent to the merging mechanism 22.
The derived files 12-1 and 12-2 that are the basis of the generation of the difference information 210 are also sent to the merge mechanism 22. The merging mechanism 22 adds the changed portion of the derivative file 12-1 to the derivative file 12-2 based on the difference information 210 and the derivative files 12-1 and 12-2 and outputs the output file 220. Perform a merge operation to create the. Details of the merging operation by the merging mechanism 22 will be described below with reference to the operation explanatory diagram of FIG. 14 and the flowcharts of FIGS. 15 and 16.

First, the merge mechanism 22 follows the line number correspondence information indicated by the difference information 210 generated by the difference information generating process of the second stage in the difference information generating unit 213 (in the difference information generating mechanism 21), in accordance with the derived file. In the source code of 12-2, up to the line immediately before the change start line of the derived file 12-1 (immediately before the added portion) (in the example of FIG. 14, the source code starting from the beginning in the derived file 12-2). The unmodified portion 13a) is output to the magnetic disk device 1 as a part (here, the head part) of the output file 220 (step S11).

Next, the merging mechanism 22 uses the derived file 12
The output process (step S12) of the changed part of -1 is performed as follows. First, the merge mechanism 22 determines that the corresponding difference information 21
Check the overlap / inclusion information in the structure of 0 (step S2
1), if overlap or inclusion (as shown in FIG. 11) occurs, a comment indicating that and a specific statement (here #ifdef statement) are used as subsequent information of the output file 220 on the magnetic disk. The data is output to the device 1 (step S22). On the other hand, if neither overlapping nor inclusion has occurred, this step S22 is skipped.

Next, the merging mechanism 22 uses the derived file 12
-1 from the change start line to the change end line (paired with the change start line) (in the example of FIG. 14, the change start line SA to the change end line EA in the derived file 12-1) The source code of the portion 13A) is output to the magnetic disk device 1 as subsequent information of the output file 220 (step S23). At this time, a predetermined mark, for example, ">>", which indicates that the line has been added by the automatic version upgrade mechanism 2, is added to the beginning of each line forming the changed portion output to the magnetic disk device 1.

Next, the merging mechanism 22 again checks the overlap / inclusion information in the structure of the above-mentioned difference registration information 210 (step S24), and if overlap or inclusion occurs, it indicates that fact. A comment and a specific sentence for closing #ifdef opened in step S22 (here, #
endif sentence) is output to the magnetic disk device 1 as subsequent information of the output file 220 (step S25). On the other hand, when neither overlapping nor inclusion has occurred, this step S25 is skipped.

With the above, the output process of the changed portion of the derived file 12-1 in step S12 is completed. The merging mechanism 22 performs a series of changed part output processing (step S
When the step 12) is completed, it is checked whether or not the changed part in the derived file 12-1 still remains (step S13), and if it remains, the process returns to step S11.

In this way, the merging mechanism 22 repeats steps S11 and S12 until the end of the derived file 12-1 (step S13). As a result, in the example of FIG. 14, the unmodified portion 13b in the derivative file 12-2 and the modified portion 13B from the modification start line SB to the modification end line EB in the derivative file 12-1 are continuously output.

When all the changed parts in the derived file 12-1 have been processed, the merge mechanism 22 determines that the derived file 12-1 has been processed.
-2, the remaining unmodified part (in the example of FIG. 14, the unmodified part 13c in the derived file 12-2) is output to the output file 220.
Is output to the magnetic disk device 1 as the last information (step S14).

As a result, the magnetic disk device 1 has two derived files 12-1, derived from the original file 11.
Based on one of the derived files 12-2 of 12-2,
The output file 220 of the new version of the source code is generated by merging the source code with the modified part of the other derived file 12-1.

As described above, in this embodiment, the source code is automatically merged. However, in the merging method here, as already described, the contents of the file are not considered at all. In this case, since the validity of the created file (output file 220) is not guaranteed, the user needs to check again.

Therefore, in the present embodiment, in order to enable the above-mentioned validity check by the user, as described above, a special mark ">>" is added to the beginning of each line of the source code change portion added by the merge operation. "Is added.

By adding the mark ">>", the additional portion in the output file 220 can be easily found by using a text editor or the like. Moreover, unless the user checks and deletes the mark, the compiler determines that the mark is an error, and thus the output file 220 cannot be compiled. Therefore, the user must evaluate the validity of the line (source code line) added by the automatic version upgrade mechanism 2 (the merging mechanism 22 in the inside) and edit the line. With this function, it is possible to prevent accidental use of source code whose legitimacy has not been evaluated by the user.

As described above, in this embodiment, the effects listed below can be obtained. (1) One of the two derived files 12-1 and 12-2 derived from the original file 11 (here, the derived file 1
Based on 2-2), the source code can be merged by adding the modified part of the other (here, derived file 12-1). This can reduce the occurrence of defects in the source code after merging. (2) By referring to the original file 11, it is possible to specify the locations where the derivative file 12-1 and the derivative file 12-2 have changed independently. In addition, it is possible to identify the change collision point. (3) The merge operation is performed as a batch process, and the mark added to the portion added by the merge operation is left on the source code. Therefore, the correctness of the changed portion can be easily verified.

In the above embodiment, the derived file 1
2-1 and the original file 11 are compared to generate difference information 211-1, and the original file 11 and the derived file 12-2
It has been described that the difference information 211-2 is generated by comparing with the two and the two pieces of difference information 211-1 and 211-2 (the difference information 210 generated based on the difference information) are merged.
As described below, the present invention is not limited to this. [Second Embodiment] FIG. 17 is a block diagram showing the functional arrangement of an automatic version upgrade mechanism (mainly the source code automatic version upgrade apparatus) according to the second embodiment of the present invention. The same parts as those in FIG. 7 are designated by the same reference numerals.

The feature of the configuration of FIG. 17 is that, instead of the difference information generation mechanism 21 in FIG. 7, a function of generating difference information 214 by comparing the derived file 12-1 and the derived file 12-2 ( Difference information generation unit 212-1 in FIG.
A difference information generation mechanism 31 to which a difference information generation unit similar to that of 212-2 is added is provided, and the merge mechanism 2 in FIG.
By providing the merging mechanism 32 instead of 2, the difference information 2 between the original file 12 and each of the derived files 12-1 and 12-2
Compared to the case of merging using only 11-1 and 211-2,
The point is that the merging mechanism 32 can perform accurate merging.

In the configuration shown in FIG. 17, a difference information generating unit (not shown) for generating difference information between derived files provided in the difference information generating mechanism 31 includes a derived file 12-1 and a derived file 12-2. The difference information 214 indicating the difference and the corresponding positional relationship is generated by checking the difference between them, and the difference information 214 is set in the difference information structure of the data structure shown in FIG.

The merge mechanism 32 performs the same merge process as the merge mechanism 22 in the first embodiment. That is, the merge mechanism 32 uses the two pieces of difference information 211-1 and 21-2.
The correspondence of the line is obtained from the final difference information 210 generated based on 1-2, and the changed part in the derived file 12-1 is added to the source code of the derived file 12-2. To generate the output file 220. Here, the merge mechanism 32 uses the derived file 12-1 and the derived file 12
By referring to the difference information 214 between -2, the validity of the merge is verified from the relationship between the difference information 214 and the output file 220.

As described above, in the present embodiment, the difference information 21 between the derived file 12-1 and the derived file 12-2.
4 is obtained and the difference information 214 is referred to by the merge mechanism 32, so that the correctness of the merge can be verified in more detail, and the accuracy of the output file 220 is increased. [Third Embodiment] FIG. 18 is a block diagram showing the functional arrangement of an automatic version upgrade mechanism (center of the automatic source code upgrade apparatus) according to the third embodiment of the present invention. The same parts as those in FIG. 7 are designated by the same reference numerals.

The characteristic of the configuration of FIG. 18 is that in the configuration of FIG.
The point is that a comparison verification mechanism 23 for evaluating the correctness of 0 is added.

In the configuration of FIG. 18, the comparison and verification mechanism 23 compares the output file 220 with the original file 11 and the derived files 12-1 and 12-2 which are the input files,
Verify whether the output file 220 has been properly merged.

As described above, in the present embodiment, the comparison verification mechanism 23 evaluates the correctness of the output file 220, so that the work for the user to verify the output file 220 is reduced. This improves the legitimacy and accuracy of the output file 220. [Fourth Embodiment] FIG. 19 is a block diagram showing the overall structure of a source code automatic version upgrade apparatus according to a fourth embodiment of the present invention. The same parts as those in FIG. 1 are denoted by the same reference numerals.

The feature of the configuration of FIG. 19 is that an automatic version upgrade mechanism 4 to which a function list generation mechanism 43 is added is used instead of the automatic version upgrade mechanism 2 in FIG.
The difference is that the generation of difference information can be performed for each function.

In the configuration of FIG. 19, the function list generation mechanism 43 in the automatic version upgrade mechanism 4 is the difference information generation mechanism 4 (corresponding to the difference information generation mechanism 21 in FIG. 1).
This function list generation mechanism 4 provided in the preceding stage of 1.
Reference numeral 3 denotes each input file (the original file 11 and the derived files 12-1, 12- read from the magnetic disk device 1).
2) is decomposed for each function to generate a function list for each input file, and the function list is passed to the difference information generation mechanism 41.

The difference information generation mechanism 41 compares the function lists passed from the function list generation mechanism 43 and generates difference information. This difference information generation procedure is the same as the difference information generation by the difference information generation mechanism 21 in the first embodiment except that the comparison is performed not for each row but for each function. The difference information generated by the difference information generation mechanism 41 is passed to the merge mechanism 42.

The merging mechanism 42 merges the source code for each function based on the input difference information. Here, when a single function is divided into two or more, or conversely, two or more functions are combined into a single function, merging between multiple functions Is done.

As described above, in the present embodiment, since the merging is performed for each function, the merging of functional units is realized. Even if the correction within a certain functional unit is different from the microscopic point of view, the same processing is often performed from the macroscopic point of view, and thus the merging of the functional units as in the present embodiment is effective. As a result, the accuracy of the output source code is improved.

The function list generating mechanism 43 may be provided with a processing function for generating a list of elements other than functions. Here, elements other than functions include variables, macros (replacement), comments, and preprocessor instructions (instructions that the user can instruct before compilation). When a list other than a function is generated by this processing function, the difference information generating mechanism 41 and the merging mechanism 42 also refer to such information as in the function list. [Fifth Embodiment] FIG. 20 is a block diagram showing the overall structure of a source code automatic version upgrade apparatus according to the fifth embodiment of the present invention. The same parts as those in FIG. 1 are denoted by the same reference numerals.

The feature of the configuration in FIG. 20 is that the automatic version upgrade mechanism 2 in FIG. 1 is replaced with an automatic version upgrade mechanism 5 to which a routine replacement information generation mechanism 53 is added, and changes are always made in the same pattern. The point is that the pattern information of the broken portion is generated as the standard replacement information and can be used for the merge operation.

In the configuration of FIG. 20, the fixed form replacement information generating mechanism 53 in the automatic version upgrade mechanism 5 operates between the input files read from the magnetic disk device 1 (between the original file 11 and the derived file 12-1 and the original file 11-1). File 1
1) and the derived file 12-2), always look for the place where the change is made with the same pattern, and the original source code pattern (called the previous pattern) and the changed pattern (called the latter pattern) of that place. Corresponding information of the standard replacement information 5
It is passed to the merge mechanism 52 as 30. This merging mechanism 52
Also, the difference information 210 generated by the difference information generation mechanism 21 in the same manner as in the first embodiment is also passed to.

The merging mechanism 52 is the same as the merging mechanism 22 in the first embodiment, and the difference information generating mechanism 2 is used.
The merge operation based on the difference information 210 from 1 is performed. Further, the merging mechanism 52 refers to the canonical replacement information 530 from the canonical replacement information generation mechanism 53 in parallel with this merging operation, and sets the source pattern portion to be merged to the previous pattern in the canonical replacement information 530. When a matching portion is detected, it is determined that the portion is to be subjected to the standard replacement, and the replacement is performed to the standard pattern which is the rear pattern in the standard replacement information 530 paired with the preceding pattern.

As described above, in the present embodiment, for example, when a new process is added to the derived file 12-1 and the added portion includes the source code to be routinely replaced, that portion is deleted. Since the standard pattern is automatically replaced, the user does not have to search for such a part and correct it.

[0075]

As described above in detail, according to the present invention, a merge process for creating a new version by incorporating the changed portion of the other file into one of two derived files derived from the source file of the source code. Can be done automatically.

[Brief description of drawings]

FIG. 1 is a block diagram showing an overall configuration of a source code automatic version upgrade device according to a first embodiment of the present invention.

FIG. 2 is a view for explaining that each file 11, 12-1, 12-2 in FIG. 1 is composed of source code.

FIG. 3 is a diagram for explaining the flow of processing and the flow of data in the automatic version upgrade mechanism 2 in FIG.

4 is a block diagram showing a functional configuration inside a difference information generation mechanism 21 in FIG.

5 is a block diagram showing the internal functional configuration of difference information generation units 212-1 and 212-2 in FIG.

FIG. 6 is a diagram showing a format of a diff command applied in the embodiment.

FIG. 7 is a diagram showing a functional configuration of an automatic version upgrade mechanism 2 in FIG. 1 for explaining an outline of a file merging method applied in the embodiment. .

FIG. 8 is a diagram showing an example of a diff command output in the same embodiment.

FIG. 9 is (a structure of) difference information applied in the embodiment.
The figure which shows the data structure of FIG.

FIG. 10 is a diagram for explaining the operation when the difference information generation unit 213 in FIG. 4 associates the lines of two derived files via the original file.

FIG. 11 is a diagram for explaining overlapping and inclusion relation of changed parts of the derived files 12-1 and 12-2.

FIG. 12 is an exemplary view for explaining a list structure of difference information structures in the embodiment.

FIG. 13 is a flowchart for explaining a second stage difference information generation process of generating difference information 210 by a difference information generation unit 213 in FIG.

FIG. 14 is an operation explanatory view of a merge operation by the merge mechanism 22 in the same embodiment.

FIG. 15 is a flowchart showing the procedure of a merge operation by the merge mechanism 22.

16 is a flowchart showing a detailed procedure of a changed portion output process (step S12) in the flowchart of FIG.

FIG. 17 is a block diagram showing the functional configuration of an automatic version upgrade mechanism (mainly the source code automatic version upgrade apparatus) according to the second embodiment of the present invention.

FIG. 18 is a block diagram showing the functional configuration of an automatic version upgrade mechanism (mainly the source code automatic version upgrade apparatus) according to a third embodiment of the present invention.

FIG. 19 is a block diagram showing the overall configuration of a source code automatic version upgrade device according to a fourth embodiment of the present invention.

FIG. 20 is a block diagram showing an overall configuration of a source code automatic version upgrade device according to a fifth embodiment of the present invention.

FIG. 21 is a diagram for explaining an outline of a conventional file merge method.

[Explanation of symbols]

1 ... Magnetic disk device, 2, 4, 5 ... Automatic version upgrade mechanism, 11 ... Original file, 12-1 ... Derived file (first derived file), 12-2 ... Derived file (second)
Derived file), 21, 31, 41 ... Difference information generation mechanism, 22, 32, 42, 52 ... Merge mechanism, 23 ... Comparison verification mechanism, 43 ... Function list generation mechanism, 53 ... Fixed replacement information generation mechanism, 210 ... Difference information (third difference information),
211-1 ... Difference information (first difference information), 211-2 ... Difference information (second difference information), 212-1, 212-2, 21
3 ... Difference information generating unit, 212a ... Difference detecting unit, 212b
... information conversion unit, 214 ... difference information (fourth difference information),
220 ... Output file, 530 ... Regular replacement information.

Claims (10)

[Claims] 1. A difference between a source code source file and a first derived file derived from the source file is checked to generate first difference information indicating a corresponding positional relationship, and the source file and the source file are also used. A first step of checking the difference between the second derived files derived from the original file and generating second difference information indicating the corresponding positional relationship; and a first step generated in the first step. And a second step of generating third difference information indicating a positional relationship corresponding to the difference between the first and second derivative files from the second difference information, and the second step of generating the third difference information. Based on the third difference information and the first and second derivative files, the first and second
And a third step of merging the source code into any one of the derived files of 1. to merge the modified part of the other file and generating an upgraded output file. Source code automatic version upgrade method. 2. The method further comprises a fourth step of checking a difference between the first and second derived files and generating fourth difference information indicating a positional relationship corresponding to the difference. 2. The automatic source code upgrade method according to claim 1, wherein the validity of the merge is verified by referring to the fourth difference information generated in the fourth step in the step. 3. The output file generated in the third step is compared with the original file, the first derivative file, and the second derivative file so that the output files are correctly merged. Fourth to verify whether or not
The source code automatic version upgrade method according to claim 1, further comprising: 4. A first step of decomposing a source code source file, a first derived file derived from the source file and a second derived file for each function to generate a function list for each file, The original file generated in the first step and the first file
The difference between both function lists of the derived file of (1) to generate the first difference information indicating the corresponding positional relationship, and the difference between both function lists of the original file and the second derived file A second step of generating second difference information indicating a positional relationship between the two functions of the first and second derivative files from the first and second difference information generated in the second step. A third step of generating third difference information indicating a positional relationship corresponding to the difference between the lists, the third difference information generated in the third step, and the first and second derivative files. Based on the first and second
And a fourth step of merging the source code into one of the derivative files of the other one so as to incorporate the changed part of the other file, and generating an upgraded output file. Source code automatic version upgrade method. 5. A source code source file and first and second derived files derived from the source file are always detected with the same pattern of change,
A first step of generating correspondence information of patterns before and after the change as standard replacement information, and a difference between the original file and the first derivative file, and first difference information indicating a corresponding positional relationship. And a second step of generating the second difference information indicating the corresponding positional relationship by examining the difference between the original file and the second derived file, and generating the second step. A third step of generating third difference information indicating a positional relationship corresponding to the difference between the first and second derived files from the generated first and second difference information; and the third step. Based on the third difference information generated in step 1 and the first and second derivative files, the first and second
The third step of merging the source code into one of the derivative files of the other one in a manner that incorporates the changed part of the other file to generate an upgraded output file, the first step. When merging the source code portions that match the pre-change pattern indicated by the standard replacement information generated in step 3, the third step of substituting with the changed pattern indicated by the standard replacement information is provided. Source code automatic version upgrade method. 6. A source code source file, a storage device storing first and second derivative files derived from the source file, the source file stored in the storage device, and the first derivative. The difference between the files is checked to generate the first difference information indicating the corresponding positional relationship, while the difference between the original file and the second derived file is checked to indicate the corresponding positional relationship. Difference information for generating the second difference information, and for generating the third difference information indicating the positional relationship corresponding to the difference between the first and second derivative files from the generated first and second difference information Based on the generation means, the third difference information generated by the difference information generation means, and the first and second derivative files, one of the first and second derivative files is created. , The other fa Le of Merges the source code in the form of taking a changed part, the source code automatic upgrading apparatus characterized by comprising a merge means for generating an output file has been upgraded. 7. The difference information generating means is configured to check a difference between the first and second derivative files and generate fourth difference information indicating a positional relationship corresponding to the difference. 7. The source code automatic version according to claim 6, wherein the merge means verifies the validity of the merge by referring to the fourth difference information generated by the difference information generating means. Up device. 8. The output file generated by the merging means is compared with the original file, the first derivative file, and the second derivative file to determine whether the output files are correctly merged. 7. The method according to claim 6, further comprising comparison verification means for verifying whether or not
Automatic source code upgrade device described. 9. A source code source file, a storage device storing first and second derivative files derived from the source file, the source file stored in the storage device, and the first derivative. A function list generation unit that decomposes a file and the second derived file for each function to generate a function list for each file; both the original file and the first derived file generated by the function list generation unit The difference between the function lists is checked to generate the first difference information indicating the corresponding positional relationship, while the difference between the function lists of the original file and the second derived file generated by the function list generating means is calculated. Then, the second difference information indicating the corresponding positional relationship is generated, and from the generated first and second difference information,
Difference information generating means for generating third difference information indicating a positional relationship corresponding to a difference between the function lists of the first and second derivative files, and a third difference generated by the difference information generating means Based on the information and the first and second derivative files, the source code is merged in such a manner that the changed portion of the other file is incorporated into one of the first and second derivative files. , A source code automatic version upgrade device comprising: a merge means for generating an upgraded output file. 10. A source code source file, a storage device storing first and second derived files derived from the source file, the source file stored in the storage device, and the first and second source files. A standard replacement information generation unit that detects a place where a change is always made in the same pattern between the second derived files and generates correspondence information of the patterns before and after the change as standard replacement information, and the original file. And generating the first difference information indicating the corresponding positional relationship, while checking the difference between the original file and the second derived file, and handling the difference. Generating a second difference information indicating a positional relationship between the first and second generated differential information, and a third difference indicating a positional relationship corresponding to the difference between the first and second derived files. Of the first and second derivative files based on the difference information generating means for generating information, the third difference information generated by the difference information generating means, and the first and second derivative files. Merging means for merging source code into one of the files so as to incorporate the changed portion of the other file, and generating a versioned output file, which is the fixed form generated by the fixed form replacement information generating means. An automatic source code upgrade device comprising merge means for replacing a source code portion matching a pre-change pattern indicated by replacement information with a post-change pattern indicated by the standard replacement information.