replace deprecated ECL C names; revisions; integrate QML into the library ('qml-lisp.lisp' is obsolete now);

This commit is contained in:
polos 2021-03-13 16:03:09 +01:00
parent 8d3bc5234f
commit 799cc1de36
25 changed files with 358 additions and 1854 deletions

View file

@ -9,7 +9,7 @@
#include <QStringList>
#include <QDebug>
const char EQL::version[] = "21.3.1"; // March 2021
const char EQL::version[] = "21.3.2"; // March 2021
extern "C" void ini_EQL(cl_object);
@ -45,7 +45,7 @@ EQL::EQL() : QObject() {
cl_boot(1, (char**)_argv_); }
iniCLFunctions();
LObjects::ini(this);
read_VV(OBJNULL, ini_EQL); } // see "src/make.lisp"
ecl_init_module(NULL, ini_EQL); } // see "src/make.lisp"
void EQL::ini(char** argv) {
cl_booted = true;
@ -88,7 +88,7 @@ void EQL::ignoreIOStreams() {
eval("(eql::ignore-io-streams)"); }
void EQL::exec(const QStringList& args) {
cl_object s_qtpl = cl_intern(1, make_constant_base_string("*QTPL*"));
cl_object s_qtpl = cl_intern(1, ecl_make_constant_base_string("*QTPL*", -1));
bool exec_with_simple_restart = false;
QStringList arguments(args);
eval("(in-package :eql-user)");
@ -121,10 +121,10 @@ void EQL::exec(const QStringList& args) {
arguments << swankFile; }
exec_with_simple_restart = true; }
// -qtpl
else if(arguments.contains("-qtpl") || (cl_symbol_value(s_qtpl) == Ct)) {
else if(arguments.contains("-qtpl") || (cl_symbol_value(s_qtpl) == ECL_T)) {
arguments.removeAll("-qtpl");
evalMode = DebugOnError;
ecl_setq(ecl_process_env(), s_qtpl, Ct);
ecl_setq(ecl_process_env(), s_qtpl, ECL_T);
QApplication::setQuitOnLastWindowClosed(false);
forms << "(when (directory (in-home \"lib/ecl-readline.fas*\"))"
" (load (x:check-recompile (in-home \"lib/ecl-readline\"))))"
@ -179,7 +179,7 @@ void EQL::exec(const QStringList& args) {
void EQL::exec(lisp_ini ini, const QByteArray& expression, const QByteArray& package) {
// see my_app example
read_VV(OBJNULL, ini);
ecl_init_module(NULL, ini);
eval(QString("(in-package :%1)").arg(QString(package)).toLatin1().constData());
eval(expression.constData()); }