Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

* 'develop' of github.com:ethereum/cpp-ethereum:
  Minor fix to the fix.
  Disable unfinished code.
  Typo fix.
  Better language detection.

alethzero/MainWin.cpp

@@ -878,7 +878,9 @@ void Main::on_blocks_currentItemChanged()
 			s.resetTo(bi.);
 			s <<*/
 
-			// TODO: Make function: State::fromBlock (grabs block's parent's stateRoot, playback()'s transactions), then use State::fromPending(). Maybe even make a State::pendingDiff().
+//			eth::State s = m_client->blockChain().stateAt(h);
+//			StateDiff d = s.pendingDiff(txi);
+			// TODO: Make function: BlockChain::stateAt (grabs block's parent's stateRoot, playback()'s transactions), then use State::fromPending(). Maybe even make a State::pendingDiff().
 		}
 
 
@@ -987,8 +989,8 @@ void Main::on_data_textChanged()
 					errors.push_back("Serpent " + err);
 				}
 			}
-#endif
 			else
+#endif
 				lll = "<h4>Opt</h4><pre>" + QString::fromStdString(asmcodeopt).toHtmlEscaped() + "</pre><h4>Pre</h4><pre>" + QString::fromStdString(asmcode).toHtmlEscaped() + "</pre>";
 		}
 		QString errs;
@@ -1189,6 +1191,8 @@ void Main::on_send_clicked()
 void Main::on_debug_clicked()
 {
 	debugFinished();
+	try
+	{
 	u256 totalReq = value() + fee();
 	eth::ClientGuard l(&*m_client);
 	for (auto i: m_myKeys)
@@ -1223,6 +1227,11 @@ void Main::on_debug_clicked()
 		}
 	statusBar()->showMessage("Couldn't make transaction: no single account contains at least the required amount.");
 	}
+	catch (eth::Exception const& _e)
+	{
+		statusBar()->showMessage("Error running transaction: " + QString::fromStdString(_e.description()));
+	}
+}
 
 void Main::on_create_triggered()
 {

liblll/Parser.cpp

@@ -118,6 +118,9 @@ void eth::parseTreeLLL(string const& _s, sp::utree& o_out)
 		if (!incomment)
 			s.push_back(i);
 	}
-	qi::phrase_parse(s.cbegin(), s.cend(), element, space, qi::skip_flag::dont_postskip, o_out);
+	auto ret = s.cbegin();
+	qi::phrase_parse(ret, s.cend(), element, space, qi::skip_flag::dont_postskip, o_out);
+	if (ret != s.cend())
+		throw std::exception();
 }