cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of carriage return.

Browse Source
This commit is contained in:
chriseth 2021-03-09 11:34:01 +01:00
parent 1d95f95635
commit eb85a4414c
7 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -7,6 +7,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* Error Reporter: Fix handling of carriage return.
* SMTChecker: Fix internal error on ``FixedBytes`` constant initialized with string literal. * SMTChecker: Fix internal error on ``FixedBytes`` constant initialized with string literal.
* SMTChecker: Fix internal error on calling public getter on a state variable of type array (possibly nested) of structs. * SMTChecker: Fix internal error on calling public getter on a state variable of type array (possibly nested) of structs.
* SMTChecker: Fix internal error on pushing to ``string`` casted to ``bytes``. * SMTChecker: Fix internal error on pushing to ``string`` casted to ``bytes``.

7
liblangutil/SourceReferenceExtractor.cpp
View File

@ -19,6 +19,7 @@
#include <liblangutil/CharStream.h> #include <liblangutil/CharStream.h>
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
#include <algorithm>
#include <cmath> #include <cmath>
#include <iomanip> #include <iomanip>
@ -87,7 +88,7 @@ SourceReference SourceReferenceExtractor::extract(SourceLocation const* _locatio
line = line.substr( line = line.substr(
static_cast<size_t>(max(0, start.column - 35)), static_cast<size_t>(max(0, start.column - 35)),
static_cast<size_t>(min(start.column, 35)) + static_cast<size_t>( static_cast<size_t>(min(start.column, 35)) + static_cast<size_t>(
min(locationLength + 35,len - start.column) min(locationLength + 35, len - start.column)
) )
); );
if (start.column + locationLength + 35 < len) if (start.column + locationLength + 35 < len)
@ -106,7 +107,7 @@ SourceReference SourceReferenceExtractor::extract(SourceLocation const* _locatio
interest, interest,
isMultiline, isMultiline,
line, line,
start.column, min(start.column, static_cast<int>(line.length())),
end.column, min(end.column, static_cast<int>(line.length()))
}; };
} }

2
scripts/check_style.sh
View File

@ -6,6 +6,8 @@ ERROR_LOG="$(mktemp -t check_style_XXXXXX.log)"
EXCLUDE_FILES=( EXCLUDE_FILES=(
"libsolutil/picosha2.h" "libsolutil/picosha2.h"
"test/cmdlineTests/strict_asm_only_cr/input.yul"
"test/cmdlineTests/strict_asm_only_cr/err"
"test/libsolutil/UTF8.cpp" "test/libsolutil/UTF8.cpp"
"test/libsolidity/syntaxTests/license/license_cr_endings.sol" "test/libsolidity/syntaxTests/license/license_cr_endings.sol"
"test/libsolidity/syntaxTests/license/license_crlf_endings.sol" "test/libsolidity/syntaxTests/license/license_crlf_endings.sol"

1
test/cmdlineTests/strict_asm_only_cr/args Normal file
View File

@ -0,0 +1 @@
--strict-assembly

6
test/cmdlineTests/strict_asm_only_cr/err Normal file
View File

@ -0,0 +1,6 @@
Warning: Yul is still experimental. Please use the output with care.
Error: Expected keyword "object".
--> strict_asm_only_cr/input.yul:1:2:
|
1 |
| ^

1
test/cmdlineTests/strict_asm_only_cr/exit Normal file
View File

@ -0,0 +1 @@
1

1
test/cmdlineTests/strict_asm_only_cr/input.yul Normal file
View File

@ -0,0 +1 @@