Skip to content

Commit

Permalink
Update tivars_lib_cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@adriweb
adriweb committed Aug 6, 2024
1 parent 47a5eeb commit 7089dc8
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion gui/qt/basiccodeviewerwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ void BasicCodeViewerWindow::setVariableName(const QString &name) {
void BasicCodeViewerWindow::setOriginalCode(const QString &code, bool reindent) {
m_originalCode = code;
if (reindent) {
m_formattedCode = QString::fromStdString(tivars::TH_Tokenized::reindentCodeString(m_originalCode.toStdString()));
m_formattedCode = QString::fromStdString(tivars::TypeHandlers::TH_Tokenized::reindentCodeString(m_originalCode.toStdString()));
} else {
m_formattedCode = m_originalCode;
}
Expand Down
8 changes: 4 additions & 4 deletions gui/qt/basicdebugger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ MainWindow::debug_basic_status_t MainWindow::debugBasicPgrmLookup(bool allowSwit

try {
const options_t detok_opts = { { "fromRawBytes", true }, { "prettify", true } };
str = QString::fromStdString(tivars::TH_Tokenized::makeStringFromData(data_t(prgmBytes.constData(), prgmBytes.constEnd()), detok_opts));
str = QString::fromStdString(tivars::TypeHandlers::TH_Tokenized::makeStringFromData(data_t(prgmBytes.constData(), prgmBytes.constEnd()), detok_opts));
} catch(...) {
return DBG_BASIC_NO_EXECUTING_PRGM;
}
Expand All @@ -224,7 +224,7 @@ MainWindow::debug_basic_status_t MainWindow::debugBasicPgrmLookup(bool allowSwit
}
m_basicTempOpen = true;
m_basicOriginalCodeTemp = str;
m_basicFormattedCodeTemp = QString::fromStdString(tivars::TH_Tokenized::reindentCodeString(str.toStdString()));
m_basicFormattedCodeTemp = QString::fromStdString(tivars::TypeHandlers::TH_Tokenized::reindentCodeString(str.toStdString()));
m_basicOriginalCode = &m_basicOriginalCodeTemp;
m_basicFormattedCode = &m_basicFormattedCodeTemp;
} else {
Expand Down Expand Up @@ -285,7 +285,7 @@ void MainWindow::debugBasicCreateTokenMap(int idx, const QByteArray &data) {
data_t tokBytes(2);
tokBytes[0] = token;
tokBytes[1] = tokenNext;
std::string tokStr = tivars::TH_Tokenized::tokenToString(tokBytes, &incr, { { "prettify", true } });
std::string tokStr = tivars::TypeHandlers::TH_Tokenized::tokenToString(tokBytes, &incr, { { "prettify", true } });

if (!tokStr.empty()) {
posinfo.len += utf8_strlen(tokStr.c_str());
Expand Down Expand Up @@ -324,7 +324,7 @@ void MainWindow::debugBasicCreateTokenMap(int idx, const QByteArray &data) {
data_t tokBytes(2);
tokBytes[0] = token;
tokBytes[1] = tokenNext;
std::string tokStr = tivars::TH_Tokenized::tokenToString(tokBytes, &incr, { {"prettify", true } });
std::string tokStr = tivars::TypeHandlers::TH_Tokenized::tokenToString(tokBytes, &incr, { {"prettify", true } });

if (!tokStr.empty()) {
posinfo.len += utf8_strlen(tokStr.c_str());
Expand Down
12 changes: 6 additions & 6 deletions gui/qt/debugger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2261,7 +2261,7 @@ void MainWindow::osUpdate() {
QTableWidgetItem *opString = new QTableWidgetItem(dataString);
QTableWidgetItem *opValue;
try {
opValue = new QTableWidgetItem(QString::fromStdString(tivars::TH_GenericReal::makeStringFromData(vect)));
opValue = new QTableWidgetItem(QString::fromStdString(tivars::TypeHandlers::TH_GenericReal::makeStringFromData(vect)));
} catch (...) {
opValue = new QTableWidgetItem(TXT_NAN);
}
Expand Down Expand Up @@ -2311,7 +2311,7 @@ void MainWindow::osUpdate() {
QTableWidgetItem *fpString = new QTableWidgetItem(dataString);
QTableWidgetItem *fpValue;
try {
fpValue = new QTableWidgetItem(QString::fromStdString(tivars::TH_GenericReal::makeStringFromData(vect)));
fpValue = new QTableWidgetItem(QString::fromStdString(tivars::TypeHandlers::TH_GenericReal::makeStringFromData(vect)));
} catch(...) {
fpValue = new QTableWidgetItem(TXT_NAN);
}
Expand Down Expand Up @@ -2430,7 +2430,7 @@ void MainWindow::opModified(QTableWidgetItem *item) {
} else if (col == OP_VALUE_COL) {
array.fill(0);
try {
data_t value = tivars::TH_GenericReal::makeDataFromString(txt.toStdString());
data_t value = tivars::TypeHandlers::TH_GenericReal::makeDataFromString(txt.toStdString());
for (int i = 0; i < 11 && i < static_cast<int>(value.size()); i++) {
array[i] = value[i];
}
Expand Down Expand Up @@ -2458,7 +2458,7 @@ void MainWindow::opModified(QTableWidgetItem *item) {
ui->opView->item(row, OP_STRING_COL)->setText(data);
ui->opView->item(row, OP_DATA_COL)->setText(QString(array.toHex()));
try {
ui->opView->item(row, OP_VALUE_COL)->setText(QString::fromStdString(tivars::TH_GenericReal::makeStringFromData(vect)));
ui->opView->item(row, OP_VALUE_COL)->setText(QString::fromStdString(tivars::TypeHandlers::TH_GenericReal::makeStringFromData(vect)));
} catch(...) {
ui->opView->item(row, OP_VALUE_COL)->setText(TXT_NAN);
}
Expand Down Expand Up @@ -2495,7 +2495,7 @@ void MainWindow::fpModified(QTableWidgetItem *item) {
} else if (col == FP_VALUE_COL) {
array.fill(0);
try {
data_t value = tivars::TH_GenericReal::makeDataFromString(txt.toStdString());
data_t value = tivars::TypeHandlers::TH_GenericReal::makeDataFromString(txt.toStdString());
for (int i = 0; i < 9 && i < static_cast<int>(value.size()); i++) {
array[i] = value[i];
}
Expand Down Expand Up @@ -2523,7 +2523,7 @@ void MainWindow::fpModified(QTableWidgetItem *item) {
ui->fpStack->item(row, FP_STRING_COL)->setText(data);
ui->fpStack->item(row, FP_DATA_COL)->setText(QString(array.toHex()));
try {
ui->fpStack->item(row, FP_VALUE_COL)->setText(QString::fromStdString(tivars::TH_GenericReal::makeStringFromData(vect)));
ui->fpStack->item(row, FP_VALUE_COL)->setText(QString::fromStdString(tivars::TypeHandlers::TH_GenericReal::makeStringFromData(vect)));
} catch(...) {
ui->fpStack->item(row, FP_VALUE_COL)->setText(TXT_NAN);
}
Expand Down
2 changes: 1 addition & 1 deletion gui/qt/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ MainWindow::MainWindow(CEmuOpts &cliOpts, QWidget *p) : QMainWindow(p), ui(new U
// init tivars_lib stuff
tivars::TIModels::initTIModelsArray();
tivars::TIVarTypes::initTIVarTypesArray();
tivars::TH_Tokenized::initTokens();
tivars::TypeHandlers::TH_Tokenized::initTokens();

ui->centralWidget->hide();
ui->statusBar->addWidget(&m_speedLabel);
Expand Down
2 changes: 1 addition & 1 deletion gui/qt/tivars_lib_cpp
Submodule tivars_lib_cpp updated 35 files
+5 −2 README.md
+1 −1 TIVarsLib.js
+ − TIVarsLib.wasm
+10 −10 cli/cli.cpp
+7 −2 index.html
+7 −40 src/TIModel.cpp
+7 −15 src/TIModel.h
+46 −108 src/TIModels.cpp
+8 −52 src/TIModels.h
+41 −11 src/TIVarFile.cpp
+23 −3 src/TIVarFile.h
+5 −15 src/TIVarType.cpp
+10 −10 src/TIVarType.h
+54 −95 src/TIVarTypes.cpp
+5 −9 src/TIVarTypes.h
+6 −1 src/TypeHandlers/DummyHandler.cpp
+9 −1 src/TypeHandlers/STH_DataAppVar.cpp
+10 −1 src/TypeHandlers/STH_ExactFraction.cpp
+10 −1 src/TypeHandlers/STH_ExactFractionPi.cpp
+10 −1 src/TypeHandlers/STH_ExactPi.cpp
+10 −2 src/TypeHandlers/STH_ExactRadical.cpp
+11 −2 src/TypeHandlers/STH_FP.cpp
+14 −6 src/TypeHandlers/STH_PythonAppVar.cpp
+17 −2 src/TypeHandlers/TH_GDB.cpp
+9 −1 src/TypeHandlers/TH_GenericAppVar.cpp
+21 −10 src/TypeHandlers/TH_GenericComplex.cpp
+19 −2 src/TypeHandlers/TH_GenericList.cpp
+15 −9 src/TypeHandlers/TH_GenericReal.cpp
+19 −1 src/TypeHandlers/TH_Matrix.cpp
+8 −1 src/TypeHandlers/TH_TempEqu.cpp
+87 −21 src/TypeHandlers/TH_Tokenized.cpp
+97 −56 src/TypeHandlers/TypeHandlers.h
+913 −744 src/json.hpp
+1 −1 src/main_emscripten.cpp
+76 −18 tests.cpp
7 changes: 4 additions & 3 deletions gui/qt/utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "tivars_lib_cpp/src/TypeHandlers/TypeHandlers.h"

#include <array>
#include <tuple>

#include <QtCore/QDir>
#include <QtCore/QString>
Expand Down Expand Up @@ -59,12 +60,12 @@ QString int2hex(uint32_t a, uint8_t l) {
}

std::string calc_var_content_string(const calc_var_t &var) {
tivars::stringFromData_handler_t func;
decltype(&tivars::TypeHandlers::TH_TempEqu::makeStringFromData) func;
// We need to special case some specific temp-equ variables...
if (var.type == CALC_VAR_TYPE_EQU && var.name[0] == '$') {
func = &tivars::TH_TempEqu::makeStringFromData;
func = &tivars::TypeHandlers::TH_TempEqu::makeStringFromData;
} else {
func = tivars::TIVarType::createFromID(static_cast<uint>(var.type)).getHandlers().second;
func = std::get<1>(tivars::TIVarType::createFromID(static_cast<uint>(var.type)).getHandlers());
}
const options_t opts = (calc_var_is_prog(&var) || var.type == CALC_VAR_TYPE_STRING)
? options_t({ {"prettify", true} }) : options_t();
Expand Down

0 comments on commit 7089dc8

Please sign in to comment.