Rewrite decoder
This commit is contained in:
parent
e8ff5e0203
commit
368b7b42a8
159
qbrainfuck.cpp
159
qbrainfuck.cpp
@ -20,11 +20,11 @@ void QBrainfuck::on_encodeButton_clicked()
|
||||
ui->debugTextEdit->setHtml("");
|
||||
|
||||
// First pass : find decades/steps
|
||||
QList<char> decades; // Store the decades for initial loop
|
||||
QList<unsigned char> decades; // Store the decades for initial loop
|
||||
decades.append(0);
|
||||
QList<char> array; // Store the program's memory
|
||||
array.append(0);
|
||||
QList<char> steps; // Store the steps to construct the program
|
||||
QList<unsigned char> memory; // Store the program's memory
|
||||
memory.append(0);
|
||||
QList<unsigned char> steps; // Store the steps to construct the program
|
||||
|
||||
QString debugNumbers;
|
||||
QString debugChars;
|
||||
@ -32,25 +32,25 @@ void QBrainfuck::on_encodeButton_clicked()
|
||||
QByteArray::const_iterator textIterator;
|
||||
for (textIterator = text.constBegin(); textIterator != text.constEnd(); ++textIterator) {
|
||||
int max_diff = ui->maxSignsSpinBox->value()+1;
|
||||
QList<char>::iterator index;
|
||||
QList<unsigned char>::iterator index;
|
||||
|
||||
// Find nearest memory's case and store it
|
||||
QList<char>::iterator arrayIterator;
|
||||
for (arrayIterator = array.begin(); arrayIterator != array.end(); ++arrayIterator) {
|
||||
if (qAbs(*arrayIterator-*textIterator) < max_diff) {
|
||||
max_diff = qAbs(*arrayIterator-*textIterator);
|
||||
index = arrayIterator;
|
||||
QList<unsigned char>::iterator memoryIterator;
|
||||
for (memoryIterator = memory.begin(); memoryIterator != memory.end(); ++memoryIterator) {
|
||||
if (qAbs(*memoryIterator-*textIterator) < max_diff) {
|
||||
max_diff = qAbs(*memoryIterator-*textIterator);
|
||||
index = memoryIterator;
|
||||
}
|
||||
}
|
||||
|
||||
// Add step and insert current value in the array, else add a decade if we don't find a case nearer than max_diff
|
||||
// Add step and insert current value in the memory, else add a decade if we don't find a case nearer than max_diff
|
||||
if (max_diff <= ui->maxSignsSpinBox->value()) {
|
||||
steps.append(*index);
|
||||
*index = *textIterator;
|
||||
} else {
|
||||
steps.append(qRound(*textIterator/(float)ui->decadesSpinBox->value())*ui->decadesSpinBox->value());
|
||||
decades.append(qRound(*textIterator/(float)ui->decadesSpinBox->value())*ui->decadesSpinBox->value());
|
||||
array.append(*textIterator);
|
||||
memory.append(*textIterator);
|
||||
}
|
||||
|
||||
// Add current char to debug (with corresponding ASCII value)
|
||||
@ -65,30 +65,30 @@ void QBrainfuck::on_encodeButton_clicked()
|
||||
|
||||
ui->debugTextEdit->insertHtml("# The message<br /><br />" + QString(text) + "<br /><br /># In ASCII<br /><br />" + debugNumbers + "<br />" + debugChars + "<br /><br /># The memory<br /><br />");
|
||||
|
||||
for(int i = 0; i < ui->decadesSpinBox->value(); ++i) {
|
||||
for (int i = 0; i < ui->decadesSpinBox->value(); ++i) {
|
||||
program += "+";
|
||||
}
|
||||
|
||||
program += "\[";
|
||||
|
||||
QList<char>::iterator decadesIterator;
|
||||
QList<unsigned char>::iterator decadesIterator;
|
||||
for (decadesIterator = decades.begin()+1; decadesIterator != decades.end(); ++decadesIterator) {
|
||||
program += ">";
|
||||
for(int i = 0; i < *decadesIterator; i+=ui->decadesSpinBox->value()) {
|
||||
for (int i = 0; i < *decadesIterator; i+=ui->decadesSpinBox->value()) {
|
||||
program += "+";
|
||||
}
|
||||
}
|
||||
for(int i = 0; i < decades.size()-1; ++i) {
|
||||
for (int i = 0; i < decades.size()-1; ++i) {
|
||||
program += "<";
|
||||
}
|
||||
program += "-]";
|
||||
|
||||
// Print initial loop to debug
|
||||
QString debugText;
|
||||
for(int multiplier = 0; multiplier <= ui->decadesSpinBox->value(); ++multiplier) {
|
||||
for (int multiplier = 0; multiplier <= ui->decadesSpinBox->value(); ++multiplier) {
|
||||
debugText += " <b>" + formatNumber(ui->decadesSpinBox->value()-multiplier) + "</b>";
|
||||
|
||||
for(int i = 1; i < decades.length(); ++i) {
|
||||
for (int i = 1; i < decades.length(); ++i) {
|
||||
debugText += formatNumber(decades[i]/ui->decadesSpinBox->value()*multiplier);
|
||||
}
|
||||
|
||||
@ -99,27 +99,27 @@ void QBrainfuck::on_encodeButton_clicked()
|
||||
|
||||
int prev_ptr = 0;
|
||||
|
||||
QList<char>::const_iterator stepsIterator;
|
||||
QList<unsigned char>::const_iterator stepsIterator;
|
||||
textIterator = text.constBegin();
|
||||
for (stepsIterator = steps.constBegin(); stepsIterator != steps.constEnd(); ++stepsIterator) {
|
||||
int next_ptr = decades.indexOf(*stepsIterator);
|
||||
|
||||
if(next_ptr > prev_ptr) {
|
||||
for(int i = 0; i < next_ptr-prev_ptr; ++i) {
|
||||
if (next_ptr > prev_ptr) {
|
||||
for (int i = 0; i < next_ptr-prev_ptr; ++i) {
|
||||
program += ">";
|
||||
}
|
||||
} else {
|
||||
for(int i = 0; i < prev_ptr-next_ptr; ++i) {
|
||||
for (int i = 0; i < prev_ptr-next_ptr; ++i) {
|
||||
program += "<";
|
||||
}
|
||||
}
|
||||
|
||||
if(*textIterator > *stepsIterator) {
|
||||
for(int i = 0; i < *textIterator-*stepsIterator; ++i) {
|
||||
if (*textIterator > *stepsIterator) {
|
||||
for (int i = 0; i < *textIterator-*stepsIterator; ++i) {
|
||||
program += "+";
|
||||
}
|
||||
} else {
|
||||
for(int i = 0; i < *stepsIterator-*textIterator; ++i) {
|
||||
for (int i = 0; i < *stepsIterator-*textIterator; ++i) {
|
||||
program += "-";
|
||||
}
|
||||
}
|
||||
@ -129,7 +129,7 @@ void QBrainfuck::on_encodeButton_clicked()
|
||||
decades[next_ptr] = *textIterator;
|
||||
|
||||
// Print current memory and current letter
|
||||
printMemory(decades, decades.length(), next_ptr, " " + QString(*textIterator));
|
||||
printMemory(decades, next_ptr, " " + QString(*textIterator));
|
||||
|
||||
++textIterator;
|
||||
}
|
||||
@ -143,68 +143,74 @@ void QBrainfuck::on_decodeButton_clicked()
|
||||
ui->textTextEdit->setPlainText("");
|
||||
ui->debugTextEdit->setHtml("");
|
||||
|
||||
bool exit = false;
|
||||
int ptr = 0;
|
||||
int maxPtr = 0;
|
||||
QByteArray text = ui->programTextEdit->document()->toPlainText().toLatin1();
|
||||
QByteArray array = QByteArray(ui->arraySpinBox->value(), (char)0);
|
||||
QByteArray program = ui->programTextEdit->document()->toPlainText().toLatin1();
|
||||
QByteArray input = ui->inputLineEdit->text().toLatin1();
|
||||
QByteArray::const_iterator last_textIterator;
|
||||
QByteArray::const_iterator inputIterator = input.constBegin();
|
||||
|
||||
QByteArray::const_iterator textIterator;
|
||||
int loopCounter = 0;
|
||||
for (textIterator = text.constBegin(); textIterator != text.constEnd() && exit == false; ++textIterator) {
|
||||
QList<unsigned char> memory;
|
||||
QMap<int,int> correspondingBraces;
|
||||
QStack<int> loopStack;
|
||||
|
||||
switch (*textIterator) {
|
||||
memory.append(0);
|
||||
|
||||
for (int i = 0; i < program.size(); ++i) {
|
||||
switch (program.at(i)) {
|
||||
case '[':
|
||||
loopStack.push(i);
|
||||
break;
|
||||
case ']':
|
||||
if(loopStack.isEmpty()) {
|
||||
QMessageBox::critical(this, "QBrainfuck error", "Error: Unmatched end of loop");
|
||||
return;
|
||||
}
|
||||
int old_i = loopStack.pop();
|
||||
correspondingBraces.insert(i, old_i);
|
||||
correspondingBraces.insert(old_i, i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(!loopStack.isEmpty()) {
|
||||
QMessageBox::critical(this, "QBrainfuck error", "Error: Unmatched begin of loop");
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = 0; i < program.size(); ++i) {
|
||||
switch (program.at(i)) {
|
||||
case '>':
|
||||
++ptr;
|
||||
if (ptr >= ui->arraySpinBox->value()) {
|
||||
ptr = 0;
|
||||
}
|
||||
if(maxPtr < ptr) {
|
||||
maxPtr = ptr;
|
||||
if(ptr == memory.size()) {
|
||||
memory.append(0);
|
||||
}
|
||||
break;
|
||||
case '<':
|
||||
--ptr;
|
||||
if (ptr < 0) {
|
||||
ptr = ui->arraySpinBox->value()-1;
|
||||
maxPtr = ptr;
|
||||
QMessageBox::critical(this, "QBrainfuck error", "Error: Pointer went under 0");
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case '+':
|
||||
array[ptr] = array.at(ptr) + 1;
|
||||
++memory[ptr];
|
||||
break;
|
||||
case '-':
|
||||
array[ptr] = array.at(ptr) - 1;
|
||||
--memory[ptr];
|
||||
break;
|
||||
case '.':
|
||||
ui->textTextEdit->insertPlainText(QString(array.at(ptr)));
|
||||
printMemory(array, maxPtr, ptr, "OUTPUT: " + QString(array.at(ptr)));
|
||||
ui->textTextEdit->insertPlainText(QString(memory.at(ptr)));
|
||||
break;
|
||||
case ',':
|
||||
array[ptr] = *inputIterator;
|
||||
memory[ptr] = *inputIterator;
|
||||
++inputIterator;
|
||||
printMemory(array, maxPtr, ptr, "INPUT: " + QString(array.at(ptr)));
|
||||
break;
|
||||
case '[':
|
||||
last_textIterator = textIterator;
|
||||
loopCounter = 0;
|
||||
printMemory(array, maxPtr, ptr, "LOOP BEG. ");
|
||||
if (memory.at(ptr) == 0) {
|
||||
i = correspondingBraces.value(i);
|
||||
}
|
||||
break;
|
||||
case ']':
|
||||
if(array.at(ptr)!=0) {
|
||||
textIterator = last_textIterator;
|
||||
++loopCounter;
|
||||
|
||||
if (loopCounter >= ui->loopSpinBox->value()) {
|
||||
QMessageBox::critical(this, "QBrainfuck", "Error: Loop too long");
|
||||
exit = true;
|
||||
}
|
||||
printMemory(array, maxPtr, ptr, "LOOP ");
|
||||
} else {
|
||||
printMemory(array, maxPtr, ptr, "LOOP END ");
|
||||
if (memory.at(ptr) != 0) {
|
||||
i = correspondingBraces.value(i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -217,7 +223,7 @@ void QBrainfuck::on_motifButton_clicked()
|
||||
QByteArray program = ui->programTextEdit->document()->toPlainText().toLatin1();
|
||||
|
||||
if (motif.contains(QRegExp(">|<|\\+|-|\\.|,|\\[|\\]"))) {
|
||||
QMessageBox::critical(this, "QBrainfuck", "Error: Motif contains Brainfuck characters");
|
||||
QMessageBox::critical(this, "QBrainfuck error", "Error: Motif contains Brainfuck characters");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -280,7 +286,7 @@ void QBrainfuck::on_saveButton_clicked()
|
||||
return;
|
||||
}
|
||||
|
||||
if(dialog.selectedNameFilter() == "Json Files (*.json)") {
|
||||
if (dialog.selectedNameFilter() == "Json Files (*.json)") {
|
||||
QJsonObject jsonObject;
|
||||
|
||||
jsonObject["text"] = ui->textTextEdit->document()->toPlainText();
|
||||
@ -329,7 +335,7 @@ void QBrainfuck::on_loadButton_clicked()
|
||||
|
||||
QString QBrainfuck::formatNumber(int number)
|
||||
{
|
||||
if(number < 10) {
|
||||
if (number < 10) {
|
||||
return " " + QString().setNum(number);
|
||||
} else if (number < 100) {
|
||||
return " " + QString().setNum(number);
|
||||
@ -338,27 +344,14 @@ QString QBrainfuck::formatNumber(int number)
|
||||
}
|
||||
}
|
||||
|
||||
void QBrainfuck::printMemory(QByteArray array, int maxPtr, int ptr, QString text)
|
||||
void QBrainfuck::printMemory(QList<unsigned char> memory, int ptr, QString text)
|
||||
{
|
||||
QString str;
|
||||
for(int i = 0; i <= maxPtr; ++i) {
|
||||
if(i == ptr) {
|
||||
str += "<b>" + formatNumber(array[i]) + "</b>";
|
||||
for (int i = 0; i < memory.size(); ++i) {
|
||||
if (i == ptr) {
|
||||
str += "<b>" + formatNumber(memory[i]) + "</b>";
|
||||
} else {
|
||||
str += formatNumber(array[i]);
|
||||
}
|
||||
}
|
||||
ui->debugTextEdit->insertHtml(text + str + "<br />");
|
||||
}
|
||||
|
||||
void QBrainfuck::printMemory(QList<char> array, int maxPtr, int ptr, QString text)
|
||||
{
|
||||
QString str;
|
||||
for(int i = 0; i < maxPtr; ++i) {
|
||||
if(i == ptr) {
|
||||
str += "<b>" + formatNumber(array[i]) + "</b>";
|
||||
} else {
|
||||
str += formatNumber(array[i]);
|
||||
str += formatNumber(memory[i]);
|
||||
}
|
||||
}
|
||||
ui->debugTextEdit->insertHtml(text + str + "<br />");
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#include <QFileDialog>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QStack>
|
||||
|
||||
namespace Ui {
|
||||
class QBrainfuck;
|
||||
@ -42,8 +43,7 @@ private:
|
||||
Ui::QBrainfuck *ui;
|
||||
|
||||
QString formatNumber(int number);
|
||||
void printMemory(QByteArray array, int maxPtr, int ptr, QString text);
|
||||
void printMemory(QList<char> array, int maxPtr, int ptr, QString text);
|
||||
void printMemory(QList<unsigned char> memory, int ptr, QString text);
|
||||
};
|
||||
|
||||
#endif // QBRAINFUCK_H
|
||||
|
||||
@ -176,50 +176,30 @@
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="loopLabel">
|
||||
<property name="text">
|
||||
<string>Max loop length</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QSpinBox" name="loopSpinBox">
|
||||
<property name="maximum">
|
||||
<number>100000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>500</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="arrayLabel">
|
||||
<property name="text">
|
||||
<string>Array size</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="arraySpinBox">
|
||||
<property name="maximum">
|
||||
<number>100000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>100</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="inputLabel">
|
||||
<property name="text">
|
||||
<string>Input</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="inputLineEdit"/>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="regexLineEdit">
|
||||
<property name="text">
|
||||
<string>#</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="regexLabel">
|
||||
<property name="text">
|
||||
<string>Motif regex</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
@ -236,6 +216,12 @@
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QSpinBox" name="maxSignsSpinBox">
|
||||
<property name="minimum">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>255</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>10</number>
|
||||
</property>
|
||||
@ -248,22 +234,14 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="regexLabel">
|
||||
<property name="text">
|
||||
<string>Motif regex</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLineEdit" name="regexLineEdit">
|
||||
<property name="text">
|
||||
<string>#</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QSpinBox" name="decadesSpinBox">
|
||||
<property name="minimum">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>255</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>10</number>
|
||||
</property>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user