From 390e2e8634f350b3515aeebb33116c0e4172332b Mon Sep 17 00:00:00 2001
From: Christian <c@ethdev.com>
Date: Thu, 27 Nov 2014 18:24:59 +0100
Subject: [PATCH] Minor changes to magic variables.

gas moves to "msg", ripemd160 returns hash160.
---
 libsolidity/GlobalContext.cpp | 2 +-
 libsolidity/Types.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/GlobalContext.cpp b/libsolidity/GlobalContext.cpp
index e958352fd..d8b637076 100644
--- a/libsolidity/GlobalContext.cpp
+++ b/libsolidity/GlobalContext.cpp
@@ -58,7 +58,7 @@ GlobalContext::GlobalContext():
 													  FunctionType::Location::ECRECOVER)),
 					 make_shared<MagicVariableDeclaration>("ripemd160",
 							make_shared<FunctionType>(TypePointers({std::make_shared<IntegerType>(256, IntegerType::Modifier::HASH)}),
-													  TypePointers({std::make_shared<IntegerType>(256, IntegerType::Modifier::HASH)}),
+													  TypePointers({std::make_shared<IntegerType>(160, IntegerType::Modifier::HASH)}),
 													  FunctionType::Location::RIPEMD160))}
 {
 }
diff --git a/libsolidity/Types.cpp b/libsolidity/Types.cpp
index 4ab53bf86..b81fbbe31 100644
--- a/libsolidity/Types.cpp
+++ b/libsolidity/Types.cpp
@@ -397,11 +397,11 @@ MagicType::MagicType(MagicType::Kind _kind):
 		break;
 	case Kind::MSG:
 		m_members = MemberList({{"sender", make_shared<IntegerType const>(0, IntegerType::Modifier::ADDRESS)},
+								{"gas", make_shared<IntegerType const>(256)},
 								{"value", make_shared<IntegerType const>(256)}});
 		break;
 	case Kind::TX:
 		m_members = MemberList({{"origin", make_shared<IntegerType const>(0, IntegerType::Modifier::ADDRESS)},
-								{"gas", make_shared<IntegerType const>(256)},
 								{"gasprice", make_shared<IntegerType const>(256)}});
 		break;
 	default: