X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FScriptingDock.cxx;h=86bc7665e6c7b6ec4041912c706f989e48e1cc8a;hp=6a3f76304997eaa45992380cbc40aafb38bde214;hb=9e283567ac56a6433e832d0fa38cf534a0cb8f9f;hpb=dba058b3ff87f818042a09bcfa8fc58072adc49b diff --git a/src/gui/widgets/ScriptingDock.cxx b/src/gui/widgets/ScriptingDock.cxx index 6a3f763..86bc766 100644 --- a/src/gui/widgets/ScriptingDock.cxx +++ b/src/gui/widgets/ScriptingDock.cxx @@ -1,36 +1,36 @@ #include "ScriptingDock.hxx" namespace { - SCM handler (void *data, SCM tag, SCM throw_args) { - scm_handle_by_message_noexit ((void*)"foo", tag, throw_args); + SCM handler (void *data, SCM tag, SCM throw_args) { + scm_handle_by_message_noexit ((void*)"foo", tag, throw_args); return SCM_BOOL_F; } } void ScriptingDock::doEvaluate() { - QString text = line->text(); - line->clear(); - LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\""); - browser->append(QString("> ") + text); - - SCM result_obj = scm_internal_catch(SCM_BOOL_T, - (SCM (*)(void *))scm_c_eval_string, - (void*)text.toStdString().c_str(), - handler, NULL); - SCM result_str = scm_object_to_string(result_obj, SCM_UNDEFINED); + QString text = line->text(); + line->clear(); + LOG4CXX_INFO(logger, "Evaluating String \"" << text.toStdString() << "\""); + browser->append(QString("> ") + text); - SCM output = scm_get_output_string(guile_output_port); + SCM result_obj = scm_internal_catch(SCM_BOOL_T, + (SCM (*)(void *))scm_c_eval_string, + (void*)text.toStdString().c_str(), + handler, NULL); + SCM result_str = scm_object_to_string(result_obj, SCM_UNDEFINED); + + SCM output = scm_get_output_string(guile_output_port); QString output_q = scm_to_locale_string(output); if (output_q.endsWith("\n")) output_q.chop(1); - if (output_q != "") browser->append(output_q); + if (output_q != "") browser->append(output_q); output = scm_get_output_string(guile_error_port); output_q = scm_to_locale_string(output); if (output_q.endsWith("\n")) output_q.chop(1); - if (output_q != "") browser->append(output_q); + if (output_q != "") browser->append(output_q); scm_truncate_file(guile_output_port, scm_from_uint16(0)); - scm_truncate_file(guile_error_port, scm_from_uint16(0)); - - browser->append(scm_to_locale_string(result_str)); + scm_truncate_file(guile_error_port, scm_from_uint16(0)); + + browser->append(scm_to_locale_string(result_str)); }