Skip to content

Procedurally generate Arrays.sol #4859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ernestognw merged 14 commits into from
Mar 27, 2024
Merged

Procedurally generate Arrays.sol #4859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1fc91f1
Generate array.sol
RenanSouza2 Jan 28, 2024
414545a
include tests
RenanSouza2 Jan 28, 2024
8ddaa94
Refactor testd
RenanSouza2 Jan 28, 2024
8b60a5c
refactor fixture
RenanSouza2 Jan 28, 2024
b06b970
rename file
RenanSouza2 Jan 29, 2024
0bd6b7f
remove .only
RenanSouza2 Jan 29, 2024
4eeacc6
Merge master
ernestognw Mar 26, 2024
a9b199a
Merge branch 'master' into generate-arrays
ernestognw Mar 26, 2024
e826f70
Generate missing functions and simplify tests
ernestognw Mar 26, 2024
67aec22
Split sort helpers
ernestognw Mar 26, 2024
e9915db
Remove unnecessary casting
ernestognw Mar 26, 2024
0d65264
Remove unnecessary mocked function
ernestognw Mar 26, 2024
d16a0ed
update template to minimize generated code changes
Amxx Mar 26, 2024
c6c3bb9
reorder generated code
Amxx Mar 26, 2024
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
Prev Previous commit
reorder generated code
  • Loading branch information
@Amxx
Amxx committed Mar 26, 2024
commit c6c3bb950cb2d851efeb10fbddfa2ba5d3c0c7b9
12 changes: 6 additions & 6 deletions contracts/utils/Arrays.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,17 @@ library Arrays {
}
}

/// @dev Helper: low level cast address comp function to bytes32 comp function
function _castToBytes32Comp(
function(address, address) pure returns (bool) input
) private pure returns (function(bytes32, bytes32) pure returns (bool) output) {
/// @dev Helper: low level cast uint256 memory array to uint256 memory array
function _castToBytes32Array(uint256[] memory input) private pure returns (bytes32[] memory output) {
assembly {
output := input
}
}

/// @dev Helper: low level cast uint256 memory array to uint256 memory array
function _castToBytes32Array(uint256[] memory input) private pure returns (bytes32[] memory output) {
/// @dev Helper: low level cast address comp function to bytes32 comp function
function _castToBytes32Comp(
function(address, address) pure returns (bool) input
) private pure returns (function(bytes32, bytes32) pure returns (bool) output) {
assembly {
output := input
}
Expand Down
7 changes: 5 additions & 2 deletions scripts/generate/templates/Arrays.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,16 @@ const defaultComparator = `
}
`;

const casting = type => `\
const castArray = type => `\
/// @dev Helper: low level cast ${type} memory array to uint256 memory array
function _castToBytes32Array(${type}[] memory input) private pure returns (bytes32[] memory output) {
assembly {
output := input
}
}
`;

const castComparator = type => `\
/// @dev Helper: low level cast ${type} comp function to bytes32 comp function
function _castToBytes32Comp(
function(${type}, ${type}) pure returns (bool) input
Expand Down Expand Up @@ -372,7 +374,8 @@ module.exports = format(
TYPES.filter(type => type !== 'bytes32').map(sort),
quickSort,
defaultComparator,
TYPES.filter(type => type !== 'bytes32').map(casting),
TYPES.filter(type => type !== 'bytes32').map(castArray),
TYPES.filter(type => type !== 'bytes32').map(castComparator),
// lookup
search,
// unsafe (direct) storage and memory access
Expand Down