Skip to content

Commit

Permalink
Don't assume that file names do not contain colons when translating c…
Browse files Browse the repository at this point in the history
…ompiler output from 0.4.10
  • Loading branch information
cameel committed Oct 12, 2021
1 parent 8920105 commit 8edc46c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
26 changes: 26 additions & 0 deletions test/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,31 @@ function runTests (solc, versionText) {
}
st.end();
});

t.test('compiling standard JSON (file names containing symbols)', function (st) {
var input = {
'language': 'Solidity',
'settings': {
'outputSelection': {
'*': {
'*': ['evm.bytecode']
}
}
},
'sources': {
'!@#$%^&*()_+-=[]{}\\|"\';:~`<>,.?/': {
'content': 'contract C {}'
}
}
};

var output = JSON.parse(solc.compile(JSON.stringify(input)));
st.ok(expectNoError(output));
var C = getBytecodeStandard(output, '!@#$%^&*()_+-=[]{}\\|"\';:~`<>,.?/', 'C');
st.ok(typeof C === 'string');
st.ok(C.length > 0);
st.end();
});
});
});

Expand Down Expand Up @@ -810,6 +835,7 @@ if (!noRemoteVersions) {
'v0.2.1+commit.91a6b35',
'v0.3.6+commit.3fc68da',
'v0.4.0+commit.acd334c9',
'v0.4.10+commit.f0d539ae',
'v0.4.11+commit.68ef5810',
'v0.4.12+commit.194ff033',
'v0.4.26+commit.4563c3fc'
Expand Down
2 changes: 1 addition & 1 deletion translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function translateJsonCompilerOutput (output, libraries) {
ret['contracts'] = {};
for (var contract in output['contracts']) {
// Split name first, can be `contract`, `:contract` or `filename:contract`
var tmp = contract.match(/^(([^:]*):)?([^:]+)$/);
var tmp = contract.match(/^((.*):)?([^:]+)$/);
if (tmp.length !== 4) {
// Force abort
return null;
Expand Down

0 comments on commit 8edc46c

Please sign in to comment.