diff options
author | Jacob Evans <dekz@dekz.net> | 2018-07-06 14:29:56 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-06 14:29:56 +0800 |
commit | 03b3d74748a6328ac9637ca4e176a316ca347704 (patch) | |
tree | e7d98700e0a5b957048f50c5b5d2c5dfba5216a1 /packages/sol-compiler | |
parent | d975c0cef34d126ce30202610671a6f8dca6b6c0 (diff) | |
parent | 0557d6a9bfc07b8d360970ffbcf582f8a26943cb (diff) | |
download | dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.gz dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.bz2 dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.lz dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.xz dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.tar.zst dexon-sol-tools-03b3d74748a6328ac9637ca4e176a316ca347704.zip |
Merge pull request #522 from 0xProject/feature/contracts/forwarder
Forwarding contract
Diffstat (limited to 'packages/sol-compiler')
-rw-r--r-- | packages/sol-compiler/src/utils/compiler.ts | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts index 08e2d999a..968fcc5b2 100644 --- a/packages/sol-compiler/src/utils/compiler.ts +++ b/packages/sol-compiler/src/utils/compiler.ts @@ -58,7 +58,8 @@ export function parseSolidityVersionRange(source: string): string { } /** - * Normalizes the path found in the error message. + * Normalizes the path found in the error message. If it cannot be normalized + * the original error message is returned. * Example: converts 'base/Token.sol:6:46: Warning: Unused local variable' * to 'Token.sol:6:46: Warning: Unused local variable' * This is used to prevent logging the same error multiple times. @@ -69,7 +70,9 @@ export function getNormalizedErrMsg(errMsg: string): string { const SOLIDITY_FILE_EXTENSION_REGEX = /(.*\.sol)/; const errPathMatch = errMsg.match(SOLIDITY_FILE_EXTENSION_REGEX); if (_.isNull(errPathMatch)) { - throw new Error(`Could not find a path in error message: ${errMsg}`); + // This can occur if solidity outputs a general warning, e.g + // Warning: This is a pre-release compiler version, please do not use it in production. + return errMsg; } const errPath = errPathMatch[0]; const baseContract = path.basename(errPath); |