diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index 7ffb45964..74a2e55f9 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -23,6 +23,9 @@ endif() eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough) +# Prevent the path of the source directory from ending up in the binary via __FILE__ macros. +eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=/solidity") + if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")) # Enables all the warnings about constructions that some users consider questionable, # and that are easy to avoid. Also enable some extra warning flags that are not diff --git a/docs/common-patterns.rst b/docs/common-patterns.rst index 494f22dd4..ed87666d9 100644 --- a/docs/common-patterns.rst +++ b/docs/common-patterns.rst @@ -22,9 +22,8 @@ a contract where the goal is to send the most money to the contract in order to become the "richest", inspired by `King of the Ether `_. -In the following contract, if you are usurped as the richest, -you will receive the funds of the person who has gone on to -become the new richest. +In the following contract, if you are no longer the richest, +you receive the funds of the person who is now the richest. :: diff --git a/test/libsolidity/ASTJSON/enum_value.sol b/test/libsolidity/ASTJSON/enum_value.sol index ef0875fbe..37e450f22 100644 --- a/test/libsolidity/ASTJSON/enum_value.sol +++ b/test/libsolidity/ASTJSON/enum_value.sol @@ -1 +1,3 @@ contract C { enum E { A, B } } + +// ---- diff --git a/test/libsolidity/ASTJSON/event_definition.sol b/test/libsolidity/ASTJSON/event_definition.sol index 81b43c672..9fa7eaeb5 100644 --- a/test/libsolidity/ASTJSON/event_definition.sol +++ b/test/libsolidity/ASTJSON/event_definition.sol @@ -1 +1,3 @@ contract C { event E(); } + +// ---- diff --git a/test/libsolidity/ASTJSON/placeholder_statement.sol b/test/libsolidity/ASTJSON/placeholder_statement.sol index cb2c0990d..22a719fa4 100644 --- a/test/libsolidity/ASTJSON/placeholder_statement.sol +++ b/test/libsolidity/ASTJSON/placeholder_statement.sol @@ -1 +1,3 @@ contract C { modifier M { _; } } + +// ---- diff --git a/test/libsolidity/ASTJSON/smoke.sol b/test/libsolidity/ASTJSON/smoke.sol index 2dde0d209..3796bf807 100644 --- a/test/libsolidity/ASTJSON/smoke.sol +++ b/test/libsolidity/ASTJSON/smoke.sol @@ -1 +1,3 @@ contract C {} + +// ---- diff --git a/test/libsolidity/ASTJSON/using_for_directive.sol b/test/libsolidity/ASTJSON/using_for_directive.sol index a882ad887..be6e5288f 100644 --- a/test/libsolidity/ASTJSON/using_for_directive.sol +++ b/test/libsolidity/ASTJSON/using_for_directive.sol @@ -1 +1,3 @@ library L {} contract C { using L for uint; } + +// ----