Assembler.

Debug trace stuff.

6 files changed, 89 insertions, 30 deletions

diff --git a/Assembly.cpp b/Assembly.cpp
index e69de29b..317a92fc 100644
--- a/Assembly.cpp
+++ b/Assembly.cpp
@@ -0,0 +1,53 @@
+/*
+	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 Assembly.cpp
+ * @author Gav Wood <i@gavwood.com>
+ * @date 2014
+ */
+
+#include "Assembly.h"
+
+#include <libethcore/CommonEth.h>
+
+using namespace std;
+using namespace eth;
+
+void Assembly::append(Assembly const& _a)
+{
+	for (AssemblyItem i: _a.m_items)
+	{
+		if (i.type() == Tag || i.type() == PushTag)
+			i.m_data += m_usedTags;
+		m_items.push_back(i);
+	}
+	for (auto const& i: _a.m_data)
+		m_data.insert(i);
+}
+
+ostream& Assembly::streamOut(ostream& _out) const
+{
+	for (auto const& i: m_items)
+	{
+	}
+	return _out;
+}
+
+bytes Assembly::assemble() const
+{
+	bytes ret;
+	return ret;
+}
diff --git a/Assembly.h b/Assembly.h
index 28d2974b..cbce3ca8 100644
--- a/Assembly.h
+++ b/Assembly.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <iostream>
 #include <libethsupport/Common.h>
 #include <libethcore/Instruction.h>
 #include "Exceptions.h"
@@ -30,23 +31,24 @@ namespace eth
 
 enum AssemblyItemType { Operation, Push, PushString, PushTag, Tag, PushData };
 
+class Assembly;
+
 class AssemblyItem
 {
+	friend class Assembly;
+
 public:
 	AssemblyItem(u256 _push): m_type(Push), m_data(_push) {}
-	AssemblyItem(std::string const& _push): m_type(PushString), m_pushString(_push) {}
 	AssemblyItem(AssemblyItemType _type, AssemblyItem const& _tag): m_type(_type), m_data(_tag.m_data) { assert(_type == PushTag); assert(_tag.m_type == Tag); }
 	AssemblyItem(Instruction _i): m_type(Operation), m_data((byte)_i) {}
 	AssemblyItem(AssemblyItemType _type, u256 _data): m_type(_type), m_data(_data) {}
 
 	AssemblyItemType type() const { return m_type; }
 	u256 data() const { return m_data; }
-	std::string const& pushString() const { return m_pushString; }
 
 private:
 	AssemblyItemType m_type;
 	u256 m_data;
-	std::string m_pushString;
 };
 
 class Assembly
@@ -54,8 +56,13 @@ class Assembly
 public:
 	AssemblyItem newTag() { return AssemblyItem(Tag, m_usedTags++); }
 	AssemblyItem newData(bytes const& _data) { auto h = sha3(_data); m_data[h] = _data; return AssemblyItem(PushData, h); }
+	AssemblyItem newPushString(std::string const& _data) { auto b = asBytes(_data); auto h = sha3(b); m_data[h] = b; return AssemblyItem(PushString, h); }
+
+	void append(AssemblyItem const& _i) { m_items.push_back(_i); }
+
 	bytes assemble() const;
 	void append(Assembly const& _a);
+	std::ostream& streamOut(std::ostream& _out) const;
 
 private:
 	u256 m_usedTags = 0;
diff --git a/CodeFragment.cpp b/CodeFragment.cpp
index cc76c432..c4b7ae0b 100644
--- a/CodeFragment.cpp
+++ b/CodeFragment.cpp
@@ -34,31 +34,6 @@ namespace qi = boost::spirit::qi;
 namespace px = boost::phoenix;
 namespace sp = boost::spirit;
 
