#include "ScriptingDock.hxx"
+#include "FridaDock.hxx"
+
+#include "bindings/Interpreter.hxx"
+
+#include <sstream>
+
+ScriptingDock::ScriptingDock(Interpreter* interpreter, FridaDock* parent)
+ : QWidget(parent)
+ , logger(log4cxx::Logger::getLogger("gui.ScriptingDock"))
+ , interpreter(interpreter) {
+ setLayout(layout = new QGridLayout);
+ layout->addWidget(browser = new QTextBrowser, 0, 0, 1, 0);
+ layout->addWidget(line = new QLineEdit, 1, 0);
+ layout->addWidget(button = new QPushButton(tr("Evaluate")), 1, 1);
+ connect(button, SIGNAL(released()), this, SLOT(doEvaluate()));
+ connect(line, SIGNAL(returnPressed()), this, SLOT(doEvaluate()));
+}
+
void ScriptingDock::doEvaluate() {
- QString text = line->text();
- line->clear();
- LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\"");
- browser->append(QString("> ") + text);
-
- SCM result_obj = scm_c_eval_string(text.toStdString().c_str());
- SCM result_str = scm_object_to_string(result_obj, SCM_UNDEFINED);
-
- SCM output = scm_get_output_string(guile_output_port);
- browser->append(scm_to_locale_string(output));
- browser->append(scm_to_locale_string(result_str));
+ std::stringstream stdout, stderr;
+ std::string result;
+ QString output;
+ QString text = line->text();
+
+ line->clear();
+ LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\"");
+ browser->append(QString("> ") + text);
+
+ interpreter->evaluate(text.toStdString(), stdout, stderr, result);
+
+ output = stdout.str().c_str();
+ if (output.endsWith("\n")) output.chop(1);
+ if (output != "") browser->append(output);
+
+ output = stderr.str().c_str();
+ if (output.endsWith("\n")) output.chop(1);
+ if (output != "") browser->append(output);
+
+ browser->append(result.c_str());
}