Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	mix/res.qrc

libevmcore/CommonSubexpressionEliminator.cpp

@@ -24,7 +24,7 @@
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libevmcore/CommonSubexpressionEliminator.h>
-#include <libevmcore/Assembly.h>
+#include <libevmcore/AssemblyItem.h>
 
 using namespace std;
 using namespace dev;
@@ -248,79 +248,6 @@ ExpressionClasses::Id CommonSubexpressionEliminator::loadFromMemory(ExpressionCl
 		return m_memoryContent[_slot] = m_expressionClasses.find(Instruction::MLOAD, {_slot}, true, m_sequenceNumber);
 }
 
-bool SemanticInformation::breaksBasicBlock(AssemblyItem const& _item)
-{
-	switch (_item.type())
-	{
-	default:
-	case UndefinedItem:
-	case Tag:
-		return true;
-	case Push:
-	case PushString:
-	case PushTag:
-	case PushSub:
-	case PushSubSize:
-	case PushProgramSize:
-	case PushData:
-		return false;
-	case Operation:
-	{
-		if (isSwapInstruction(_item) || isDupInstruction(_item))
-			return false;
-		if (_item.instruction() == Instruction::GAS || _item.instruction() == Instruction::PC)
-			return true; // GAS and PC assume a specific order of opcodes
-		if (_item.instruction() == Instruction::MSIZE)
-			return true; // msize is modified already by memory access, avoid that for now
-		if (_item.instruction() == Instruction::SHA3)
-			return true; //@todo: we have to compare sha3's not based on their memory addresses but on the memory content.
-		InstructionInfo info = instructionInfo(_item.instruction());
-		if (_item.instruction() == Instruction::SSTORE)
-			return false;
-		if (_item.instruction() == Instruction::MSTORE)
-			return false;
-		//@todo: We do not handle the following memory instructions for now:
-		// calldatacopy, codecopy, extcodecopy, mstore8,
-		// msize (note that msize also depends on memory read access)
-
-		// the second requirement will be lifted once it is implemented
-		return info.sideEffects || info.args > 2;
-	}
-	}
-}
-
-bool SemanticInformation::isCommutativeOperation(AssemblyItem const& _item)
-{
-	if (_item.type() != Operation)
-		return false;
-	switch (_item.instruction())
-	{
-	case Instruction::ADD:
-	case Instruction::MUL:
-	case Instruction::EQ:
-	case Instruction::AND:
-	case Instruction::OR:
-	case Instruction::XOR:
-		return true;
-	default:
-		return false;
-	}
-}
-
-bool SemanticInformation::isDupInstruction(AssemblyItem const& _item)
-{
-	if (_item.type() != Operation)
-		return false;
-	return Instruction::DUP1 <= _item.instruction() && _item.instruction() <= Instruction::DUP16;
-}
-
-bool SemanticInformation::isSwapInstruction(AssemblyItem const& _item)
-{
-	if (_item.type() != Operation)
-		return false;
-	return Instruction::SWAP1 <= _item.instruction() && _item.instruction() <= Instruction::SWAP16;
-}
-
 CSECodeGenerator::CSECodeGenerator(
 	ExpressionClasses& _expressionClasses,
 	vector<CSECodeGenerator::StoreOperation> const& _storeOperations

libevmcore/CommonSubexpressionEliminator.h

@@ -31,6 +31,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Exceptions.h>
 #include <libevmcore/ExpressionClasses.h>
+#include <libevmcore/SemanticInformation.h>
 
 namespace dev
 {
@@ -139,20 +140,6 @@ private:
 	AssemblyItem const* m_breakingItem = nullptr;
 };
 
-/**
- * Helper functions to provide context-independent information about assembly items.
- */
-struct SemanticInformation
-{
-	/// @returns true if the given items starts a new basic block
-	static bool breaksBasicBlock(AssemblyItem const& _item);
-	/// @returns true if the item is a two-argument operation whose value does not depend on the
-	/// order of its arguments.
-	static bool isCommutativeOperation(AssemblyItem const& _item);
-	static bool isDupInstruction(AssemblyItem const& _item);
-	static bool isSwapInstruction(AssemblyItem const& _item);
-};
-
 /**
  * Unit that generates code from current stack layout, target stack layout and information about
  * the equivalence classes.
@@ -230,7 +217,7 @@ _AssemblyItemIterator CommonSubexpressionEliminator::feedItems(
 	_AssemblyItemIterator _end
 )
 {
-	for (; _iterator != _end && !SemanticInformation::breaksBasicBlock(*_iterator); ++_iterator)
+	for (; _iterator != _end && !SemanticInformation::breaksCSEAnalysisBlock(*_iterator); ++_iterator)
 		feedItem(*_iterator);
 	if (_iterator != _end)
 		m_breakingItem = &(*_iterator++);

libevmcore/SemanticInformation.cpp

@@ -0,0 +1,107 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @file SemanticInformation.cpp
+ * @author Christian <c@ethdev.com>
+ * @date 2015
+ * Helper to provide semantic information about assembly items.
+ */
+
+#include <libevmcore/SemanticInformation.h>
+#include <libevmcore/AssemblyItem.h>
+
+using namespace std;
+using namespace dev;
+using namespace dev::eth;
+
+bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item)
+{
+	switch (_item.type())
+	{
+	default:
+	case UndefinedItem:
+	case Tag:
+		return true;
+	case Push:
+	case PushString:
+	case PushTag:
+	case PushSub:
+	case PushSubSize:
+	case PushProgramSize:
+	case PushData:
+		return false;
+	case Operation:
+	{
+		if (isSwapInstruction(_item) || isDupInstruction(_item))
+			return false;
+		if (_item.instruction() == Instruction::GAS || _item.instruction() == Instruction::PC)
+			return true; // GAS and PC assume a specific order of opcodes
+		if (_item.instruction() == Instruction::MSIZE)
+			return true; // msize is modified already by memory access, avoid that for now
+		if (_item.instruction() == Instruction::SHA3)
+			return true; //@todo: we have to compare sha3's not based on their memory addresses but on the memory content.
+		InstructionInfo info = instructionInfo(_item.instruction());
+		if (_item.instruction() == Instruction::SSTORE)
+			return false;
+		if (_item.instruction() == Instruction::MSTORE)
+			return false;
+		//@todo: We do not handle the following memory instructions for now:
+		// calldatacopy, codecopy, extcodecopy, mstore8,
+		// msize (note that msize also depends on memory read access)
+
+		// the second requirement will be lifted once it is implemented
+		return info.sideEffects || info.args > 2;
+	}
+	}
+}
+
+bool SemanticInformation::isCommutativeOperation(AssemblyItem const& _item)
+{
+	if (_item.type() != Operation)
+		return false;
+	switch (_item.instruction())
+	{
+	case Instruction::ADD:
+	case Instruction::MUL:
+	case Instruction::EQ:
+	case Instruction::AND:
+	case Instruction::OR:
+	case Instruction::XOR:
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool SemanticInformation::isDupInstruction(AssemblyItem const& _item)
+{
+	if (_item.type() != Operation)
+		return false;
+	return Instruction::DUP1 <= _item.instruction() && _item.instruction() <= Instruction::DUP16;
+}
+
+bool SemanticInformation::isSwapInstruction(AssemblyItem const& _item)
+{
+	if (_item.type() != Operation)
+		return false;
+	return Instruction::SWAP1 <= _item.instruction() && _item.instruction() <= Instruction::SWAP16;
+}
+
+bool SemanticInformation::isJumpInstruction(AssemblyItem const& _item)
+{
+	return _item == AssemblyItem(Instruction::JUMP) || _item == AssemblyItem(Instruction::JUMPI);
+}

libevmcore/SemanticInformation.h

@@ -0,0 +1,50 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @file SemanticInformation.h
+ * @author Christian <c@ethdev.com>
+ * @date 2015
+ * Helper to provide semantic information about assembly items.
+ */
+
+#pragma once
+
+
+namespace dev
+{
+namespace eth
+{
+
+class AssemblyItem;
+
+/**
+ * Helper functions to provide context-independent information about assembly items.
+ */
+struct SemanticInformation
+{
+	/// @returns true if the given items starts a new block for common subexpression analysis.
+	static bool breaksCSEAnalysisBlock(AssemblyItem const& _item);
+	/// @returns true if the item is a two-argument operation whose value does not depend on the
+	/// order of its arguments.
+	static bool isCommutativeOperation(AssemblyItem const& _item);
+	static bool isDupInstruction(AssemblyItem const& _item);
+	static bool isSwapInstruction(AssemblyItem const& _item);
+	static bool isJumpInstruction(AssemblyItem const& _item);
+};
+
+}
+}

libsolidity/AST.cpp

@@ -337,8 +337,14 @@ void FunctionDefinition::checkTypeRequirements()
 	{
 		if (!var->getType()->canLiveOutsideStorage())
 			BOOST_THROW_EXCEPTION(var->createTypeError("Type is required to live outside storage."));
-		if (!(var->getType()->externalType()) && getVisibility() >= Visibility::Public)
-			BOOST_THROW_EXCEPTION(var->createTypeError("Internal type is not allowed for function with external visibility"));
+		if (getVisibility() >= Visibility::Public && !(var->getType()->externalType()))
+		{
+			// todo delete when will be implemented arrays as parameter type in internal functions
+			if (getVisibility() == Visibility::Public && var->getType()->getCategory() == Type::Category::Array)
+				BOOST_THROW_EXCEPTION(var->createTypeError("Arrays only implemented for external functions."));
+			else
+				BOOST_THROW_EXCEPTION(var->createTypeError("Internal type is not allowed for public and external functions."));
+		}
 	}
 	for (ASTPointer<ModifierInvocation> const& modifier: m_functionModifiers)
 		modifier->checkTypeRequirements(isConstructor() ?
@@ -379,7 +385,11 @@ void VariableDeclaration::checkTypeRequirements()
 		m_value->expectType(*m_type);
 		if (m_isStateVariable && !m_type->externalType() && getVisibility() >= Visibility::Public)
 			BOOST_THROW_EXCEPTION(createTypeError("Internal type is not allowed for state variables."));
-	} else
+
+		if (!FunctionType(*this).externalType())
+			BOOST_THROW_EXCEPTION(createTypeError("Internal type is not allowed for public state variables."));
+	}
+	else
 	{
 		// no type declared and no previous assignment, infer the type
 		m_value->checkTypeRequirements();

libsolidity/Types.cpp

@@ -1103,11 +1103,18 @@ TypePointer FunctionType::externalType() const
 	TypePointers paramTypes;
 	TypePointers retParamTypes;
 
-	for (auto it = m_parameterTypes.cbegin(); it != m_parameterTypes.cend(); ++it)
-		paramTypes.push_back((*it)->externalType());
-	for (auto it = m_returnParameterTypes.cbegin(); it != m_returnParameterTypes.cend(); ++it)
-		retParamTypes.push_back((*it)->externalType());
-
+	for (auto type: m_parameterTypes)
+	{
+		if (!type->externalType())
+			return TypePointer();
+		paramTypes.push_back(type->externalType());
+	}
+	for (auto type: m_returnParameterTypes)
+	{
+		if (!type->externalType())
+			return TypePointer();
+		retParamTypes.push_back(type->externalType());
+	}
 	return make_shared<FunctionType>(paramTypes, retParamTypes, m_location, m_arbitraryParameters);
 }
 

libsolidity/Types.h

@@ -512,6 +512,8 @@ public:
 
 	virtual Category getCategory() const override { return Category::Function; }
 
+	/// @returns TypePointer of a new FunctionType object. All input/return parameters are an appropriate external types of input/return parameters of current function.
+	/// Returns an empty shared pointer if one of the input/return parameters does not have an externaltype.
 	virtual TypePointer externalType() const override;
 
 	explicit FunctionType(FunctionDefinition const& _function, bool _isInternal = true);

mix/CodeModel.cpp

@@ -93,8 +93,23 @@ private:
 	bool m_functionScope;
 	uint m_storageSlot;
 };