-void eth::debugOutAST(ostream& _out, sp::utree const& _this)
-{
-	switch (_this.which())
-	{
-	case sp::utree_type::list_type:
-		switch (_this.tag())
-		{
-		case 0: _out << "( "; for (auto const& i: _this) { debugOutAST(_out, i); _out << " "; } _out << ")"; break;
-		case 1: _out << "@ "; debugOutAST(_out, _this.front()); break;
-		case 2: _out << "@@ "; debugOutAST(_out, _this.front()); break;
-		case 3: _out << "[ "; debugOutAST(_out, _this.front()); _out << " ] "; debugOutAST(_out, _this.back()); break;
-		case 4: _out << "[[ "; debugOutAST(_out, _this.front()); _out << " ]] "; debugOutAST(_out, _this.back()); break;
-		case 5: _out << "{ "; for (auto const& i: _this) { debugOutAST(_out, i); _out << " "; } _out << "}"; break;
-		default:;
-		}
-
-		break;
-	case sp::utree_type::int_type: _out << _this.get<int>(); break;
-	case sp::utree_type::string_type: _out << "\"" << _this.get<sp::basic_string<boost::iterator_range<char const*>, sp::utree_type::string_type>>() << "\""; break;
-	case sp::utree_type::symbol_type: _out << _this.get<sp::basic_string<boost::iterator_range<char const*>, sp::utree_type::symbol_type>>(); break;
-	case sp::utree_type::any_type: _out << *_this.get<bigint*>(); break;
-	default: _out << "nil";
-	}
-}
-
 void CodeFragment::appendFragment(CodeFragment const& _f)
 {
 	m_locs.reserve(m_locs.size() + _f.m_locs.size());
diff --git a/CodeFragment.h b/CodeFragment.h
index cee7da3b..9f312cda 100644
--- a/CodeFragment.h
+++ b/CodeFragment.h
@@ -32,8 +32,6 @@ namespace sp = boost::spirit;
 namespace eth
 {
 
-void debugOutAST(std::ostream& _out, sp::utree const& _this);
-
 class CompilerState;
 
 class CodeFragment
diff --git a/Parser.cpp b/Parser.cpp
index 2a0146a6..10d2188a 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -42,6 +42,31 @@ void eth::killBigints(sp::utree const& _this)
 	}
 }
 
+void eth::debugOutAST(ostream& _out, sp::utree const& _this)
+{
+	switch (_this.which())
+	{
+	case sp::utree_type::list_type:
+		switch (_this.tag())
+		{
+		case 0: _out << "( "; for (auto const& i: _this) { debugOutAST(_out, i); _out << " "; } _out << ")"; break;
+		case 1: _out << "@ "; debugOutAST(_out, _this.front()); break;
+		case 2: _out << "@@ "; debugOutAST(_out, _this.front()); break;
+		case 3: _out << "[ "; debugOutAST(_out, _this.front()); _out << " ] "; debugOutAST(_out, _this.back()); break;
+		case 4: _out << "[[ "; debugOutAST(_out, _this.front()); _out << " ]] "; debugOutAST(_out, _this.back()); break;
+		case 5: _out << "{ "; for (auto const& i: _this) { debugOutAST(_out, i); _out << " "; } _out << "}"; break;
+		default:;
+		}
+
+		break;
+	case sp::utree_type::int_type: _out << _this.get<int>(); break;
+	case sp::utree_type::string_type: _out << "\"" << _this.get<sp::basic_string<boost::iterator_range<char const*>, sp::utree_type::string_type>>() << "\""; break;
+	case sp::utree_type::symbol_type: _out << _this.get<sp::basic_string<boost::iterator_range<char const*>, sp::utree_type::symbol_type>>(); break;
+	case sp::utree_type::any_type: _out << *_this.get<bigint*>(); break;
+	default: _out << "nil";
+	}
+}
+
 void eth::parseTreeLLL(string const& _s, sp::utree& o_out)
 {
 	using qi::ascii::space;
diff --git a/Parser.h b/Parser.h
index 3b275657..059ffe6a 100644
--- a/Parser.h
+++ b/Parser.h
@@ -33,6 +33,7 @@ namespace eth
 
 void killBigints(sp::utree const& _this);
 void parseTreeLLL(std::string const& _s, sp::utree& o_out);
+void debugOutAST(std::ostream& _out, sp::utree const& _this);
 
 }