aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRJ Catalano <rcatalano@macsales.com>2016-03-12 05:27:56 +0800
committerVoR0220 <catalanor0220@gmail.com>2016-05-10 00:41:02 +0800
commitdff1a26f55adc54ccfddfa9d2e87f1dab719d8ca (patch)
tree03a08ff1e10f104cffe653dc4cd86a083de6f9c2
parent6fa5e0fac93e9eb584daa2c7b637ca37dabc0356 (diff)
downloaddexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.tar
dexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.tar.gz
dexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.tar.bz2
dexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.tar.lz
dexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.tar.xz
dexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.tar.zst
dexon-solidity-dff1a26f55adc54ccfddfa9d2e87f1dab719d8ca.zip
fix for token bug, also quick fix for the wei and seconds
-rw-r--r--libsolidity/parsing/Token.cpp2
-rw-r--r--test/libsolidity/SolidityNameAndTypeResolution.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/parsing/Token.cpp b/libsolidity/parsing/Token.cpp
index ef817d5d..d3786524 100644
--- a/libsolidity/parsing/Token.cpp
+++ b/libsolidity/parsing/Token.cpp
@@ -153,7 +153,7 @@ tuple<Token::Value, unsigned int, unsigned int> Token::fromIdentifierOrKeyword(s
positionM < positionX &&
positionX < _literal.end() &&
*positionX == 'x' &&
- all_of(positionX + 1, _literal.end(), ::isdigit)
+ all_of(positionX++, _literal.end(), ::isdigit)
) {
int n = parseSize(positionX + 1, _literal.end());
if (
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index c078dc10..9ead3dcd 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -3617,7 +3617,7 @@ BOOST_AUTO_TEST_CASE(fixed_type_literal_seconds_and_wei)
}
}
)";
- BOOST_CHECK(success(text));
+ BOOST_CHECK(!success(text));
}
BOOST_AUTO_TEST_CASE(array_declaration_with_fixed_literal)