Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to Marc Bernard Tools
# Contributing to apm

Marc Bernard Tools welcomes your suggestions and contributions! Before opening your first issue or pull request, please review our [Code of Conduct](https://github.com/Marc-Bernard-Tools/.github/blob/main/CODE_OF_CONDUCT.md) to understand how our community interacts in an inclusive and respectful manner.
apm welcomes your suggestions and contributions! Before opening your first issue or pull request, please review our [Code of Conduct](CODE_OF_CONDUCT.md) to understand how our community interacts in an inclusive and respectful manner.

## General Advice

Expand All @@ -12,7 +12,7 @@ Marc Bernard Tools welcomes your suggestions and contributions! Before opening y

* Commit often, whenever something is working, and is a step in the right direction do a commit or PR. This way other contributors can see the changes, and it will minimize the risk of merge conflicts.

* If you don't have the time or knowledge to fix the problem yourself, you can still make it move along faster by providing an accurate description or a repo which reproduces the issue.
* If you don't have the time or knowledge to fix the problem yourself, you can still make it move along faster by providing an accurate description or a repo that reproduces the issue.

## Bug Reports

Expand All @@ -32,7 +32,7 @@ A good bug report should not leave others needing to chase you up for more infor

### Compatibility

Marc Bernard Tools are targeted for SAP Basis 7.31 and higher, so the code should only contain expressions and statements that works on 7.31. abaplint will automatically check every pull request for language syntax that is not available on these releases.
apm is targeted for SAP Basis 7.40 and higher, so the code should only contain expressions and statements that work on 7.40. abaplint will automatically check every pull request for language syntax that is not available on these releases.

### Linting

Expand All @@ -48,10 +48,10 @@ Variables are prefixed using the standard setting in [abapOpenChecks](http://doc

### Internationalization (I18N)

Currently, Marc Bernard Tools support only English language. Neither objects nor text literals are translated. Therefore, all objects shall be set to English as the original language. Text literals in the code shall be maintained in English.
Currently, apm supports only the English language. Neither objects nor text literals are translated. Therefore, all objects shall be set to English as the original language. Text literals in the code shall be maintained in English.

## Contribution Licensing

Most of our code is distributed under the terms of the [license](LICENSE), and when you contribute code that you wrote to our repositories, you agree that you are contributing under those same terms. In addition, by submitting your contributions you are indicating that you have the right to submit those contributions under those terms.

If you wish to contribute code or documentation *authored by others*, or using the terms of any other license, please indicate that clearly in your pull request so that the project team can discuss the situation with you.
If you wish to contribute code or documentation *authored by others* or use the terms of any other license, please indicate that clearly in your pull request so that the project team can discuss the situation with you.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright 2022 apm.to Inc. <https://apm.to>
Copyright 2024 apm.to Inc. <https://apm.to>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 0 additions & 2 deletions LICENSES/MIT.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
The MIT License (MIT)

Copyright (c) 2022 Marc Bernard <https://marcbernardtools.com/>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ Made with ❤ in Canada

Copyright 2025 apm.to Inc. <https://apm.to>

Follow [@marcf.be](https://bsky.app/profile/marcf.be) on Blueksy and [@marcfbe](https://linkedin.com/in/marcfbe) or LinkedIn
Follow [@marcf.be](https://bsky.app/profile/marcf.be) on Bluesky and [@marcfbe](https://linkedin.com/in/marcfbe) or LinkedIn

2 changes: 1 addition & 1 deletion package.abap.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "diff3",
"version": "1.0.0",
"version": "1.1.1",
"description": "Highlight the difference two or three string-tables (diff3)",
"type": "module",
"keywords": [
Expand Down
6 changes: 2 additions & 4 deletions src/zcl_diff3.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,16 @@ CLASS zcl_diff3 DEFINITION
************************************************************************
* ABAP Diff3
*
* https://github.com/Marc-Bernard-Tools/ABAP-Diff3
*
* This is a port of JavaScript (https://github.com/bhousel/node-diff3, MIT license)
* https://github.com/bhousel/node-diff3/blob/main/index.mjs as of 2021-09-24
*
* Copyright 2022 Marc Bernard <https://marcbernardtools.com/>
* Copyright 2024 apm.to Inc. <https://apm.to>
* SPDX-License-Identifier: MIT
************************************************************************

PUBLIC SECTION.

CONSTANTS c_version TYPE string VALUE '1.1.0' ##NEEDED.
CONSTANTS c_version TYPE string VALUE '1.1.1' ##NEEDED.

INTERFACES zif_diff3.

Expand Down
25 changes: 8 additions & 17 deletions src/zif_diff3.intf.abap
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ INTERFACE zif_diff3 PUBLIC.
************************************************************************
* ABAP Diff3 Interface
*
* https://github.com/Marc-Bernard-Tools/ABAP-Diff3
*
* This is a port of JavaScript (https://github.com/bhousel/node-diff3, MIT license)
* https://github.com/bhousel/node-diff3/blob/main/index.d.ts as of 2021-05-04
*
* Copyright 2022 Marc Bernard <https://marcbernardtools.com/>
* Copyright 2024 apm.to Inc. <https://apm.to>
* SPDX-License-Identifier: MIT
************************************************************************

TYPES ty_number TYPE i.

TYPES:
ty_numbers TYPE STANDARD TABLE OF ty_number WITH EMPTY KEY.
TYPES ty_numbers TYPE STANDARD TABLE OF ty_number WITH EMPTY KEY.

TYPES:
BEGIN OF ty_number_number,
Expand All @@ -30,8 +27,7 @@ INTERFACE zif_diff3 PUBLIC.
buffer1index TYPE ty_number,
buffer2index TYPE ty_number,
chain TYPE i, " ref to ilcsresult-key
END OF ty_lcs_result.
TYPES:
END OF ty_lcs_result,
ty_lcs_result_t TYPE SORTED TABLE OF ty_lcs_result WITH UNIQUE KEY key.

TYPES:
Expand All @@ -41,8 +37,7 @@ INTERFACE zif_diff3 PUBLIC.
buffer1 TYPE string_table,
buffer2 TYPE string_table,
END OF diff,
END OF ty_comm_result.
TYPES:
END OF ty_comm_result,
ty_comm_result_t TYPE STANDARD TABLE OF ty_comm_result WITH DEFAULT KEY.

TYPES:
Expand All @@ -51,8 +46,7 @@ INTERFACE zif_diff3 PUBLIC.
buffer1content TYPE string_table,
buffer2 TYPE ty_number_number,
buffer2content TYPE string_table,
END OF ty_diff_indices_result.
TYPES:
END OF ty_diff_indices_result,
ty_diff_indices_result_t TYPE STANDARD TABLE OF ty_diff_indices_result WITH DEFAULT KEY.

TYPES:
Expand All @@ -66,8 +60,7 @@ INTERFACE zif_diff3 PUBLIC.
BEGIN OF ty_patch_result,
buffer1 TYPE ty_chunk,
buffer2 TYPE ty_chunk,
END OF ty_patch_result.
TYPES:
END OF ty_patch_result,
ty_patch_result_t TYPE STANDARD TABLE OF ty_patch_result WITH DEFAULT KEY.

TYPES:
Expand Down Expand Up @@ -95,8 +88,7 @@ INTERFACE zif_diff3 PUBLIC.
stable TYPE abap_bool,
stable_region TYPE ty_stable_region,
unstable_region TYPE ty_unstable_region,
END OF ty_region.
TYPES:
END OF ty_region,
ty_region_t TYPE STANDARD TABLE OF ty_region WITH DEFAULT KEY.

TYPES:
Expand All @@ -110,8 +102,7 @@ INTERFACE zif_diff3 PUBLIC.
b TYPE string_table,
b_index TYPE ty_number,
END OF conflict,
END OF ty_merge_region.
TYPES:
END OF ty_merge_region,
ty_merge_region_t TYPE STANDARD TABLE OF ty_merge_region WITH DEFAULT KEY.

TYPES:
Expand Down