├── .gitignore ├── LICENSE.txt ├── README.md ├── build.gradle └── src └── main ├── antlr4 └── Java.g4 ├── java └── com │ └── lemoulinstudio │ └── sdiff │ ├── Main.java │ ├── content │ ├── ContentElementData.java │ ├── ContentElementReference.java │ ├── ContentLocation.java │ ├── ContentReference.java │ ├── FileContentLocation.java │ ├── FileContentReference.java │ └── TextContentElementData.java │ ├── diffelt │ ├── AddDiffelt.java │ ├── Diffelt.java │ ├── DiffeltDependency.java │ ├── MoveDiffelt.java │ ├── RemoveDiffelt.java │ ├── RenameDiffelt.java │ └── ReplaceDiffelt.java │ ├── java │ ├── content │ │ └── JavaContentReference.java │ ├── diffelt │ │ ├── CodeBlockReformulationDiffelt.java │ │ └── LogicalExpressionReformulationDiffelt.java │ └── tree │ │ └── sem │ │ ├── Class.java │ │ ├── Comment.java │ │ ├── Constructor.java │ │ ├── DeclaredParameter.java │ │ ├── DeclaredType.java │ │ ├── Field.java │ │ ├── FunctionDeclaration.java │ │ ├── Interface.java │ │ ├── JavadocComment.java │ │ ├── Method.java │ │ ├── MultiLineComment.java │ │ ├── PrimitiveType.java │ │ ├── SingleLineComment.java │ │ ├── Type.java │ │ └── Visibility.java │ └── repo │ └── Repository.java └── resources ├── Foobar.java └── Foobar2.java /.gitignore: -------------------------------------------------------------------------------- 1 | .gradle/ 2 | build/ 3 | -------------------------------------------------------------------------------- /LICENSE.txt: -------------------------------------------------------------------------------- 1 | GNU AFFERO GENERAL PUBLIC LICENSE 2 | Version 3, 19 November 2007 3 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. 5 | Everyone is permitted to copy and distribute verbatim copies 6 | of this license document, but changing it is not allowed. 7 | 8 | Preamble 9 | 10 | The GNU Affero General Public License is a free, copyleft license for 11 | software and other kinds of works, specifically designed to ensure 12 | cooperation with the community in the case of network server software. 13 | 14 | The licenses for most software and other practical works are designed 15 | to take away your freedom to share and change the works. By contrast, 16 | our General Public Licenses are intended to guarantee your freedom to 17 | share and change all versions of a program--to make sure it remains free 18 | software for all its users. 19 | 20 | When we speak of free software, we are referring to freedom, not 21 | price. Our General Public Licenses are designed to make sure that you 22 | have the freedom to distribute copies of free software (and charge for 23 | them if you wish), that you receive source code or can get it if you 24 | want it, that you can change the software or use pieces of it in new 25 | free programs, and that you know you can do these things. 26 | 27 | Developers that use our General Public Licenses protect your rights 28 | with two steps: (1) assert copyright on the software, and (2) offer 29 | you this License which gives you legal permission to copy, distribute 30 | and/or modify the software. 31 | 32 | A secondary benefit of defending all users' freedom is that 33 | improvements made in alternate versions of the program, if they 34 | receive widespread use, become available for other developers to 35 | incorporate. Many developers of free software are heartened and 36 | encouraged by the resulting cooperation. However, in the case of 37 | software used on network servers, this result may fail to come about. 38 | The GNU General Public License permits making a modified version and 39 | letting the public access it on a server without ever releasing its 40 | source code to the public. 41 | 42 | The GNU Affero General Public License is designed specifically to 43 | ensure that, in such cases, the modified source code becomes available 44 | to the community. It requires the operator of a network server to 45 | provide the source code of the modified version running there to the 46 | users of that server. Therefore, public use of a modified version, on 47 | a publicly accessible server, gives the public access to the source 48 | code of the modified version. 49 | 50 | An older license, called the Affero General Public License and 51 | published by Affero, was designed to accomplish similar goals. This is 52 | a different license, not a version of the Affero GPL, but Affero has 53 | released a new version of the Affero GPL which permits relicensing under 54 | this license. 55 | 56 | The precise terms and conditions for copying, distribution and 57 | modification follow. 58 | 59 | TERMS AND CONDITIONS 60 | 61 | 0. Definitions. 62 | 63 | "This License" refers to version 3 of the GNU Affero General Public License. 64 | 65 | "Copyright" also means copyright-like laws that apply to other kinds of 66 | works, such as semiconductor masks. 67 | 68 | "The Program" refers to any copyrightable work licensed under this 69 | License. Each licensee is addressed as "you". "Licensees" and 70 | "recipients" may be individuals or organizations. 71 | 72 | To "modify" a work means to copy from or adapt all or part of the work 73 | in a fashion requiring copyright permission, other than the making of an 74 | exact copy. The resulting work is called a "modified version" of the 75 | earlier work or a work "based on" the earlier work. 76 | 77 | A "covered work" means either the unmodified Program or a work based 78 | on the Program. 79 | 80 | To "propagate" a work means to do anything with it that, without 81 | permission, would make you directly or secondarily liable for 82 | infringement under applicable copyright law, except executing it on a 83 | computer or modifying a private copy. Propagation includes copying, 84 | distribution (with or without modification), making available to the 85 | public, and in some countries other activities as well. 86 | 87 | To "convey" a work means any kind of propagation that enables other 88 | parties to make or receive copies. Mere interaction with a user through 89 | a computer network, with no transfer of a copy, is not conveying. 90 | 91 | An interactive user interface displays "Appropriate Legal Notices" 92 | to the extent that it includes a convenient and prominently visible 93 | feature that (1) displays an appropriate copyright notice, and (2) 94 | tells the user that there is no warranty for the work (except to the 95 | extent that warranties are provided), that licensees may convey the 96 | work under this License, and how to view a copy of this License. If 97 | the interface presents a list of user commands or options, such as a 98 | menu, a prominent item in the list meets this criterion. 99 | 100 | 1. Source Code. 101 | 102 | The "source code" for a work means the preferred form of the work 103 | for making modifications to it. "Object code" means any non-source 104 | form of a work. 105 | 106 | A "Standard Interface" means an interface that either is an official 107 | standard defined by a recognized standards body, or, in the case of 108 | interfaces specified for a particular programming language, one that 109 | is widely used among developers working in that language. 110 | 111 | The "System Libraries" of an executable work include anything, other 112 | than the work as a whole, that (a) is included in the normal form of 113 | packaging a Major Component, but which is not part of that Major 114 | Component, and (b) serves only to enable use of the work with that 115 | Major Component, or to implement a Standard Interface for which an 116 | implementation is available to the public in source code form. A 117 | "Major Component", in this context, means a major essential component 118 | (kernel, window system, and so on) of the specific operating system 119 | (if any) on which the executable work runs, or a compiler used to 120 | produce the work, or an object code interpreter used to run it. 121 | 122 | The "Corresponding Source" for a work in object code form means all 123 | the source code needed to generate, install, and (for an executable 124 | work) run the object code and to modify the work, including scripts to 125 | control those activities. However, it does not include the work's 126 | System Libraries, or general-purpose tools or generally available free 127 | programs which are used unmodified in performing those activities but 128 | which are not part of the work. For example, Corresponding Source 129 | includes interface definition files associated with source files for 130 | the work, and the source code for shared libraries and dynamically 131 | linked subprograms that the work is specifically designed to require, 132 | such as by intimate data communication or control flow between those 133 | subprograms and other parts of the work. 134 | 135 | The Corresponding Source need not include anything that users 136 | can regenerate automatically from other parts of the Corresponding 137 | Source. 138 | 139 | The Corresponding Source for a work in source code form is that 140 | same work. 141 | 142 | 2. Basic Permissions. 143 | 144 | All rights granted under this License are granted for the term of 145 | copyright on the Program, and are irrevocable provided the stated 146 | conditions are met. This License explicitly affirms your unlimited 147 | permission to run the unmodified Program. The output from running a 148 | covered work is covered by this License only if the output, given its 149 | content, constitutes a covered work. This License acknowledges your 150 | rights of fair use or other equivalent, as provided by copyright law. 151 | 152 | You may make, run and propagate covered works that you do not 153 | convey, without conditions so long as your license otherwise remains 154 | in force. You may convey covered works to others for the sole purpose 155 | of having them make modifications exclusively for you, or provide you 156 | with facilities for running those works, provided that you comply with 157 | the terms of this License in conveying all material for which you do 158 | not control copyright. Those thus making or running the covered works 159 | for you must do so exclusively on your behalf, under your direction 160 | and control, on terms that prohibit them from making any copies of 161 | your copyrighted material outside their relationship with you. 162 | 163 | Conveying under any other circumstances is permitted solely under 164 | the conditions stated below. Sublicensing is not allowed; section 10 165 | makes it unnecessary. 166 | 167 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 168 | 169 | No covered work shall be deemed part of an effective technological 170 | measure under any applicable law fulfilling obligations under article 171 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or 172 | similar laws prohibiting or restricting circumvention of such 173 | measures. 174 | 175 | When you convey a covered work, you waive any legal power to forbid 176 | circumvention of technological measures to the extent such circumvention 177 | is effected by exercising rights under this License with respect to 178 | the covered work, and you disclaim any intention to limit operation or 179 | modification of the work as a means of enforcing, against the work's 180 | users, your or third parties' legal rights to forbid circumvention of 181 | technological measures. 182 | 183 | 4. Conveying Verbatim Copies. 184 | 185 | You may convey verbatim copies of the Program's source code as you 186 | receive it, in any medium, provided that you conspicuously and 187 | appropriately publish on each copy an appropriate copyright notice; 188 | keep intact all notices stating that this License and any 189 | non-permissive terms added in accord with section 7 apply to the code; 190 | keep intact all notices of the absence of any warranty; and give all 191 | recipients a copy of this License along with the Program. 192 | 193 | You may charge any price or no price for each copy that you convey, 194 | and you may offer support or warranty protection for a fee. 195 | 196 | 5. Conveying Modified Source Versions. 197 | 198 | You may convey a work based on the Program, or the modifications to 199 | produce it from the Program, in the form of source code under the 200 | terms of section 4, provided that you also meet all of these conditions: 201 | 202 | a) The work must carry prominent notices stating that you modified 203 | it, and giving a relevant date. 204 | 205 | b) The work must carry prominent notices stating that it is 206 | released under this License and any conditions added under section 207 | 7. This requirement modifies the requirement in section 4 to 208 | "keep intact all notices". 209 | 210 | c) You must license the entire work, as a whole, under this 211 | License to anyone who comes into possession of a copy. This 212 | License will therefore apply, along with any applicable section 7 213 | additional terms, to the whole of the work, and all its parts, 214 | regardless of how they are packaged. This License gives no 215 | permission to license the work in any other way, but it does not 216 | invalidate such permission if you have separately received it. 217 | 218 | d) If the work has interactive user interfaces, each must display 219 | Appropriate Legal Notices; however, if the Program has interactive 220 | interfaces that do not display Appropriate Legal Notices, your 221 | work need not make them do so. 222 | 223 | A compilation of a covered work with other separate and independent 224 | works, which are not by their nature extensions of the covered work, 225 | and which are not combined with it such as to form a larger program, 226 | in or on a volume of a storage or distribution medium, is called an 227 | "aggregate" if the compilation and its resulting copyright are not 228 | used to limit the access or legal rights of the compilation's users 229 | beyond what the individual works permit. Inclusion of a covered work 230 | in an aggregate does not cause this License to apply to the other 231 | parts of the aggregate. 232 | 233 | 6. Conveying Non-Source Forms. 234 | 235 | You may convey a covered work in object code form under the terms 236 | of sections 4 and 5, provided that you also convey the 237 | machine-readable Corresponding Source under the terms of this License, 238 | in one of these ways: 239 | 240 | a) Convey the object code in, or embodied in, a physical product 241 | (including a physical distribution medium), accompanied by the 242 | Corresponding Source fixed on a durable physical medium 243 | customarily used for software interchange. 244 | 245 | b) Convey the object code in, or embodied in, a physical product 246 | (including a physical distribution medium), accompanied by a 247 | written offer, valid for at least three years and valid for as 248 | long as you offer spare parts or customer support for that product 249 | model, to give anyone who possesses the object code either (1) a 250 | copy of the Corresponding Source for all the software in the 251 | product that is covered by this License, on a durable physical 252 | medium customarily used for software interchange, for a price no 253 | more than your reasonable cost of physically performing this 254 | conveying of source, or (2) access to copy the 255 | Corresponding Source from a network server at no charge. 256 | 257 | c) Convey individual copies of the object code with a copy of the 258 | written offer to provide the Corresponding Source. This 259 | alternative is allowed only occasionally and noncommercially, and 260 | only if you received the object code with such an offer, in accord 261 | with subsection 6b. 262 | 263 | d) Convey the object code by offering access from a designated 264 | place (gratis or for a charge), and offer equivalent access to the 265 | Corresponding Source in the same way through the same place at no 266 | further charge. You need not require recipients to copy the 267 | Corresponding Source along with the object code. If the place to 268 | copy the object code is a network server, the Corresponding Source 269 | may be on a different server (operated by you or a third party) 270 | that supports equivalent copying facilities, provided you maintain 271 | clear directions next to the object code saying where to find the 272 | Corresponding Source. Regardless of what server hosts the 273 | Corresponding Source, you remain obligated to ensure that it is 274 | available for as long as needed to satisfy these requirements. 275 | 276 | e) Convey the object code using peer-to-peer transmission, provided 277 | you inform other peers where the object code and Corresponding 278 | Source of the work are being offered to the general public at no 279 | charge under subsection 6d. 280 | 281 | A separable portion of the object code, whose source code is excluded 282 | from the Corresponding Source as a System Library, need not be 283 | included in conveying the object code work. 284 | 285 | A "User Product" is either (1) a "consumer product", which means any 286 | tangible personal property which is normally used for personal, family, 287 | or household purposes, or (2) anything designed or sold for incorporation 288 | into a dwelling. In determining whether a product is a consumer product, 289 | doubtful cases shall be resolved in favor of coverage. For a particular 290 | product received by a particular user, "normally used" refers to a 291 | typical or common use of that class of product, regardless of the status 292 | of the particular user or of the way in which the particular user 293 | actually uses, or expects or is expected to use, the product. A product 294 | is a consumer product regardless of whether the product has substantial 295 | commercial, industrial or non-consumer uses, unless such uses represent 296 | the only significant mode of use of the product. 297 | 298 | "Installation Information" for a User Product means any methods, 299 | procedures, authorization keys, or other information required to install 300 | and execute modified versions of a covered work in that User Product from 301 | a modified version of its Corresponding Source. The information must 302 | suffice to ensure that the continued functioning of the modified object 303 | code is in no case prevented or interfered with solely because 304 | modification has been made. 305 | 306 | If you convey an object code work under this section in, or with, or 307 | specifically for use in, a User Product, and the conveying occurs as 308 | part of a transaction in which the right of possession and use of the 309 | User Product is transferred to the recipient in perpetuity or for a 310 | fixed term (regardless of how the transaction is characterized), the 311 | Corresponding Source conveyed under this section must be accompanied 312 | by the Installation Information. But this requirement does not apply 313 | if neither you nor any third party retains the ability to install 314 | modified object code on the User Product (for example, the work has 315 | been installed in ROM). 316 | 317 | The requirement to provide Installation Information does not include a 318 | requirement to continue to provide support service, warranty, or updates 319 | for a work that has been modified or installed by the recipient, or for 320 | the User Product in which it has been modified or installed. Access to a 321 | network may be denied when the modification itself materially and 322 | adversely affects the operation of the network or violates the rules and 323 | protocols for communication across the network. 324 | 325 | Corresponding Source conveyed, and Installation Information provided, 326 | in accord with this section must be in a format that is publicly 327 | documented (and with an implementation available to the public in 328 | source code form), and must require no special password or key for 329 | unpacking, reading or copying. 330 | 331 | 7. Additional Terms. 332 | 333 | "Additional permissions" are terms that supplement the terms of this 334 | License by making exceptions from one or more of its conditions. 335 | Additional permissions that are applicable to the entire Program shall 336 | be treated as though they were included in this License, to the extent 337 | that they are valid under applicable law. If additional permissions 338 | apply only to part of the Program, that part may be used separately 339 | under those permissions, but the entire Program remains governed by 340 | this License without regard to the additional permissions. 341 | 342 | When you convey a copy of a covered work, you may at your option 343 | remove any additional permissions from that copy, or from any part of 344 | it. (Additional permissions may be written to require their own 345 | removal in certain cases when you modify the work.) You may place 346 | additional permissions on material, added by you to a covered work, 347 | for which you have or can give appropriate copyright permission. 348 | 349 | Notwithstanding any other provision of this License, for material you 350 | add to a covered work, you may (if authorized by the copyright holders of 351 | that material) supplement the terms of this License with terms: 352 | 353 | a) Disclaiming warranty or limiting liability differently from the 354 | terms of sections 15 and 16 of this License; or 355 | 356 | b) Requiring preservation of specified reasonable legal notices or 357 | author attributions in that material or in the Appropriate Legal 358 | Notices displayed by works containing it; or 359 | 360 | c) Prohibiting misrepresentation of the origin of that material, or 361 | requiring that modified versions of such material be marked in 362 | reasonable ways as different from the original version; or 363 | 364 | d) Limiting the use for publicity purposes of names of licensors or 365 | authors of the material; or 366 | 367 | e) Declining to grant rights under trademark law for use of some 368 | trade names, trademarks, or service marks; or 369 | 370 | f) Requiring indemnification of licensors and authors of that 371 | material by anyone who conveys the material (or modified versions of 372 | it) with contractual assumptions of liability to the recipient, for 373 | any liability that these contractual assumptions directly impose on 374 | those licensors and authors. 375 | 376 | All other non-permissive additional terms are considered "further 377 | restrictions" within the meaning of section 10. If the Program as you 378 | received it, or any part of it, contains a notice stating that it is 379 | governed by this License along with a term that is a further 380 | restriction, you may remove that term. If a license document contains 381 | a further restriction but permits relicensing or conveying under this 382 | License, you may add to a covered work material governed by the terms 383 | of that license document, provided that the further restriction does 384 | not survive such relicensing or conveying. 385 | 386 | If you add terms to a covered work in accord with this section, you 387 | must place, in the relevant source files, a statement of the 388 | additional terms that apply to those files, or a notice indicating 389 | where to find the applicable terms. 390 | 391 | Additional terms, permissive or non-permissive, may be stated in the 392 | form of a separately written license, or stated as exceptions; 393 | the above requirements apply either way. 394 | 395 | 8. Termination. 396 | 397 | You may not propagate or modify a covered work except as expressly 398 | provided under this License. Any attempt otherwise to propagate or 399 | modify it is void, and will automatically terminate your rights under 400 | this License (including any patent licenses granted under the third 401 | paragraph of section 11). 402 | 403 | However, if you cease all violation of this License, then your 404 | license from a particular copyright holder is reinstated (a) 405 | provisionally, unless and until the copyright holder explicitly and 406 | finally terminates your license, and (b) permanently, if the copyright 407 | holder fails to notify you of the violation by some reasonable means 408 | prior to 60 days after the cessation. 409 | 410 | Moreover, your license from a particular copyright holder is 411 | reinstated permanently if the copyright holder notifies you of the 412 | violation by some reasonable means, this is the first time you have 413 | received notice of violation of this License (for any work) from that 414 | copyright holder, and you cure the violation prior to 30 days after 415 | your receipt of the notice. 416 | 417 | Termination of your rights under this section does not terminate the 418 | licenses of parties who have received copies or rights from you under 419 | this License. If your rights have been terminated and not permanently 420 | reinstated, you do not qualify to receive new licenses for the same 421 | material under section 10. 422 | 423 | 9. Acceptance Not Required for Having Copies. 424 | 425 | You are not required to accept this License in order to receive or 426 | run a copy of the Program. Ancillary propagation of a covered work 427 | occurring solely as a consequence of using peer-to-peer transmission 428 | to receive a copy likewise does not require acceptance. However, 429 | nothing other than this License grants you permission to propagate or 430 | modify any covered work. These actions infringe copyright if you do 431 | not accept this License. Therefore, by modifying or propagating a 432 | covered work, you indicate your acceptance of this License to do so. 433 | 434 | 10. Automatic Licensing of Downstream Recipients. 435 | 436 | Each time you convey a covered work, the recipient automatically 437 | receives a license from the original licensors, to run, modify and 438 | propagate that work, subject to this License. You are not responsible 439 | for enforcing compliance by third parties with this License. 440 | 441 | An "entity transaction" is a transaction transferring control of an 442 | organization, or substantially all assets of one, or subdividing an 443 | organization, or merging organizations. If propagation of a covered 444 | work results from an entity transaction, each party to that 445 | transaction who receives a copy of the work also receives whatever 446 | licenses to the work the party's predecessor in interest had or could 447 | give under the previous paragraph, plus a right to possession of the 448 | Corresponding Source of the work from the predecessor in interest, if 449 | the predecessor has it or can get it with reasonable efforts. 450 | 451 | You may not impose any further restrictions on the exercise of the 452 | rights granted or affirmed under this License. For example, you may 453 | not impose a license fee, royalty, or other charge for exercise of 454 | rights granted under this License, and you may not initiate litigation 455 | (including a cross-claim or counterclaim in a lawsuit) alleging that 456 | any patent claim is infringed by making, using, selling, offering for 457 | sale, or importing the Program or any portion of it. 458 | 459 | 11. Patents. 460 | 461 | A "contributor" is a copyright holder who authorizes use under this 462 | License of the Program or a work on which the Program is based. The 463 | work thus licensed is called the contributor's "contributor version". 464 | 465 | A contributor's "essential patent claims" are all patent claims 466 | owned or controlled by the contributor, whether already acquired or 467 | hereafter acquired, that would be infringed by some manner, permitted 468 | by this License, of making, using, or selling its contributor version, 469 | but do not include claims that would be infringed only as a 470 | consequence of further modification of the contributor version. For 471 | purposes of this definition, "control" includes the right to grant 472 | patent sublicenses in a manner consistent with the requirements of 473 | this License. 474 | 475 | Each contributor grants you a non-exclusive, worldwide, royalty-free 476 | patent license under the contributor's essential patent claims, to 477 | make, use, sell, offer for sale, import and otherwise run, modify and 478 | propagate the contents of its contributor version. 479 | 480 | In the following three paragraphs, a "patent license" is any express 481 | agreement or commitment, however denominated, not to enforce a patent 482 | (such as an express permission to practice a patent or covenant not to 483 | sue for patent infringement). To "grant" such a patent license to a 484 | party means to make such an agreement or commitment not to enforce a 485 | patent against the party. 486 | 487 | If you convey a covered work, knowingly relying on a patent license, 488 | and the Corresponding Source of the work is not available for anyone 489 | to copy, free of charge and under the terms of this License, through a 490 | publicly available network server or other readily accessible means, 491 | then you must either (1) cause the Corresponding Source to be so 492 | available, or (2) arrange to deprive yourself of the benefit of the 493 | patent license for this particular work, or (3) arrange, in a manner 494 | consistent with the requirements of this License, to extend the patent 495 | license to downstream recipients. "Knowingly relying" means you have 496 | actual knowledge that, but for the patent license, your conveying the 497 | covered work in a country, or your recipient's use of the covered work 498 | in a country, would infringe one or more identifiable patents in that 499 | country that you have reason to believe are valid. 500 | 501 | If, pursuant to or in connection with a single transaction or 502 | arrangement, you convey, or propagate by procuring conveyance of, a 503 | covered work, and grant a patent license to some of the parties 504 | receiving the covered work authorizing them to use, propagate, modify 505 | or convey a specific copy of the covered work, then the patent license 506 | you grant is automatically extended to all recipients of the covered 507 | work and works based on it. 508 | 509 | A patent license is "discriminatory" if it does not include within 510 | the scope of its coverage, prohibits the exercise of, or is 511 | conditioned on the non-exercise of one or more of the rights that are 512 | specifically granted under this License. You may not convey a covered 513 | work if you are a party to an arrangement with a third party that is 514 | in the business of distributing software, under which you make payment 515 | to the third party based on the extent of your activity of conveying 516 | the work, and under which the third party grants, to any of the 517 | parties who would receive the covered work from you, a discriminatory 518 | patent license (a) in connection with copies of the covered work 519 | conveyed by you (or copies made from those copies), or (b) primarily 520 | for and in connection with specific products or compilations that 521 | contain the covered work, unless you entered into that arrangement, 522 | or that patent license was granted, prior to 28 March 2007. 523 | 524 | Nothing in this License shall be construed as excluding or limiting 525 | any implied license or other defenses to infringement that may 526 | otherwise be available to you under applicable patent law. 527 | 528 | 12. No Surrender of Others' Freedom. 529 | 530 | If conditions are imposed on you (whether by court order, agreement or 531 | otherwise) that contradict the conditions of this License, they do not 532 | excuse you from the conditions of this License. If you cannot convey a 533 | covered work so as to satisfy simultaneously your obligations under this 534 | License and any other pertinent obligations, then as a consequence you may 535 | not convey it at all. For example, if you agree to terms that obligate you 536 | to collect a royalty for further conveying from those to whom you convey 537 | the Program, the only way you could satisfy both those terms and this 538 | License would be to refrain entirely from conveying the Program. 539 | 540 | 13. Remote Network Interaction; Use with the GNU General Public License. 541 | 542 | Notwithstanding any other provision of this License, if you modify the 543 | Program, your modified version must prominently offer all users 544 | interacting with it remotely through a computer network (if your version 545 | supports such interaction) an opportunity to receive the Corresponding 546 | Source of your version by providing access to the Corresponding Source 547 | from a network server at no charge, through some standard or customary 548 | means of facilitating copying of software. This Corresponding Source 549 | shall include the Corresponding Source for any work covered by version 3 550 | of the GNU General Public License that is incorporated pursuant to the 551 | following paragraph. 552 | 553 | Notwithstanding any other provision of this License, you have 554 | permission to link or combine any covered work with a work licensed 555 | under version 3 of the GNU General Public License into a single 556 | combined work, and to convey the resulting work. The terms of this 557 | License will continue to apply to the part which is the covered work, 558 | but the work with which it is combined will remain governed by version 559 | 3 of the GNU General Public License. 560 | 561 | 14. Revised Versions of this License. 562 | 563 | The Free Software Foundation may publish revised and/or new versions of 564 | the GNU Affero General Public License from time to time. Such new versions 565 | will be similar in spirit to the present version, but may differ in detail to 566 | address new problems or concerns. 567 | 568 | Each version is given a distinguishing version number. If the 569 | Program specifies that a certain numbered version of the GNU Affero General 570 | Public License "or any later version" applies to it, you have the 571 | option of following the terms and conditions either of that numbered 572 | version or of any later version published by the Free Software 573 | Foundation. If the Program does not specify a version number of the 574 | GNU Affero General Public License, you may choose any version ever published 575 | by the Free Software Foundation. 576 | 577 | If the Program specifies that a proxy can decide which future 578 | versions of the GNU Affero General Public License can be used, that proxy's 579 | public statement of acceptance of a version permanently authorizes you 580 | to choose that version for the Program. 581 | 582 | Later license versions may give you additional or different 583 | permissions. However, no additional obligations are imposed on any 584 | author or copyright holder as a result of your choosing to follow a 585 | later version. 586 | 587 | 15. Disclaimer of Warranty. 588 | 589 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 590 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 591 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 592 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 593 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 594 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 595 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 596 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 597 | 598 | 16. Limitation of Liability. 599 | 600 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 601 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 602 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 603 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 604 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 605 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 606 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 607 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 608 | SUCH DAMAGES. 609 | 610 | 17. Interpretation of Sections 15 and 16. 611 | 612 | If the disclaimer of warranty and limitation of liability provided 613 | above cannot be given local legal effect according to their terms, 614 | reviewing courts shall apply local law that most closely approximates 615 | an absolute waiver of all civil liability in connection with the 616 | Program, unless a warranty or assumption of liability accompanies a 617 | copy of the Program in return for a fee. 618 | 619 | END OF TERMS AND CONDITIONS 620 | 621 | How to Apply These Terms to Your New Programs 622 | 623 | If you develop a new program, and you want it to be of the greatest 624 | possible use to the public, the best way to achieve this is to make it 625 | free software which everyone can redistribute and change under these terms. 626 | 627 | To do so, attach the following notices to the program. It is safest 628 | to attach them to the start of each source file to most effectively 629 | state the exclusion of warranty; and each file should have at least 630 | the "copyright" line and a pointer to where the full notice is found. 631 | 632 | 633 | Copyright (C) 634 | 635 | This program is free software: you can redistribute it and/or modify 636 | it under the terms of the GNU Affero General Public License as published by 637 | the Free Software Foundation, either version 3 of the License, or 638 | (at your option) any later version. 639 | 640 | This program is distributed in the hope that it will be useful, 641 | but WITHOUT ANY WARRANTY; without even the implied warranty of 642 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 643 | GNU Affero General Public License for more details. 644 | 645 | You should have received a copy of the GNU Affero General Public License 646 | along with this program. If not, see . 647 | 648 | Also add information on how to contact you by electronic and paper mail. 649 | 650 | If your software can interact with users remotely through a computer 651 | network, you should also make sure that it provides a way for users to 652 | get its source. For example, if your program is a web application, its 653 | interface could display a "Source" link that leads users to an archive 654 | of the code. There are many ways you could offer source, and different 655 | solutions will be better for different programs; see section 13 for the 656 | specific requirements. 657 | 658 | You should also get your employer (if you work as a programmer) or school, 659 | if any, to sign a "copyright disclaimer" for the program, if necessary. 660 | For more information on this, and how to apply and follow the GNU AGPL, see 661 | . -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # Introduction 2 | 3 | This is an early experiment about Semantic Diff for the Java language. 4 | Our goal is to integrate it into NetBeans once it is finished. 5 | 6 | # What semantic diff is 7 | 8 | It is a diff between multiple files, where the differences are expressed with criteria 9 | which are related to the file content's semantic. 10 | 11 | Examples of semantic differences: 12 | 13 | - A new function has been introduced into a class. 14 | - A new function call was added into a block of code. 15 | - The 2nd parameter of a function call was modified. 16 | - A class inherits from a different class. 17 | - A function was moved to a super class. 18 | 19 | Examples of differences which are not semantical: 20 | 21 | - A method have been re-indented. 22 | - A new line was added into a piece of code which was too long. 23 | - A function was moved to a different location inside the same class. 24 | - A local variable was renamed. 25 | 26 | # Why it is cool 27 | 28 | ## Ignoring irrelevant changes 29 | 30 | When developers want to review a commit, they use a diff tool. 31 | Sometimes, they don't want to list all the details which do not change the 32 | behavior of a program, and they only want to see changes that matter. 33 | A semantic diff can help them to select which type of changes they think matter, 34 | and help them save some time by ignoring the unimportant changes. 35 | 36 | ## Ignoring irrelevant **conflicts** 37 | 38 | Another reason why a semantic diff can be cool is when you have to merge 2 branches 39 | together in your code. A classical diff tool might reveal conflicts on lines 40 | being modified on each branch, while a semantic diff might be able to see the changes 41 | from a different angle and still be able to merge them if their semantic doesn't 42 | conflict which each other. 43 | 44 | For example: 45 | 46 | - There is a section of code which was modified on both `branch A` and `branch B`. 47 | - On `branch A`, the change is just a code formatting change. 48 | - On `branch B`, the change is a variable which was renamed. 49 | - The semantic diff doesn't detect semantic conflict and a semantic merge tool 50 | can merge the changes without bothering the developer. 51 | 52 | # License 53 | 54 | This project is distributed under the Affero General Public License (AGPL) version 3. 55 | The license's terms are defined in the file LICENSE.txt. 56 | For information about our license choice: [Why Affero GPL](http://www.gnu.org/licenses/why-affero-gpl.html). 57 | 58 | # Original Developers 59 | 60 | David Andreoletti & Vincent Cantin 61 | 62 | # Contributions 63 | 64 | Contributions are welcome, do not hesitate to create an issue and/or start a pull request. 65 | 66 | -------------------------------------------------------------------------------- /build.gradle: -------------------------------------------------------------------------------- 1 | apply plugin: 'java' 2 | 3 | repositories { 4 | mavenCentral() 5 | } 6 | 7 | configurations { 8 | antlr4 9 | } 10 | 11 | dependencies { 12 | compile 'org.antlr:antlr4-runtime:4.5' 13 | antlr4 'org.antlr:antlr4:4.5' 14 | } 15 | 16 | ext.antlr4GeneratedSourceDir = new File(buildDir, 'generated-sources/antlr4') 17 | 18 | sourceSets { 19 | main { 20 | java { 21 | srcDir antlr4GeneratedSourceDir 22 | } 23 | } 24 | } 25 | 26 | task generateGrammarSource { 27 | ext.grammarFile = new File(projectDir, 'src/main/antlr4/Java.g4') 28 | ext.outputPackage = 'com.lemoulinstudio.sdiff.java.tree.parser' 29 | ext.outputDir = new File(antlr4GeneratedSourceDir, outputPackage.replace('.' as char, File.separatorChar)) 30 | 31 | inputs.file grammarFile 32 | inputs.property 'outputPackage', outputPackage 33 | outputs.dir outputDir 34 | 35 | doLast { 36 | javaexec { 37 | classpath configurations.antlr4 38 | main 'org.antlr.v4.Tool' 39 | args '-o', outputDir, 40 | '-package', outputPackage, 41 | grammarFile 42 | } 43 | } 44 | } 45 | 46 | compileJava.dependsOn(generateGrammarSource) 47 | 48 | ext.mainClass = 'com.lemoulinstudio.sdiff.Main' 49 | -------------------------------------------------------------------------------- /src/main/antlr4/Java.g4: -------------------------------------------------------------------------------- 1 | /* 2 | [The "BSD licence"] 3 | Copyright (c) 2013 Terence Parr, Sam Harwell 4 | All rights reserved. 5 | 6 | Redistribution and use in source and binary forms, with or without 7 | modification, are permitted provided that the following conditions 8 | are met: 9 | 1. Redistributions of source code must retain the above copyright 10 | notice, this list of conditions and the following disclaimer. 11 | 2. Redistributions in binary form must reproduce the above copyright 12 | notice, this list of conditions and the following disclaimer in the 13 | documentation and/or other materials provided with the distribution. 14 | 3. The name of the author may not be used to endorse or promote products 15 | derived from this software without specific prior written permission. 16 | 17 | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 18 | IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 19 | OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 | IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 | NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 | THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 | */ 28 | 29 | /** A Java 1.7 grammar for ANTLR v4 derived from ANTLR v3 Java grammar. 30 | * Uses ANTLR v4's left-recursive expression notation. 31 | * It parses ECJ, Netbeans, JDK etc... 32 | * 33 | * Sam Harwell cleaned this up significantly and updated to 1.7! 34 | * 35 | * You can test with 36 | * 37 | * $ antlr4 Java.g4 38 | * $ javac *.java 39 | * $ grun Java compilationUnit *.java 40 | */ 41 | grammar Java; 42 | 43 | // starting point for parsing a java file 44 | compilationUnit 45 | : packageDeclaration? importDeclaration* typeDeclaration* EOF 46 | ; 47 | 48 | packageDeclaration 49 | : annotation* 'package' qualifiedName ';' 50 | ; 51 | 52 | importDeclaration 53 | : 'import' 'static'? qualifiedName ('.' '*')? ';' 54 | ; 55 | 56 | typeDeclaration 57 | : classOrInterfaceModifier* classDeclaration 58 | | classOrInterfaceModifier* enumDeclaration 59 | | classOrInterfaceModifier* interfaceDeclaration 60 | | classOrInterfaceModifier* annotationTypeDeclaration 61 | | ';' 62 | ; 63 | 64 | modifier 65 | : classOrInterfaceModifier 66 | | ( 'native' 67 | | 'synchronized' 68 | | 'transient' 69 | | 'volatile' 70 | ) 71 | ; 72 | 73 | classOrInterfaceModifier 74 | : annotation // class or interface 75 | | ( 'public' // class or interface 76 | | 'protected' // class or interface 77 | | 'private' // class or interface 78 | | 'static' // class or interface 79 | | 'abstract' // class or interface 80 | | 'final' // class only -- does not apply to interfaces 81 | | 'strictfp' // class or interface 82 | ) 83 | ; 84 | 85 | variableModifier 86 | : 'final' 87 | | annotation 88 | ; 89 | 90 | classDeclaration 91 | : 'class' Identifier typeParameters? 92 | ('extends' type)? 93 | ('implements' typeList)? 94 | classBody 95 | ; 96 | 97 | typeParameters 98 | : '<' typeParameter (',' typeParameter)* '>' 99 | ; 100 | 101 | typeParameter 102 | : Identifier ('extends' typeBound)? 103 | ; 104 | 105 | typeBound 106 | : type ('&' type)* 107 | ; 108 | 109 | enumDeclaration 110 | : ENUM Identifier ('implements' typeList)? 111 | '{' enumConstants? ','? enumBodyDeclarations? '}' 112 | ; 113 | 114 | enumConstants 115 | : enumConstant (',' enumConstant)* 116 | ; 117 | 118 | enumConstant 119 | : annotation* Identifier arguments? classBody? 120 | ; 121 | 122 | enumBodyDeclarations 123 | : ';' classBodyDeclaration* 124 | ; 125 | 126 | interfaceDeclaration 127 | : 'interface' Identifier typeParameters? ('extends' typeList)? interfaceBody 128 | ; 129 | 130 | typeList 131 | : type (',' type)* 132 | ; 133 | 134 | classBody 135 | : '{' classBodyDeclaration* '}' 136 | ; 137 | 138 | interfaceBody 139 | : '{' interfaceBodyDeclaration* '}' 140 | ; 141 | 142 | classBodyDeclaration 143 | : ';' 144 | | 'static'? block 145 | | modifier* memberDeclaration 146 | ; 147 | 148 | memberDeclaration 149 | : methodDeclaration 150 | | genericMethodDeclaration 151 | | fieldDeclaration 152 | | constructorDeclaration 153 | | genericConstructorDeclaration 154 | | interfaceDeclaration 155 | | annotationTypeDeclaration 156 | | classDeclaration 157 | | enumDeclaration 158 | ; 159 | 160 | /* We use rule this even for void methods which cannot have [] after parameters. 161 | This simplifies grammar and we can consider void to be a type, which 162 | renders the [] matching as a context-sensitive issue or a semantic check 163 | for invalid return type after parsing. 164 | */ 165 | methodDeclaration 166 | : (type|'void') Identifier formalParameters ('[' ']')* 167 | ('throws' qualifiedNameList)? 168 | ( methodBody 169 | | ';' 170 | ) 171 | ; 172 | 173 | genericMethodDeclaration 174 | : typeParameters methodDeclaration 175 | ; 176 | 177 | constructorDeclaration 178 | : Identifier formalParameters ('throws' qualifiedNameList)? 179 | constructorBody 180 | ; 181 | 182 | genericConstructorDeclaration 183 | : typeParameters constructorDeclaration 184 | ; 185 | 186 | fieldDeclaration 187 | : type variableDeclarators ';' 188 | ; 189 | 190 | interfaceBodyDeclaration 191 | : modifier* interfaceMemberDeclaration 192 | | ';' 193 | ; 194 | 195 | interfaceMemberDeclaration 196 | : constDeclaration 197 | | interfaceMethodDeclaration 198 | | genericInterfaceMethodDeclaration 199 | | interfaceDeclaration 200 | | annotationTypeDeclaration 201 | | classDeclaration 202 | | enumDeclaration 203 | ; 204 | 205 | constDeclaration 206 | : type constantDeclarator (',' constantDeclarator)* ';' 207 | ; 208 | 209 | constantDeclarator 210 | : Identifier ('[' ']')* '=' variableInitializer 211 | ; 212 | 213 | // see matching of [] comment in methodDeclaratorRest 214 | interfaceMethodDeclaration 215 | : (type|'void') Identifier formalParameters ('[' ']')* 216 | ('throws' qualifiedNameList)? 217 | ';' 218 | ; 219 | 220 | genericInterfaceMethodDeclaration 221 | : typeParameters interfaceMethodDeclaration 222 | ; 223 | 224 | variableDeclarators 225 | : variableDeclarator (',' variableDeclarator)* 226 | ; 227 | 228 | variableDeclarator 229 | : variableDeclaratorId ('=' variableInitializer)? 230 | ; 231 | 232 | variableDeclaratorId 233 | : Identifier ('[' ']')* 234 | ; 235 | 236 | variableInitializer 237 | : arrayInitializer 238 | | expression 239 | ; 240 | 241 | arrayInitializer 242 | : '{' (variableInitializer (',' variableInitializer)* (',')? )? '}' 243 | ; 244 | 245 | enumConstantName 246 | : Identifier 247 | ; 248 | 249 | type 250 | : classOrInterfaceType ('[' ']')* 251 | | primitiveType ('[' ']')* 252 | ; 253 | 254 | classOrInterfaceType 255 | : Identifier typeArguments? ('.' Identifier typeArguments? )* 256 | ; 257 | 258 | primitiveType 259 | : 'boolean' 260 | | 'char' 261 | | 'byte' 262 | | 'short' 263 | | 'int' 264 | | 'long' 265 | | 'float' 266 | | 'double' 267 | ; 268 | 269 | typeArguments 270 | : '<' typeArgument (',' typeArgument)* '>' 271 | ; 272 | 273 | typeArgument 274 | : type 275 | | '?' (('extends' | 'super') type)? 276 | ; 277 | 278 | qualifiedNameList 279 | : qualifiedName (',' qualifiedName)* 280 | ; 281 | 282 | formalParameters 283 | : '(' formalParameterList? ')' 284 | ; 285 | 286 | formalParameterList 287 | : formalParameter (',' formalParameter)* (',' lastFormalParameter)? 288 | | lastFormalParameter 289 | ; 290 | 291 | formalParameter 292 | : variableModifier* type variableDeclaratorId 293 | ; 294 | 295 | lastFormalParameter 296 | : variableModifier* type '...' variableDeclaratorId 297 | ; 298 | 299 | methodBody 300 | : block 301 | ; 302 | 303 | constructorBody 304 | : block 305 | ; 306 | 307 | qualifiedName 308 | : Identifier ('.' Identifier)* 309 | ; 310 | 311 | literal 312 | : IntegerLiteral 313 | | FloatingPointLiteral 314 | | CharacterLiteral 315 | | StringLiteral 316 | | BooleanLiteral 317 | | 'null' 318 | ; 319 | 320 | // ANNOTATIONS 321 | 322 | annotation 323 | : '@' annotationName ( '(' ( elementValuePairs | elementValue )? ')' )? 324 | ; 325 | 326 | annotationName : qualifiedName ; 327 | 328 | elementValuePairs 329 | : elementValuePair (',' elementValuePair)* 330 | ; 331 | 332 | elementValuePair 333 | : Identifier '=' elementValue 334 | ; 335 | 336 | elementValue 337 | : expression 338 | | annotation 339 | | elementValueArrayInitializer 340 | ; 341 | 342 | elementValueArrayInitializer 343 | : '{' (elementValue (',' elementValue)*)? (',')? '}' 344 | ; 345 | 346 | annotationTypeDeclaration 347 | : '@' 'interface' Identifier annotationTypeBody 348 | ; 349 | 350 | annotationTypeBody 351 | : '{' (annotationTypeElementDeclaration)* '}' 352 | ; 353 | 354 | annotationTypeElementDeclaration 355 | : modifier* annotationTypeElementRest 356 | | ';' // this is not allowed by the grammar, but apparently allowed by the actual compiler 357 | ; 358 | 359 | annotationTypeElementRest 360 | : type annotationMethodOrConstantRest ';' 361 | | classDeclaration ';'? 362 | | interfaceDeclaration ';'? 363 | | enumDeclaration ';'? 364 | | annotationTypeDeclaration ';'? 365 | ; 366 | 367 | annotationMethodOrConstantRest 368 | : annotationMethodRest 369 | | annotationConstantRest 370 | ; 371 | 372 | annotationMethodRest 373 | : Identifier '(' ')' defaultValue? 374 | ; 375 | 376 | annotationConstantRest 377 | : variableDeclarators 378 | ; 379 | 380 | defaultValue 381 | : 'default' elementValue 382 | ; 383 | 384 | // STATEMENTS / BLOCKS 385 | 386 | block 387 | : '{' blockStatement* '}' 388 | ; 389 | 390 | blockStatement 391 | : localVariableDeclarationStatement 392 | | statement 393 | | typeDeclaration 394 | ; 395 | 396 | localVariableDeclarationStatement 397 | : localVariableDeclaration ';' 398 | ; 399 | 400 | localVariableDeclaration 401 | : variableModifier* type variableDeclarators 402 | ; 403 | 404 | statement 405 | : block 406 | | ASSERT expression (':' expression)? ';' 407 | | 'if' parExpression statement ('else' statement)? 408 | | 'for' '(' forControl ')' statement 409 | | 'while' parExpression statement 410 | | 'do' statement 'while' parExpression ';' 411 | | 'try' block (catchClause+ finallyBlock? | finallyBlock) 412 | | 'try' resourceSpecification block catchClause* finallyBlock? 413 | | 'switch' parExpression '{' switchBlockStatementGroup* switchLabel* '}' 414 | | 'synchronized' parExpression block 415 | | 'return' expression? ';' 416 | | 'throw' expression ';' 417 | | 'break' Identifier? ';' 418 | | 'continue' Identifier? ';' 419 | | ';' 420 | | statementExpression ';' 421 | | Identifier ':' statement 422 | ; 423 | 424 | catchClause 425 | : 'catch' '(' variableModifier* catchType Identifier ')' block 426 | ; 427 | 428 | catchType 429 | : qualifiedName ('|' qualifiedName)* 430 | ; 431 | 432 | finallyBlock 433 | : 'finally' block 434 | ; 435 | 436 | resourceSpecification 437 | : '(' resources ';'? ')' 438 | ; 439 | 440 | resources 441 | : resource (';' resource)* 442 | ; 443 | 444 | resource 445 | : variableModifier* classOrInterfaceType variableDeclaratorId '=' expression 446 | ; 447 | 448 | /** Matches cases then statements, both of which are mandatory. 449 | * To handle empty cases at the end, we add switchLabel* to statement. 450 | */ 451 | switchBlockStatementGroup 452 | : switchLabel+ blockStatement+ 453 | ; 454 | 455 | switchLabel 456 | : 'case' constantExpression ':' 457 | | 'case' enumConstantName ':' 458 | | 'default' ':' 459 | ; 460 | 461 | forControl 462 | : enhancedForControl 463 | | forInit? ';' expression? ';' forUpdate? 464 | ; 465 | 466 | forInit 467 | : localVariableDeclaration 468 | | expressionList 469 | ; 470 | 471 | enhancedForControl 472 | : variableModifier* type variableDeclaratorId ':' expression 473 | ; 474 | 475 | forUpdate 476 | : expressionList 477 | ; 478 | 479 | // EXPRESSIONS 480 | 481 | parExpression 482 | : '(' expression ')' 483 | ; 484 | 485 | expressionList 486 | : expression (',' expression)* 487 | ; 488 | 489 | statementExpression 490 | : expression 491 | ; 492 | 493 | constantExpression 494 | : expression 495 | ; 496 | 497 | expression 498 | : primary 499 | | expression '.' Identifier 500 | | expression '.' 'this' 501 | | expression '.' 'new' nonWildcardTypeArguments? innerCreator 502 | | expression '.' 'super' superSuffix 503 | | expression '.' explicitGenericInvocation 504 | | expression '[' expression ']' 505 | | expression '(' expressionList? ')' 506 | | 'new' creator 507 | | '(' type ')' expression 508 | | expression ('++' | '--') 509 | | ('+'|'-'|'++'|'--') expression 510 | | ('~'|'!') expression 511 | | expression ('*'|'/'|'%') expression 512 | | expression ('+'|'-') expression 513 | | expression ('<' '<' | '>' '>' '>' | '>' '>') expression 514 | | expression ('<=' | '>=' | '>' | '<') expression 515 | | expression 'instanceof' type 516 | | expression ('==' | '!=') expression 517 | | expression '&' expression 518 | | expression '^' expression 519 | | expression '|' expression 520 | | expression '&&' expression 521 | | expression '||' expression 522 | | expression '?' expression ':' expression 523 | | expression 524 | ( '=' 525 | | '+=' 526 | | '-=' 527 | | '*=' 528 | | '/=' 529 | | '&=' 530 | | '|=' 531 | | '^=' 532 | | '>>=' 533 | | '>>>=' 534 | | '<<=' 535 | | '%=' 536 | ) 537 | expression 538 | ; 539 | 540 | primary 541 | : '(' expression ')' 542 | | 'this' 543 | | 'super' 544 | | literal 545 | | Identifier 546 | | type '.' 'class' 547 | | 'void' '.' 'class' 548 | | nonWildcardTypeArguments (explicitGenericInvocationSuffix | 'this' arguments) 549 | ; 550 | 551 | creator 552 | : nonWildcardTypeArguments createdName classCreatorRest 553 | | createdName (arrayCreatorRest | classCreatorRest) 554 | ; 555 | 556 | createdName 557 | : Identifier typeArgumentsOrDiamond? ('.' Identifier typeArgumentsOrDiamond?)* 558 | | primitiveType 559 | ; 560 | 561 | innerCreator 562 | : Identifier nonWildcardTypeArgumentsOrDiamond? classCreatorRest 563 | ; 564 | 565 | arrayCreatorRest 566 | : '[' 567 | ( ']' ('[' ']')* arrayInitializer 568 | | expression ']' ('[' expression ']')* ('[' ']')* 569 | ) 570 | ; 571 | 572 | classCreatorRest 573 | : arguments classBody? 574 | ; 575 | 576 | explicitGenericInvocation 577 | : nonWildcardTypeArguments explicitGenericInvocationSuffix 578 | ; 579 | 580 | nonWildcardTypeArguments 581 | : '<' typeList '>' 582 | ; 583 | 584 | typeArgumentsOrDiamond 585 | : '<' '>' 586 | | typeArguments 587 | ; 588 | 589 | nonWildcardTypeArgumentsOrDiamond 590 | : '<' '>' 591 | | nonWildcardTypeArguments 592 | ; 593 | 594 | superSuffix 595 | : arguments 596 | | '.' Identifier arguments? 597 | ; 598 | 599 | explicitGenericInvocationSuffix 600 | : 'super' superSuffix 601 | | Identifier arguments 602 | ; 603 | 604 | arguments 605 | : '(' expressionList? ')' 606 | ; 607 | 608 | // LEXER 609 | 610 | // §3.9 Keywords 611 | 612 | ABSTRACT : 'abstract'; 613 | ASSERT : 'assert'; 614 | BOOLEAN : 'boolean'; 615 | BREAK : 'break'; 616 | BYTE : 'byte'; 617 | CASE : 'case'; 618 | CATCH : 'catch'; 619 | CHAR : 'char'; 620 | CLASS : 'class'; 621 | CONST : 'const'; 622 | CONTINUE : 'continue'; 623 | DEFAULT : 'default'; 624 | DO : 'do'; 625 | DOUBLE : 'double'; 626 | ELSE : 'else'; 627 | ENUM : 'enum'; 628 | EXTENDS : 'extends'; 629 | FINAL : 'final'; 630 | FINALLY : 'finally'; 631 | FLOAT : 'float'; 632 | FOR : 'for'; 633 | IF : 'if'; 634 | GOTO : 'goto'; 635 | IMPLEMENTS : 'implements'; 636 | IMPORT : 'import'; 637 | INSTANCEOF : 'instanceof'; 638 | INT : 'int'; 639 | INTERFACE : 'interface'; 640 | LONG : 'long'; 641 | NATIVE : 'native'; 642 | NEW : 'new'; 643 | PACKAGE : 'package'; 644 | PRIVATE : 'private'; 645 | PROTECTED : 'protected'; 646 | PUBLIC : 'public'; 647 | RETURN : 'return'; 648 | SHORT : 'short'; 649 | STATIC : 'static'; 650 | STRICTFP : 'strictfp'; 651 | SUPER : 'super'; 652 | SWITCH : 'switch'; 653 | SYNCHRONIZED : 'synchronized'; 654 | THIS : 'this'; 655 | THROW : 'throw'; 656 | THROWS : 'throws'; 657 | TRANSIENT : 'transient'; 658 | TRY : 'try'; 659 | VOID : 'void'; 660 | VOLATILE : 'volatile'; 661 | WHILE : 'while'; 662 | 663 | // §3.10.1 Integer Literals 664 | 665 | IntegerLiteral 666 | : DecimalIntegerLiteral 667 | | HexIntegerLiteral 668 | | OctalIntegerLiteral 669 | | BinaryIntegerLiteral 670 | ; 671 | 672 | fragment 673 | DecimalIntegerLiteral 674 | : DecimalNumeral IntegerTypeSuffix? 675 | ; 676 | 677 | fragment 678 | HexIntegerLiteral 679 | : HexNumeral IntegerTypeSuffix? 680 | ; 681 | 682 | fragment 683 | OctalIntegerLiteral 684 | : OctalNumeral IntegerTypeSuffix? 685 | ; 686 | 687 | fragment 688 | BinaryIntegerLiteral 689 | : BinaryNumeral IntegerTypeSuffix? 690 | ; 691 | 692 | fragment 693 | IntegerTypeSuffix 694 | : [lL] 695 | ; 696 | 697 | fragment 698 | DecimalNumeral 699 | : '0' 700 | | NonZeroDigit (Digits? | Underscores Digits) 701 | ; 702 | 703 | fragment 704 | Digits 705 | : Digit (DigitOrUnderscore* Digit)? 706 | ; 707 | 708 | fragment 709 | Digit 710 | : '0' 711 | | NonZeroDigit 712 | ; 713 | 714 | fragment 715 | NonZeroDigit 716 | : [1-9] 717 | ; 718 | 719 | fragment 720 | DigitOrUnderscore 721 | : Digit 722 | | '_' 723 | ; 724 | 725 | fragment 726 | Underscores 727 | : '_'+ 728 | ; 729 | 730 | fragment 731 | HexNumeral 732 | : '0' [xX] HexDigits 733 | ; 734 | 735 | fragment 736 | HexDigits 737 | : HexDigit (HexDigitOrUnderscore* HexDigit)? 738 | ; 739 | 740 | fragment 741 | HexDigit 742 | : [0-9a-fA-F] 743 | ; 744 | 745 | fragment 746 | HexDigitOrUnderscore 747 | : HexDigit 748 | | '_' 749 | ; 750 | 751 | fragment 752 | OctalNumeral 753 | : '0' Underscores? OctalDigits 754 | ; 755 | 756 | fragment 757 | OctalDigits 758 | : OctalDigit (OctalDigitOrUnderscore* OctalDigit)? 759 | ; 760 | 761 | fragment 762 | OctalDigit 763 | : [0-7] 764 | ; 765 | 766 | fragment 767 | OctalDigitOrUnderscore 768 | : OctalDigit 769 | | '_' 770 | ; 771 | 772 | fragment 773 | BinaryNumeral 774 | : '0' [bB] BinaryDigits 775 | ; 776 | 777 | fragment 778 | BinaryDigits 779 | : BinaryDigit (BinaryDigitOrUnderscore* BinaryDigit)? 780 | ; 781 | 782 | fragment 783 | BinaryDigit 784 | : [01] 785 | ; 786 | 787 | fragment 788 | BinaryDigitOrUnderscore 789 | : BinaryDigit 790 | | '_' 791 | ; 792 | 793 | // §3.10.2 Floating-Point Literals 794 | 795 | FloatingPointLiteral 796 | : DecimalFloatingPointLiteral 797 | | HexadecimalFloatingPointLiteral 798 | ; 799 | 800 | fragment 801 | DecimalFloatingPointLiteral 802 | : Digits '.' Digits? ExponentPart? FloatTypeSuffix? 803 | | '.' Digits ExponentPart? FloatTypeSuffix? 804 | | Digits ExponentPart FloatTypeSuffix? 805 | | Digits FloatTypeSuffix 806 | ; 807 | 808 | fragment 809 | ExponentPart 810 | : ExponentIndicator SignedInteger 811 | ; 812 | 813 | fragment 814 | ExponentIndicator 815 | : [eE] 816 | ; 817 | 818 | fragment 819 | SignedInteger 820 | : Sign? Digits 821 | ; 822 | 823 | fragment 824 | Sign 825 | : [+-] 826 | ; 827 | 828 | fragment 829 | FloatTypeSuffix 830 | : [fFdD] 831 | ; 832 | 833 | fragment 834 | HexadecimalFloatingPointLiteral 835 | : HexSignificand BinaryExponent FloatTypeSuffix? 836 | ; 837 | 838 | fragment 839 | HexSignificand 840 | : HexNumeral '.'? 841 | | '0' [xX] HexDigits? '.' HexDigits 842 | ; 843 | 844 | fragment 845 | BinaryExponent 846 | : BinaryExponentIndicator SignedInteger 847 | ; 848 | 849 | fragment 850 | BinaryExponentIndicator 851 | : [pP] 852 | ; 853 | 854 | // §3.10.3 Boolean Literals 855 | 856 | BooleanLiteral 857 | : 'true' 858 | | 'false' 859 | ; 860 | 861 | // §3.10.4 Character Literals 862 | 863 | CharacterLiteral 864 | : '\'' SingleCharacter '\'' 865 | | '\'' EscapeSequence '\'' 866 | ; 867 | 868 | fragment 869 | SingleCharacter 870 | : ~['\\] 871 | ; 872 | 873 | // §3.10.5 String Literals 874 | 875 | StringLiteral 876 | : '"' StringCharacters? '"' 877 | ; 878 | 879 | fragment 880 | StringCharacters 881 | : StringCharacter+ 882 | ; 883 | 884 | fragment 885 | StringCharacter 886 | : ~["\\] 887 | | EscapeSequence 888 | ; 889 | 890 | // §3.10.6 Escape Sequences for Character and String Literals 891 | 892 | fragment 893 | EscapeSequence 894 | : '\\' [btnfr"'\\] 895 | | OctalEscape 896 | | UnicodeEscape 897 | ; 898 | 899 | fragment 900 | OctalEscape 901 | : '\\' OctalDigit 902 | | '\\' OctalDigit OctalDigit 903 | | '\\' ZeroToThree OctalDigit OctalDigit 904 | ; 905 | 906 | fragment 907 | UnicodeEscape 908 | : '\\' 'u' HexDigit HexDigit HexDigit HexDigit 909 | ; 910 | 911 | fragment 912 | ZeroToThree 913 | : [0-3] 914 | ; 915 | 916 | // §3.10.7 The Null Literal 917 | 918 | NullLiteral 919 | : 'null' 920 | ; 921 | 922 | // §3.11 Separators 923 | 924 | LPAREN : '('; 925 | RPAREN : ')'; 926 | LBRACE : '{'; 927 | RBRACE : '}'; 928 | LBRACK : '['; 929 | RBRACK : ']'; 930 | SEMI : ';'; 931 | COMMA : ','; 932 | DOT : '.'; 933 | 934 | // §3.12 Operators 935 | 936 | ASSIGN : '='; 937 | GT : '>'; 938 | LT : '<'; 939 | BANG : '!'; 940 | TILDE : '~'; 941 | QUESTION : '?'; 942 | COLON : ':'; 943 | EQUAL : '=='; 944 | LE : '<='; 945 | GE : '>='; 946 | NOTEQUAL : '!='; 947 | AND : '&&'; 948 | OR : '||'; 949 | INC : '++'; 950 | DEC : '--'; 951 | ADD : '+'; 952 | SUB : '-'; 953 | MUL : '*'; 954 | DIV : '/'; 955 | BITAND : '&'; 956 | BITOR : '|'; 957 | CARET : '^'; 958 | MOD : '%'; 959 | 960 | ADD_ASSIGN : '+='; 961 | SUB_ASSIGN : '-='; 962 | MUL_ASSIGN : '*='; 963 | DIV_ASSIGN : '/='; 964 | AND_ASSIGN : '&='; 965 | OR_ASSIGN : '|='; 966 | XOR_ASSIGN : '^='; 967 | MOD_ASSIGN : '%='; 968 | LSHIFT_ASSIGN : '<<='; 969 | RSHIFT_ASSIGN : '>>='; 970 | URSHIFT_ASSIGN : '>>>='; 971 | 972 | // §3.8 Identifiers (must appear after all keywords in the grammar) 973 | 974 | Identifier 975 | : JavaLetter JavaLetterOrDigit* 976 | ; 977 | 978 | fragment 979 | JavaLetter 980 | : [a-zA-Z$_] // these are the "java letters" below 0xFF 981 | | // covers all characters above 0xFF which are not a surrogate 982 | ~[\u0000-\u00FF\uD800-\uDBFF] 983 | {Character.isJavaIdentifierStart(_input.LA(-1))}? 984 | | // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF 985 | [\uD800-\uDBFF] [\uDC00-\uDFFF] 986 | {Character.isJavaIdentifierStart(Character.toCodePoint((char)_input.LA(-2), (char)_input.LA(-1)))}? 987 | ; 988 | 989 | fragment 990 | JavaLetterOrDigit 991 | : [a-zA-Z0-9$_] // these are the "java letters or digits" below 0xFF 992 | | // covers all characters above 0xFF which are not a surrogate 993 | ~[\u0000-\u00FF\uD800-\uDBFF] 994 | {Character.isJavaIdentifierPart(_input.LA(-1))}? 995 | | // covers UTF-16 surrogate pairs encodings for U+10000 to U+10FFFF 996 | [\uD800-\uDBFF] [\uDC00-\uDFFF] 997 | {Character.isJavaIdentifierPart(Character.toCodePoint((char)_input.LA(-2), (char)_input.LA(-1)))}? 998 | ; 999 | 1000 | // 1001 | // Additional symbols not defined in the lexical specification 1002 | // 1003 | 1004 | AT : '@'; 1005 | ELLIPSIS : '...'; 1006 | 1007 | // 1008 | // Whitespace and comments 1009 | // 1010 | 1011 | WS : [ \t\r\n\u000C]+ -> skip 1012 | ; 1013 | 1014 | COMMENT 1015 | : '/*' .*? '*/' -> skip 1016 | ; 1017 | 1018 | LINE_COMMENT 1019 | : '//' ~[\r\n]* -> skip 1020 | ; 1021 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/Main.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff; 2 | 3 | import com.lemoulinstudio.sdiff.java.tree.parser.JavaBaseListener; 4 | import com.lemoulinstudio.sdiff.java.tree.parser.JavaLexer; 5 | import com.lemoulinstudio.sdiff.java.tree.parser.JavaParser; 6 | import java.io.BufferedInputStream; 7 | import java.io.File; 8 | import java.io.FileInputStream; 9 | import java.io.InputStream; 10 | import org.antlr.v4.runtime.ANTLRInputStream; 11 | import org.antlr.v4.runtime.BufferedTokenStream; 12 | import org.antlr.v4.runtime.CharStream; 13 | import org.antlr.v4.runtime.TokenStream; 14 | import org.antlr.v4.runtime.tree.ParseTree; 15 | import org.antlr.v4.runtime.tree.TerminalNode; 16 | 17 | public class Main { 18 | 19 | public static void main(String[] args) throws Exception { 20 | String filename = "src/main/resources/Foobar.java"; 21 | JavaParser javaParser = getParser(filename); 22 | 23 | String filename2 = "src/main/resources/Foobar2.java"; 24 | JavaParser javaParser2 = getParser(filename2); 25 | 26 | // Future future = javaParser.compilationUnit().inspect(javaParser); 27 | // future.get().setVisible(true); 28 | ParseTree a = javaParser.compilationUnit(); 29 | ParseTree b = javaParser2.compilationUnit(); 30 | 31 | boolean r = isSimilar(a, b); 32 | 33 | System.out.print("Is similar ? " + Boolean.toString(r)); 34 | 35 | } 36 | 37 | private static boolean isSimilar(ParseTree nodeA, ParseTree nodeB) { 38 | //if (((ParserRuleContext) a).getRuleIndex() == ((ParserRuleContext) b).getRuleIndex()) { 39 | if (!nodeA.getText().equalsIgnoreCase(nodeB.getText())) { 40 | return false; 41 | } 42 | 43 | int nbChildrenNodeA = nodeA.getChildCount(); 44 | int nbChildrenNodeB = nodeB.getChildCount(); 45 | if (nbChildrenNodeA != nbChildrenNodeB) { 46 | return false; 47 | } 48 | 49 | for (int i = 0; i < nbChildrenNodeA; i++) { 50 | ParseTree a1 = nodeA.getChild(i); 51 | ParseTree b1 = nodeB.getChild(i); 52 | if (!isSimilar(a1, b1)) { 53 | return false; 54 | } 55 | } 56 | 57 | return true; 58 | } 59 | 60 | private static JavaParser getParser(String filename) throws Exception { 61 | InputStream inputStream = new BufferedInputStream(new FileInputStream(new File(filename))); 62 | 63 | CharStream charStream = new ANTLRInputStream(inputStream); 64 | 65 | JavaLexer javaLexer = new JavaLexer(charStream); 66 | 67 | TokenStream tokenStream = new BufferedTokenStream(javaLexer); 68 | JavaParser javaParser = new JavaParser(tokenStream); 69 | 70 | javaParser.addParseListener(new JavaBaseListener() { 71 | @Override 72 | public void visitTerminal(TerminalNode node) { 73 | // Interval sourceInterval = node.getSourceInterval(); 74 | // System.out.println( 75 | // "[" + sourceInterval.a + ", " + sourceInterval.b + "] " + 76 | // "\"" + node.getText() + "\""); 77 | System.out.print(node.getText()); 78 | } 79 | 80 | }); 81 | 82 | javaParser.setBuildParseTree(true); 83 | return javaParser; 84 | } 85 | } 86 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/ContentElementData.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | /** 4 | * The data of a content element. 5 | */ 6 | public interface ContentElementData { 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/ContentElementReference.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | /** 4 | * A reference to a content element. 5 | */ 6 | public interface ContentElementReference { 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/ContentLocation.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | /** 4 | * A location inside a content. 5 | */ 6 | public interface ContentLocation { 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/ContentReference.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | /** 4 | * A reference to a content. 5 | */ 6 | public interface ContentReference { 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/FileContentLocation.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | import com.lemoulinstudio.sdiff.content.FileContentReference; 4 | 5 | /** 6 | * A location inside a content persisted in a file. 7 | * 8 | * Here, the content is treated as pure binary data, 9 | * each location is like an index in a byte array. 10 | */ 11 | public class FileContentLocation implements ContentLocation { 12 | 13 | /** 14 | * A reference to a content which is in a file. 15 | */ 16 | public FileContentReference file; 17 | 18 | /** 19 | * A location inside a file. 20 | * 21 | * It points to the position of a byte. 22 | */ 23 | public long index; 24 | 25 | } 26 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/FileContentReference.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | import com.lemoulinstudio.sdiff.repo.Repository; 4 | import java.io.File; 5 | 6 | /** 7 | * A reference to a content persisted in a file. 8 | */ 9 | public class FileContentReference implements ContentReference { 10 | 11 | /** 12 | * The repository the content belongs to, if it exists. 13 | */ 14 | public Repository repository; 15 | 16 | /** 17 | * The file containing the content. 18 | */ 19 | public File file; 20 | 21 | } 22 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/content/TextContentElementData.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.content; 2 | 3 | /** 4 | * The text-based data of a content element. 5 | */ 6 | public class TextContentElementData implements ContentElementData { 7 | 8 | /** 9 | * The data of this content element. 10 | */ 11 | public String data; 12 | 13 | } 14 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/AddDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentLocation; 4 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 5 | import com.lemoulinstudio.sdiff.content.ContentElementData; 6 | 7 | /** 8 | * A diffelt representing the addition of a content element. 9 | */ 10 | public class AddDiffelt implements Diffelt { 11 | 12 | /** 13 | * The content element which is added. 14 | */ 15 | public ContentElementData data; 16 | 17 | /** 18 | * The location where the content element is added to. 19 | */ 20 | public ContentLocation location; 21 | 22 | /** 23 | * The reference to the content element after being added. 24 | */ 25 | public ContentElementReference reference; 26 | 27 | } 28 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/Diffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | /** 4 | * A Diffelt is an element of difference. 5 | * 6 | * An set of difference elements is used to describe a change. 7 | * The difference elements may or may not depend on each other. 8 | * Their relations can be represented as a graph. 9 | */ 10 | public interface Diffelt { 11 | } 12 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/DiffeltDependency.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | /** 4 | * A dependency between 2 diffelts. 5 | * 6 | * The "dependent" diffelt depends on the "dependency" diffelt. 7 | */ 8 | public class DiffeltDependency { 9 | 10 | public final Diffelt dependent; 11 | public final Diffelt dependency; 12 | 13 | public DiffeltDependency(Diffelt dependent, Diffelt dependency) { 14 | this.dependent = dependent; 15 | this.dependency = dependency; 16 | } 17 | 18 | } 19 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/MoveDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentLocation; 4 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 5 | import com.lemoulinstudio.sdiff.content.ContentElementData; 6 | 7 | /** 8 | * A diffelt representing the movement of a content element. 9 | */ 10 | public class MoveDiffelt implements Diffelt { 11 | 12 | /** 13 | * The content element which is moved. 14 | */ 15 | public ContentElementData data; 16 | 17 | /** 18 | * The location of the content element before being moved. 19 | */ 20 | public ContentLocation locationBefore; 21 | 22 | /** 23 | * The location of the content element after being moved. 24 | */ 25 | public ContentLocation locationAfter; 26 | 27 | /** 28 | * A reference to the content element before being moved. 29 | */ 30 | public ContentElementReference referenceBefore; 31 | 32 | /** 33 | * A reference to the content element after being moved. 34 | */ 35 | public ContentElementReference referenceAfter; 36 | 37 | } 38 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/RemoveDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentLocation; 4 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 5 | import com.lemoulinstudio.sdiff.content.ContentElementData; 6 | 7 | /** 8 | * A diffelt representing the removal of a content element. 9 | */ 10 | public class RemoveDiffelt implements Diffelt { 11 | 12 | /** 13 | * The content element which is removed. 14 | */ 15 | public ContentElementData data; 16 | 17 | /** 18 | * The location where the content element is removed from. 19 | */ 20 | public ContentLocation location; 21 | 22 | /** 23 | * The reference to the content element before being removed. 24 | */ 25 | public ContentElementReference reference; 26 | 27 | } 28 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/RenameDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 4 | import com.lemoulinstudio.sdiff.content.ContentElementData; 5 | 6 | /** 7 | * A diffelt representing the rename of a content element. 8 | */ 9 | public class RenameDiffelt implements Diffelt { 10 | 11 | /** 12 | * The content element which is moved. 13 | */ 14 | public ContentElementData data; 15 | 16 | /** 17 | * The reference to the content element before being renamed. 18 | */ 19 | public ContentElementReference referenceBefore; 20 | 21 | /** 22 | * The reference to the content element after being renamed. 23 | */ 24 | public ContentElementReference referenceAfter; 25 | 26 | } 27 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/diffelt/ReplaceDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentLocation; 4 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 5 | import com.lemoulinstudio.sdiff.content.ContentElementData; 6 | 7 | /** 8 | * A diffelt representing the replacement or modification of a content element. 9 | */ 10 | public class ReplaceDiffelt implements Diffelt { 11 | 12 | /** 13 | * The content element before being replaced. 14 | */ 15 | public ContentElementData dataBefore; 16 | 17 | /** 18 | * The content element after being replaced. 19 | */ 20 | public ContentElementData dataAfter; 21 | 22 | /** 23 | * The location of the content element. 24 | */ 25 | public ContentLocation location; 26 | 27 | /** 28 | * A reference to the content element. 29 | */ 30 | public ContentElementReference reference; 31 | 32 | } 33 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/content/JavaContentReference.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.content; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentReference; 4 | 5 | public class JavaContentReference implements ContentReference { 6 | public String classname; 7 | public String methodName; 8 | public String fieldName; 9 | public int arrayIndex; 10 | public int statementIndex; 11 | } 12 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/diffelt/CodeBlockReformulationDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentElementData; 4 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 5 | import com.lemoulinstudio.sdiff.content.ContentLocation; 6 | import com.lemoulinstudio.sdiff.diffelt.Diffelt; 7 | 8 | public class CodeBlockReformulationDiffelt implements Diffelt { 9 | 10 | /** 11 | * The content element before being reformulated. 12 | */ 13 | public ContentElementData dataBefore; 14 | 15 | /** 16 | * The content element after being reformulated. 17 | */ 18 | public ContentElementData dataAfter; 19 | 20 | /** 21 | * The location of the content element. 22 | */ 23 | public ContentLocation location; 24 | 25 | /** 26 | * A reference to the content element. 27 | */ 28 | public ContentElementReference reference; 29 | 30 | } 31 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/diffelt/LogicalExpressionReformulationDiffelt.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.diffelt; 2 | 3 | import com.lemoulinstudio.sdiff.content.ContentElementData; 4 | import com.lemoulinstudio.sdiff.content.ContentElementReference; 5 | import com.lemoulinstudio.sdiff.content.ContentLocation; 6 | import com.lemoulinstudio.sdiff.diffelt.Diffelt; 7 | 8 | public class LogicalExpressionReformulationDiffelt implements Diffelt { 9 | 10 | /** 11 | * The content element before being reformulated. 12 | */ 13 | public ContentElementData dataBefore; 14 | 15 | /** 16 | * The content element after being reformulated. 17 | */ 18 | public ContentElementData dataAfter; 19 | 20 | /** 21 | * The location of the content element. 22 | */ 23 | public ContentLocation location; 24 | 25 | /** 26 | * A reference to the content element. 27 | */ 28 | public ContentElementReference reference; 29 | 30 | } 31 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Class.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | import java.util.List; 4 | 5 | public class Class extends DeclaredType { 6 | 7 | boolean isStatic; 8 | boolean isFinal; 9 | boolean isAbstract; 10 | 11 | Class superClass; 12 | List interfaces; 13 | 14 | List fields; 15 | List constructor; 16 | List methods; 17 | 18 | public Class(String name) { 19 | super(name); 20 | } 21 | 22 | } 23 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Comment.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public abstract class Comment { 4 | 5 | } 6 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Constructor.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class Constructor extends FunctionDeclaration { 4 | 5 | } 6 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/DeclaredParameter.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class DeclaredParameter { 4 | 5 | FunctionDeclaration parent; 6 | Type type; 7 | String name; 8 | 9 | } 10 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/DeclaredType.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public abstract class DeclaredType extends Type { 4 | 5 | DeclaredType parent; 6 | Visibility visibility; 7 | 8 | public DeclaredType(String name) { 9 | super(name); 10 | } 11 | 12 | } 13 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Field.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class Field { 4 | 5 | Type type; 6 | String name; 7 | 8 | } 9 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/FunctionDeclaration.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | import java.util.List; 4 | 5 | public abstract class FunctionDeclaration { 6 | 7 | DeclaredType parent; 8 | 9 | boolean isFinal; 10 | Visibility visibility; 11 | 12 | List parameters; 13 | DeclaredParameter ellipsis; 14 | 15 | } 16 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Interface.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | import java.util.List; 4 | 5 | public class Interface extends DeclaredType { 6 | 7 | List superInterfaces; 8 | 9 | List fields; 10 | List constructor; 11 | List methods; 12 | 13 | public Interface(String name) { 14 | super(name); 15 | } 16 | 17 | } 18 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/JavadocComment.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class JavadocComment extends Comment { 4 | 5 | String text; 6 | 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Method.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class Method extends FunctionDeclaration { 4 | 5 | boolean isStatic; 6 | boolean isAbstract; 7 | 8 | String name; 9 | Type returnType; 10 | 11 | } 12 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/MultiLineComment.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class MultiLineComment extends Comment { 4 | 5 | String text; 6 | 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/PrimitiveType.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class PrimitiveType extends Type { 4 | 5 | public static final PrimitiveType VOID = new PrimitiveType("void"); 6 | public static final PrimitiveType BOOLEAN = new PrimitiveType("boolean"); 7 | public static final PrimitiveType CHAR = new PrimitiveType("char"); 8 | public static final PrimitiveType BYTE = new PrimitiveType("byte"); 9 | public static final PrimitiveType SHORT = new PrimitiveType("short"); 10 | public static final PrimitiveType INT = new PrimitiveType("int"); 11 | public static final PrimitiveType LONG = new PrimitiveType("long"); 12 | public static final PrimitiveType FLOAT = new PrimitiveType("float"); 13 | public static final PrimitiveType DOUBLE = new PrimitiveType("double"); 14 | 15 | public PrimitiveType(String name) { 16 | super(name); 17 | } 18 | 19 | } 20 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/SingleLineComment.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class SingleLineComment extends Comment { 4 | 5 | String text; 6 | 7 | } 8 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Type.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public class Type { 4 | 5 | public final String name; 6 | 7 | public Type(String name) { 8 | this.name = name; 9 | } 10 | 11 | } 12 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/java/tree/sem/Visibility.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.java.tree.sem; 2 | 3 | public enum Visibility { 4 | PUBLIC, 5 | PROTECTED, 6 | PRIVATE, 7 | PACKAGE; 8 | } 9 | -------------------------------------------------------------------------------- /src/main/java/com/lemoulinstudio/sdiff/repo/Repository.java: -------------------------------------------------------------------------------- 1 | package com.lemoulinstudio.sdiff.repo; 2 | 3 | import java.io.File; 4 | 5 | /** 6 | * A repository where some content is stored. 7 | */ 8 | public class Repository { 9 | 10 | // A few predefined types of repository. 11 | public static final String GIT_TYPE = "git"; 12 | public static final String MERCURIAL_TYPE = "hg"; 13 | public static final String SVN_TYPE = "svn"; 14 | public static final String CVS_TYPE = "cvs"; 15 | 16 | /** 17 | * The type of repository. 18 | */ 19 | public String type; 20 | 21 | /** 22 | * The base directory of this repository, if it exists. 23 | */ 24 | public File baseDirectory; 25 | 26 | /** 27 | * The name of this repository, if it exists. 28 | */ 29 | public String name; 30 | 31 | /** 32 | * The identifier of this repository, if it exists. 33 | */ 34 | public String identifier; 35 | 36 | } 37 | -------------------------------------------------------------------------------- /src/main/resources/Foobar.java: -------------------------------------------------------------------------------- 1 | package data; 2 | 3 | /** 4 | * This is a Javadoc comment. 5 | * 6 | * @author Rohtua 7 | */ 8 | public class Foobar { 9 | 10 | // Single line comment. 11 | public int method01() { 12 | return 2 + 7; 13 | } 14 | 15 | } 16 | -------------------------------------------------------------------------------- /src/main/resources/Foobar2.java: -------------------------------------------------------------------------------- 1 | package data; 2 | 3 | /** 4 | * This is a Javadoc comment. 5 | * 6 | * @author Rohtua 7 | */ 8 | public class Foobar { 9 | 10 | // Single line comment. 11 | public int 12 | method01() { 13 | return 2 + 14 | 7; 15 | } 16 | 17 | } 18 | --------------------------------------------------------------------------------