+
+dev::eth::AssemblyItems filterLocations(dev::eth::AssemblyItems const& _locations, dev::solidity::ContractDefinition const& _contract, QHash<LocationPair, QString> _functions)
+{
+	dev::eth::AssemblyItems result;
+	result.reserve(_locations.size());
+	for (dev::eth::AssemblyItem item : _locations)
+	{
+		dev::SourceLocation const& l = item.getLocation();
+		if (_contract.getLocation() == l || _functions.contains(LocationPair(l.start, l.end)))
+			item.setLocation(dev::SourceLocation(-1, -1, l.sourceName));
+		result.push_back(item);
+	}
+	return result;
 }
 
+} //namespace
+
 void BackgroundWorker::queueCodeChange(int _jobId)
 {
 	m_model->runCompilationJob(_jobId);
@@ -105,13 +120,11 @@ CompiledContract::CompiledContract(const dev::solidity::CompilerStack& _compiler
 	m_sourceHash(qHash(_source))
 {
 	std::string name = _contractName.toStdString();
-	auto const& contractDefinition = _compiler.getContractDefinition(name);
+	ContractDefinition const& contractDefinition = _compiler.getContractDefinition(name);
 	m_contract.reset(new QContractDefinition(nullptr, &contractDefinition));
 	QQmlEngine::setObjectOwnership(m_contract.get(), QQmlEngine::CppOwnership);
 	m_contract->moveToThread(QApplication::instance()->thread());
 	m_bytes = _compiler.getBytecode(_contractName.toStdString());
-	m_assemblyItems = _compiler.getRuntimeAssemblyItems(name);
-	m_constructorAssemblyItems = _compiler.getAssemblyItems(name);
 
 	dev::solidity::InterfaceHandler interfaceHandler;
 	m_contractInterface = QString::fromStdString(*interfaceHandler.getABIInterface(contractDefinition));
@@ -122,6 +135,8 @@ CompiledContract::CompiledContract(const dev::solidity::CompilerStack& _compiler
 
 	CollectDeclarationsVisitor visitor(&m_functions, &m_locals, &m_storage);
 	contractDefinition.accept(visitor);
+	m_assemblyItems = filterLocations(_compiler.getRuntimeAssemblyItems(name), contractDefinition, m_functions);
+	m_constructorAssemblyItems = filterLocations(_compiler.getAssemblyItems(name), contractDefinition, m_functions);
 }
 
 QString CompiledContract::codeHex() const

mix/qml/CodeEditorView.qml

@@ -11,15 +11,6 @@ Item {
 	signal breakpointsChanged(string documentId)
 	signal isCleanChanged(var isClean, string documentId)
 
-	function getDocumentIdByName(fileName)
-	{
-		for (var i = 0; i < editorListModel.count; i++)	{
-			if (editorListModel.get(i).fileName === fileName) {
-				return editorListModel.get(i).documentId;
-			}
-		}
-		return null;
-	}
 
 	function getDocumentText(documentId) {
 		for (var i = 0; i < editorListModel.count; i++)	{

mix/qml/LogsPane.qml

@@ -7,81 +7,259 @@ import "."
 
 Rectangle
 {
+	property variant currentStatus;
 	function push(_level, _type, _content)
 	{
 		_content = _content.replace(/\n/g, " ")
-		logsModel.insert(0, { "type": _type, "date": Qt.formatDateTime(new Date(), "hh:mm:ss dd.MM.yyyy"), "content": _content, "level": _level });
+		logsModel.insert(0, { "type": _type, "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": _content, "level": _level });
+	}
+
+	onVisibleChanged:
+	{
+		if (visible && (logsModel.count === 0 || (logsModel.get(0).date !== currentStatus.date && logsModel.get(0).content !== currentStatus.content)))
+			logsModel.insert(0, { "type": currentStatus.type, "date": currentStatus.date, "content": currentStatus.content, "level": currentStatus.level });
+		else if (!visible)
+		{
+			for (var k = 0; k < logsModel.count; k++)
+			{
+				if (logsModel.get(k).type === "Comp") //do not keep compilation logs.
+					logsModel.remove(k);
+			}
+		}
 	}
 
 	anchors.fill: parent
-	radius: 5
-	color: LogsPaneStyle.generic.layout.backgroundColor
-	border.color: LogsPaneStyle.generic.layout.borderColor
-	border.width: LogsPaneStyle.generic.layout.borderWidth
-	ColumnLayout {
+	radius: 10
+	color: "transparent"
+	id: logsPane
+	Column {
 		z: 2
-		height: parent.height
+		height: parent.height - rowAction.height
 		width: parent.width
 		spacing: 0
+
+		ListModel {
+			id: logsModel
+		}
+
+		ScrollView
+		{
+			id: scrollView
+			height: parent.height
+			width: parent.width
+			horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+			Column
+			{
+				id: logsRect
+				spacing: 0
+				Repeater {
+					id: logsRepeater
+					clip: true
+					property string frontColor: "transparent"
+					model: SortFilterProxyModel {
+						id: proxyModel
+						source: logsModel
+						property var roles: ["-", "javascript", "run", "state", "comp"]
+
+						Component.onCompleted: {
+							filterType = regEx(proxyModel.roles);
+						}
+
+						function search(_value)
+						{
+							filterContent = _value;
+						}
+
+						function toogleFilter(_value)
+						{
+							var count = roles.length;
+							for (var i in roles)
+							{
+								if (roles[i] === _value)
+								{
+									roles.splice(i, 1);
+									break;
+								}
+							}
+							if (count === roles.length)
+								roles.push(_value);
+
+							filterType = regEx(proxyModel.roles);
+						}
+
+						function regEx(_value)
+						{
+							return "(?:" + roles.join('|') + ")";
+						}
+
+						filterType: "(?:javascript|run|state|comp)"
+						filterContent: ""
+						filterSyntax: SortFilterProxyModel.RegExp
+						filterCaseSensitivity: Qt.CaseInsensitive
+					}
+
+					Rectangle
+					{
+						width: 750
+						height: 30
+						color:
+						{
+							var cl;
+							if (level === "warning" || level === "error")
+								cl = LogsPaneStyle.generic.layout.errorColor;
+							else
+								cl = index % 2 === 0 ? "transparent" : LogsPaneStyle.generic.layout.logAlternateColor;
+							if (index === 0)
+								logsRepeater.frontColor = cl;
+							return cl;
+						}
+
+
+						MouseArea
+						{
+							anchors.fill: parent
+							onClicked:
+							{
+								if (logContent.elide === Text.ElideNone)
+								{
+									logContent.elide = Text.ElideRight;
+									logContent.wrapMode = Text.NoWrap
+									parent.height = 30;
+								}
+								else
+								{
+									logContent.elide = Text.ElideNone;
+									logContent.wrapMode = Text.WordWrap;
+									parent.height = logContent.lineCount * 30;
+								}
+							}
+						}
+
+
+						DefaultLabel {
+							text: date;
+							font.family: LogsPaneStyle.generic.layout.logLabelFont
+							width: LogsPaneStyle.generic.layout.dateWidth
+							font.pointSize: Style.absoluteSize(-1)
+							anchors.left: parent.left
+							anchors.leftMargin: 15
+							anchors.verticalCenter: parent.verticalCenter
+							color: {
+								parent.getColor(level);
+							}
+						}
+
+						DefaultLabel {
+							text: type;
+							font.family: LogsPaneStyle.generic.layout.logLabelFont
+							width: LogsPaneStyle.generic.layout.typeWidth
+							font.pointSize: Style.absoluteSize(-1)
+							anchors.left: parent.left
+							anchors.leftMargin: 100
+							anchors.verticalCenter: parent.verticalCenter
+							color: {
+								parent.getColor(level);
+							}
+						}
+
+						Text {
+							id: logContent
+							text: content;
+							font.family: LogsPaneStyle.generic.layout.logLabelFont
+							width: LogsPaneStyle.generic.layout.contentWidth
+							font.pointSize: Style.absoluteSize(-1)
+							anchors.verticalCenter: parent.verticalCenter
+							elide: Text.ElideRight
+							anchors.left: parent.left
+							anchors.leftMargin: 190
+							color: {
+								parent.getColor(level);
+							}
+						}
+
+						function getColor()
+						{
+							if (level === "error")
+								return "red";
+							else if (level === "warning")
+								return "orange";
+							else
+								return "#808080";
+						}
+					}
+				}
+			}
+		}
+
+		Component {
+			id: itemDelegate
+			DefaultLabel {
+				text: styleData.value;
+				font.family: LogsPaneStyle.generic.layout.logLabelFont
+				font.pointSize: Style.absoluteSize(-1)
+				color: {
+					if (proxyModel.get(styleData.row).level === "error")
+						return "red";
+					else if (proxyModel.get(styleData.row).level === "warning")
+						return "orange";
+					else
+						return "#808080";
+				}
+			}
+		}
+	}
+
+	Rectangle
+	{
+		gradient: Gradient {
+			GradientStop { position: 0.0; color: "#f1f1f1" }
+			GradientStop { position: 1.0; color: "#d9d7da" }
+		}
+		Layout.preferredHeight: LogsPaneStyle.generic.layout.headerHeight
+		height: LogsPaneStyle.generic.layout.headerHeight
+		width: logsPane.width
+		anchors.bottom: parent.bottom
 		Row
 		{
 			id: rowAction
-			Layout.preferredHeight: LogsPaneStyle.generic.layout.headerHeight
-			height: LogsPaneStyle.generic.layout.headerHeight
 			anchors.leftMargin: LogsPaneStyle.generic.layout.leftMargin
 			anchors.left: parent.left
 			spacing: LogsPaneStyle.generic.layout.headerButtonSpacing
-			Button
+			height: parent.height
+			Rectangle
 			{
-				height: LogsPaneStyle.generic.layout.headerButtonHeight
-				anchors.verticalCenter: parent.verticalCenter
-				action: clearAction
-				iconSource: "qrc:/qml/img/broom.png"
-			}
-
-			Action {
-				id: clearAction
-				enabled: logsModel.count > 0
-				tooltip: qsTr("Clear")
-				onTriggered: {
-					logsModel.clear()
+				color: "transparent"
+				height: parent.height
+				width: 40
+				DefaultLabel
+				{
+					anchors.verticalCenter: parent.verticalCenter
+					color: LogsPaneStyle.generic.layout.logLabelColor
+					font.pointSize: Style.absoluteSize(-3)
+					font.family: LogsPaneStyle.generic.layout.logLabelFont
+					text: qsTr("Show:")
 				}
 			}
 
-			Button
-			{
-				height: LogsPaneStyle.generic.layout.headerButtonHeight
+			Rectangle {
 				anchors.verticalCenter: parent.verticalCenter
-				action: copytoClipBoardAction
-				iconSource: "qrc:/qml/img/copy.png"
-			}
-
-			Action {
-				id: copytoClipBoardAction
-				enabled: logsModel.count > 0
-				tooltip: qsTr("Copy to Clipboard")
-				onTriggered: {
-					var content = "";
-					for (var k = 0; k < logsModel.count; k++)
-					{
-						var log = logsModel.get(k);
-						content += log.type + "\t" + log.level + "\t" + log.date + "\t" + log.content + "\n";
-					}
-					clipboard.text = content;
-				}
+				width: 1;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor1
 			}
 
 			Rectangle {
 				anchors.verticalCenter: parent.verticalCenter
-				width: 1;
-				height: parent.height - 10
-				color : "#808080"
+				width: 2;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor2
 			}
 
 			ToolButton {
 				id: javascriptButton
 				checkable: true
 				height: LogsPaneStyle.generic.layout.headerButtonHeight
+				width: 20
 				anchors.verticalCenter: parent.verticalCenter
 				checked: true
 				onCheckedChanged: {
@@ -97,16 +275,35 @@ Rectangle
 							font.pointSize: Style.absoluteSize(-3)
 							color: LogsPaneStyle.generic.layout.logLabelColor
 							anchors.centerIn: parent
-							text: qsTr("JavaScript")
+							text: qsTr("JS")
 						}
 					}
+					background:
+						Rectangle {
+						color: javascriptButton.checked ? LogsPaneStyle.generic.layout.buttonSelected : "transparent"
+					}
 				}
 			}
 
+			Rectangle {
+				anchors.verticalCenter: parent.verticalCenter
+				width: 1;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor1
+			}
+
+			Rectangle {
+				anchors.verticalCenter: parent.verticalCenter
+				width: 2;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor2
+			}
+
 			ToolButton {
 				id: runButton
 				checkable: true
 				height: LogsPaneStyle.generic.layout.headerButtonHeight
+				width: 30
 				anchors.verticalCenter: parent.verticalCenter
 				checked: true
 				onCheckedChanged: {
@@ -125,14 +322,33 @@ Rectangle
 							text: qsTr("Run")
 						}
 					}
+					background:
+						Rectangle {
+						color: runButton.checked ? LogsPaneStyle.generic.layout.buttonSelected : "transparent"
+					}
 				}
 			}
 
+			Rectangle {
+				anchors.verticalCenter: parent.verticalCenter
+				width: 1;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor1
+			}
+
+			Rectangle {
+				anchors.verticalCenter: parent.verticalCenter
+				width: 2;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor2
+			}
+
 			ToolButton {
 				id: stateButton
 				checkable: true
 				height: LogsPaneStyle.generic.layout.headerButtonHeight
 				anchors.verticalCenter: parent.verticalCenter
+				width: 35
 				checked: true
 				onCheckedChanged: {
 					proxyModel.toogleFilter("state")
@@ -145,133 +361,206 @@ Rectangle
 						DefaultLabel {
 							font.family: LogsPaneStyle.generic.layout.logLabelFont
 							font.pointSize: Style.absoluteSize(-3)
-							color: "#5391d8"
+							color: LogsPaneStyle.generic.layout.logLabelColor
 							anchors.centerIn: parent
 							text: qsTr("State")
 						}
 					}
+					background:
+						Rectangle {
+						color: stateButton.checked ? LogsPaneStyle.generic.layout.buttonSelected : "transparent"
+					}
 				}
 			}
 
-			DefaultTextField
-			{
-				id: searchBox
-				height: LogsPaneStyle.generic.layout.headerButtonHeight
+			Rectangle {
 				anchors.verticalCenter: parent.verticalCenter
-				width: LogsPaneStyle.generic.layout.headerInputWidth
-				font.family: LogsPaneStyle.generic.layout.logLabelFont
-				font.pointSize: Style.absoluteSize(-3)
-				font.italic: true
-				onTextChanged: {
-					proxyModel.search(text);
-				}
+				width: 1;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor1
 			}
-		}
 
-		ListModel {
-			id: logsModel
+			Rectangle {
+				anchors.verticalCenter: parent.verticalCenter
+				width: 2;
+				height: parent.height
+				color: LogsPaneStyle.generic.layout.buttonSeparatorColor2
+			}
 		}
 
-		TableView {
-			id: logsTable
-			clip: true
-			Layout.fillWidth: true
-			Layout.preferredHeight: parent.height - rowAction.height
-			headerVisible : false
-			onDoubleClicked:
+		Row
+		{
+			height: parent.height
+			anchors.right: parent.right
+			anchors.rightMargin: 10
+			spacing: 10
+			Rectangle
 			{
-				var log = logsModel.get(logsTable.currentRow);
-				if (log)
-					clipboard.text = (log.type + "\t" + log.level + "\t" + log.date + "\t" + log.content);
-			}
+				height: LogsPaneStyle.generic.layout.headerButtonHeight
+				anchors.verticalCenter: parent.verticalCenter
+				color: "transparent"
+				width: 20
+				Button
+				{
+					id: clearButton
+					action: clearAction
+					anchors.fill: parent
+					anchors.verticalCenter: parent.verticalCenter
+					height: 25
+					style:
+						ButtonStyle {
+						background:
+							Rectangle {
+							height: LogsPaneStyle.generic.layout.headerButtonHeight
+							implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
+							color: "transparent"
+						}
+					}
+				}
 
-			model: SortFilterProxyModel {
-				id: proxyModel
-				source: logsModel
-				property var roles: ["-", "javascript", "run", "state"]
+				Image {
+					id: clearImage
+					source: clearAction.enabled ? "qrc:/qml/img/cleariconactive.png" : "qrc:/qml/img/clearicon.png"
+					anchors.centerIn: parent
+					fillMode: Image.PreserveAspectFit
+					width: 20
+					height: 25
+				}
 
-				Component.onCompleted: {
-					filterType = regEx(proxyModel.roles);
+				Action {
+					id: clearAction
+					enabled: logsModel.count > 0
+					tooltip: qsTr("Clear")
+					onTriggered: {
+						logsModel.clear();
+					}
 				}
+			}
 
-				function search(_value)
+			Rectangle
+			{
+				height: LogsPaneStyle.generic.layout.headerButtonHeight
+				anchors.verticalCenter: parent.verticalCenter
+				color: "transparent"
+				width: 20
+				Button
 				{
-					filterContent = _value;
+					id: copyButton
+					action: copyAction
+					anchors.fill: parent
+					anchors.verticalCenter: parent.verticalCenter
+					height: 25
+					style:
+						ButtonStyle {
+						background:
+							Rectangle {
+							height: LogsPaneStyle.generic.layout.headerButtonHeight
+							implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
+							color: "transparent"
+						}
+					}
 				}
 
-				function toogleFilter(_value)
-				{
-					var count = roles.length;
-					for (var i in roles)
-					{
-						if (roles[i] === _value)
+				Image {
+					id: copyImage
+					source: copyAction.enabled ? "qrc:/qml/img/copyiconactive.png" : "qrc:/qml/img/copyicon.png"
+					anchors.centerIn: parent
+					fillMode: Image.PreserveAspectFit
+					width: 20
+					height: 25
+				}
+
+				Action {
+					id: copyAction
+					enabled: logsModel.count > 0
+					tooltip: qsTr("Copy to Clipboard")
+					onTriggered: {
+						var content = "";
+						for (var k = 0; k < logsModel.count; k++)
 						{
-							roles.splice(i, 1);
-							break;
+							var log = logsModel.get(k);
+							content += log.type + "\t" + log.level + "\t" + log.date + "\t" + log.content + "\n";
 						}
+						clipboard.text = content;
 					}
-					if (count === roles.length)
-						roles.push(_value);
-
-					filterType = regEx(proxyModel.roles);
 				}
+			}
 
-				function regEx(_value)
+			DefaultTextField
+			{
+				id: searchBox
+				anchors.verticalCenter: parent.verticalCenter
+				width: LogsPaneStyle.generic.layout.headerInputWidth - 50
+				font.family: LogsPaneStyle.generic.layout.logLabelFont
+				font.pointSize: Style.absoluteSize(-3)
+				font.italic: true
+				text: qsTr(" - Search - ")
+				onFocusChanged:
 				{
-					return "(?:" + roles.join('|') + ")";
+					if (!focus && text === "")
+						text = qsTr(" - Search - ");
+					else if (focus && text === qsTr(" - Search - "))
+						text = "";
 				}
 
-				filterType: "(?:javascript|run|state)"
-				filterContent: ""
-				filterSyntax: SortFilterProxyModel.RegExp
-				filterCaseSensitivity: Qt.CaseInsensitive
-			}
-			TableViewColumn
-			{
-				role: "date"
-				title: qsTr("date")
-				width: LogsPaneStyle.generic.layout.dateWidth
-				delegate: itemDelegate
-			}
-			TableViewColumn
-			{
-				role: "type"
-				title: qsTr("type")
-				width: LogsPaneStyle.generic.layout.typeWidth
-				delegate: itemDelegate
+				onTextChanged: {
+					if (text === qsTr(" - Search - "))
+						proxyModel.search("");
+					else
+						proxyModel.search(text);
+				}
+
+				style:
+					TextFieldStyle {
+					background: Rectangle {
+						radius: 10
+					}
+				}
 			}
-			TableViewColumn
+
+
+			Rectangle
 			{
-				role: "content"
-				title: qsTr("content")
-				width: LogsPaneStyle.generic.layout.contentWidth
-				delegate: itemDelegate
-			}
+				height: LogsPaneStyle.generic.layout.headerButtonHeight
+				anchors.verticalCenter: parent.verticalCenter
+				color: "transparent"
+				width: 20
+				Button
+				{
+					id: hideButton
+					action: hideAction
+					anchors.fill: parent
+					anchors.verticalCenter: parent.verticalCenter
+					height: 25
+					style:
+						ButtonStyle {
+						background:
+							Rectangle {
+							height: LogsPaneStyle.generic.layout.headerButtonHeight
+							implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
+							color: "transparent"
+						}
+					}
+				}
 
-			rowDelegate: Item {
-				Rectangle {
-					width: logsTable.width - 4
-					height: 17
-					color: styleData.alternate ? "transparent" : LogsPaneStyle.generic.layout.logAlternateColor
+				Image {
+					id: hideImage
+					source: "qrc:/qml/img/exit.png"
+					anchors.centerIn: parent
+					fillMode: Image.PreserveAspectFit
+					width: 20
+					height: 25
 				}
-			}
-		}
 
-		Component {
-			id: itemDelegate
-			DefaultLabel {
-				text: styleData.value;
-				font.family: LogsPaneStyle.generic.layout.logLabelFont
-				font.pointSize: Style.absoluteSize(-1)
-				color: {
-					if (proxyModel.get(styleData.row).level === "error")
-						return "red";
-					else if (proxyModel.get(styleData.row).level === "warning")
-						return "orange";
-					else
-						return "#808080";
+				Action {
+					id: hideAction
+					tooltip: qsTr("Exit")
+					onTriggered: {
+						logsPane.parent.toggle();
+					}
 				}
 			}
 		}
 	}
+
 }

mix/qml/LogsPaneStyle.qml

@@ -11,19 +11,21 @@ QtObject {
 	property QtObject generic: QtObject {
 		property QtObject layout: QtObject {
 			property string backgroundColor: "#f7f7f7"
-			property string borderColor: "#5391d8"
-			property int borderWidth: 1
-			property int headerHeight: 35
-			property int headerButtonSpacing: 5
+			property int headerHeight: 30
+			property int headerButtonSpacing: 0
 			property int leftMargin: 10
 			property int headerButtonHeight: 30
-			property string logLabelColor: "#5391d8"
+			property string logLabelColor: "#4a4a4a"
 			property string logLabelFont: "sans serif"
 			property int headerInputWidth: 200
-			property int dateWidth: 150
-			property int typeWidth: 80
-			property int contentWidth: 700
-			property string logAlternateColor: "#f0f0f0"
+			property int dateWidth: 70
+			property int typeWidth: 90
+			property int contentWidth: 560
+			property string logAlternateColor: "#f6f5f6"
+			property string errorColor: "#fffcd5"
+			property string buttonSeparatorColor1: "#d3d0d0"
+			property string buttonSeparatorColor2: "#f2f1f2"
+			property string buttonSelected: "#dcdcdc"
 		}
 	}
 }

mix/qml/ProjectModel.qml

@@ -64,6 +64,7 @@ Item {
 	function renameDocument(documentId, newName) { ProjectModelCode.renameDocument(documentId, newName); }
 	function removeDocument(documentId) { ProjectModelCode.removeDocument(documentId); }
 	function getDocument(documentId) { return ProjectModelCode.getDocument(documentId); }
+	function getDocumentIdByName(documentName) { return ProjectModelCode.getDocumentIdByName(documentName); }
 	function getDocumentIndex(documentId) { return ProjectModelCode.getDocumentIndex(documentId); }
 	function addExistingFiles(paths) { ProjectModelCode.doAddExistingFiles(paths); }
 	function deployProject() { ProjectModelCode.deployProject(false); }

mix/qml/StatusPane.qml

@@ -9,7 +9,7 @@ Rectangle {
 	id: statusHeader
 	objectName: "statusPane"
 	property variant webPreview
-
+	property alias currentStatus: logPane.currentStatus
 	function updateStatus(message)
 	{
 		if (!message)
@@ -17,6 +17,7 @@ Rectangle {
 			status.state = "";
 			status.text = qsTr("Compile successfully.");
 			debugImg.state = "active";
+			currentStatus = { "type": "Comp", "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": status.text, "level": "info" }
 		}
 		else
 		{
@@ -24,6 +25,7 @@ Rectangle {
 			var errorInfo = ErrorLocationFormater.extractErrorInfo(message, true);
 			status.text = errorInfo.errorLocation + " " + errorInfo.errorDetail;
 			debugImg.state = "";
+			currentStatus = { "type": "Comp", "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": status.text, "level": "error" }
 		}
 		debugRunActionIcon.enabled = codeModel.hasContract;
 	}
@@ -33,6 +35,7 @@ Rectangle {
 		status.state = "";
 		status.text = text
 		logPane.push("info", type, text);
+		currentStatus = { "type": type, "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": text, "level": "info" }
 	}
 
 	function warningMessage(text, type)
@@ -40,13 +43,15 @@ Rectangle {
 		status.state = "warning";
 		status.text = text
 		logPane.push("warning", type, text);
+		currentStatus = { "type": type, "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": text, "level": "warning" }
 	}
 
 	function errorMessage(text, type)
 	{
 		status.state = "error";
-		status.text = text
+		status.text = text;
 		logPane.push("error", type, text);
+		currentStatus = { "type": type, "date": Qt.formatDateTime(new Date(), "hh:mm:ss"), "content": text, "level": "error" }
 	}
 
 	Connections {
@@ -76,7 +81,7 @@ Rectangle {
 		function format(_message)
 		{
 			var formatted = _message.match(/(?:<dev::eth::)(.+)(?:>)/);
-			if (formatted)
+			if (!formatted)
 				formatted = _message.match(/(?:<dev::)(.+)(?:>)/);
 			if (formatted && formatted.length > 1)
 				formatted = formatted[1];
@@ -90,6 +95,7 @@ Rectangle {
 			return formatted;
 		}
 	}
+
 	Connections {
 		target:projectModel
 		onDeploymentStarted: infoMessage(qsTr("Running deployment..."), "Deployment");
@@ -111,32 +117,13 @@ Rectangle {
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.verticalCenter: parent.verticalCenter
 		radius: 3
-		width: 500
+		width: 600
 		height: 30
 		color: "#fcfbfc"
-		states: [
-			State {
-				name: "logsOpened"
-				PropertyChanges {
-					target: statusContainer
-					border.color: "#5391d8"
-					border.width: 1
-				}
-			},
-			State {
-				name: "logsClosed"
-				PropertyChanges {
-					target: statusContainer
-					border.color: "#5391d8"
-					border.width: 0
-				}
-			}
-		]
-
 		Text {
 			anchors.verticalCenter: parent.verticalCenter
 			anchors.horizontalCenter: parent.horizontalCenter
-			font.pointSize: StatusPaneStyle.general.statusFontSize
+			font.pointSize: Style.absoluteSize(-1)
 			height: 15
 			font.family: "sans serif"
 			objectName: "status"
@@ -215,54 +202,56 @@ Rectangle {
 			{
 				if (logsContainer.state === "opened")
 				{
-					statusContainer.state = "logsClosed";
 					logsContainer.state = "closed"
 				}
 				else
 				{
-					statusContainer.state = "logsOpened";
 					logsContainer.state = "opened";
 					logsContainer.focus = true;
 					forceActiveFocus();
+					calCoord();
 				}
 			}
 
 			id: logsContainer
-			width: 1000
-			height: 0
-			anchors.topMargin: 10
+			width: 750
 			anchors.top: statusContainer.bottom
-			anchors.horizontalCenter: parent.horizontalCenter
+			anchors.topMargin: 4
 			visible: false
-			radius: 5
-			Component.onCompleted:
+			radius: 10
+
+			function calCoord()
 			{
 				var top = logsContainer;
 				while (top.parent)
 					top = top.parent
-				var coordinates = logsContainer.mapToItem(top, 0, 0)
+				var coordinates = logsContainer.mapToItem(top, 0, 0);
 				logsContainer.parent = top;
-				logsContainer.x = coordinates.x
-				logsContainer.y = coordinates.y
+				logsContainer.x = status.x + statusContainer.x - LogsPaneStyle.generic.layout.dateWidth - LogsPaneStyle.generic.layout.typeWidth - 30
 			}
+
 			LogsPane
 			{
-				id: logPane
+				id: logPane;
 			}
+
 			states: [
 				State {
 					name: "opened";
 					PropertyChanges { target: logsContainer; height: 500; visible: true }
+					PropertyChanges { target: statusContainer; width: 100; height: 25 }
 				},
 				State {
 					name: "closed";
 					PropertyChanges { target: logsContainer; height: 0; visible: false }
+					PropertyChanges { target: statusContainer; width: 600; height: 30 }
 				}
 			]
 			transitions: Transition {
 					 NumberAnimation { properties: "height"; easing.type: Easing.InOutQuad; duration: 200 }
-					 NumberAnimation { properties: "visible"; easing.type: Easing.InOutQuad; duration: 200 }
-				 }
+					 NumberAnimation { target: logsContainer;  properties: "visible"; easing.type: Easing.InOutQuad; duration: 200 }
+					 NumberAnimation { target: statusContainer;  properties: "width"; easing.type: Easing.InOutQuad; duration: 500 }
+			}
 		}
 	}
 

mix/qml/WebPreview.qml

@@ -156,7 +156,7 @@ Item {
 				if (urlPath === "/")
 					urlPath = "/index.html";
 				var documentName = urlPath.substr(urlPath.lastIndexOf("/") + 1);
-				var documentId = projectModel.codeEditor.getDocumentIdByName(documentName);
+				var documentId = projectModel.getDocumentIdByName(documentName);
 				var content = "";
 				if (projectModel.codeEditor.isDocumentOpen(documentId))
 					content = projectModel.codeEditor.getDocumentText(documentId);

mix/qml/html/codeeditor.js

@@ -124,8 +124,6 @@ var executionMark;
 highlightExecution = function(start, end) {
 	if (executionMark)
 		executionMark.clear();
-	if (start === 0 && end + 1 === editor.getValue().length)
-		return; // Do not hightlight the whole document.
 	if (debugWarning)
 		debugWarning.clear();
 	executionMark = editor.markText(editor.posFromIndex(start), editor.posFromIndex(end), { className: "CodeMirror-exechighlight" });

mix/qml/js/ProjectModel.js

@@ -172,7 +172,7 @@ function getDocumentIndex(documentId)
 	for (var i = 0; i < projectListModel.count; i++)
 		if (projectListModel.get(i).documentId === documentId)
 			return i;
-	console.error("Cant find document " + documentId);
+	console.error("Can't find document " + documentId);
 	return -1;
 }
 
@@ -291,6 +291,14 @@ function getDocument(documentId) {
 	return projectListModel.get(i);
 }
 
+function getDocumentIdByName(fileName)
+{
+	for (var i = 0; i < projectListModel.count; i++)
+		if (projectListModel.get(i).fileName === fileName)
+			return projectListModel.get(i).documentId;
+	return null;
+}
+
 function removeDocument(documentId) {
 	var i = getDocumentIndex(documentId);
 	var document = projectListModel.get(i);

mix/res.qrc

@@ -17,7 +17,6 @@
         <file>qml/fonts/SourceSerifPro-Semibold.ttf</file>
         <file>qml/img/available_updates.png</file>
         <file>qml/img/b64.png</file>
-        <file>qml/img/broom.png</file>
         <file>qml/img/bugiconactive.png</file>
         <file>qml/img/bugiconinactive.png</file>
         <file>qml/img/closedtriangleindicator.png</file>
@@ -58,5 +57,9 @@
         <file>stdc/namereg.sol</file>
         <file>stdc/std.sol</file>
         <file>qml/img/edit_combox.png</file>
+        <file>qml/img/clearicon.png</file>
+        <file>qml/img/cleariconactive.png</file>
+        <file>qml/img/copyicon.png</file>
+        <file>qml/img/copyiconactive.png</file>
     </qresource>
 </RCC>

test/SolidityNameAndTypeResolution.cpp

@@ -460,7 +460,7 @@ BOOST_AUTO_TEST_CASE(function_external_types)
 			uint a;
 		}
 		contract Test {
-			function boo(uint arg2, bool arg3, bytes8 arg4, bool[2] pairs, uint[] dynamic, C carg) external returns (uint ret) {
+			function boo(uint arg2, bool arg3, bytes8 arg4, bool[2] pairs, uint[] dynamic, C carg, address[] addresses) external returns (uint ret) {
 			   ret = 5;
 			}
 		})";
@@ -471,7 +471,7 @@ BOOST_AUTO_TEST_CASE(function_external_types)
 			auto functions = contract->getDefinedFunctions();
 			if (functions.empty())
 				continue;
-			BOOST_CHECK_EQUAL("boo(uint256,bool,bytes8,bool[2],uint256[],address)", functions[0]->externalSignature());
+			BOOST_CHECK_EQUAL("boo(uint256,bool,bytes8,bool[2],uint256[],address,address[])", functions[0]->externalSignature());
 		}
 }
 
@@ -503,6 +503,16 @@ BOOST_AUTO_TEST_CASE(function_external_call_not_allowed_conversion)
 	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
 }
 
+// todo delete when implemented
+BOOST_AUTO_TEST_CASE(arrays_in_internal_functions)
+{
+	char const* text = R"(
+		contract Test {
+			function foo(address[] addresses) {}
+	})";
+	BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
+}
+
 BOOST_AUTO_TEST_CASE(function_internal_allowed_conversion)
 {
 	char const* text = R"(