Merge remote-tracking branch 'origin/develop' into develop_060

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

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 <https://www.kingoftheether.com/>`_.
 
-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.
 
 ::
 

test/libsolidity/ASTJSON/enum_value.sol

@@ -1 +1,3 @@
 contract C { enum E { A, B } }
+
+// ----

test/libsolidity/ASTJSON/event_definition.sol

@@ -1 +1,3 @@
 contract C { event E(); }
+
+// ----

test/libsolidity/ASTJSON/placeholder_statement.sol

@@ -1 +1,3 @@
 contract C { modifier M { _; } }
+
+// ----

test/libsolidity/ASTJSON/smoke.sol

@@ -1 +1,3 @@
 contract C {}
+
+// ----

test/libsolidity/ASTJSON/using_for_directive.sol

@@ -1 +1,3 @@
 library L {} contract C { using L for uint; }
+
+// ----