Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-19 08:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update JSBaker.cpp

Browse source
This commit is contained in:
utkarshgautamnyu 2017-10-12 11:34:28 -07:00 committed by GitHub
parent 6e4a5da69d
commit f3983b3edc
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/baking/src/JSBaker.cpp
View file

@ -38,7 +38,7 @@ void JSBaker::bake() {
QByteArray outputJS;
// Call baking on inputJS and store result in outputJS
bool success = bakeJS(&inputJS, &outputJS);
bool success = bakeJS(inputJS, outputJS);
if (!success) {
qCDebug(js_baking) << "Bake Failed";
handleError("Unterminated multi-line comment");
@ -69,9 +69,9 @@ void JSBaker::bake() {
emit finished();
}
bool JSBaker::bakeJS(const QByteArray* inputFile, QByteArray* outputFile) {
bool JSBaker::bakeJS(const QByteArray& inputFile, QByteArray& outputFile) {
// Read from inputFile and write to outputFile per character
QTextStream in(*inputFile, QIODevice::ReadOnly);
QTextStream in(inputFile, QIODevice::ReadOnly);
QTextStream out(outputFile, QIODevice::WriteOnly);
// Algorithm requires the knowledge of previous and next character for each character read
@ -90,7 +90,7 @@ bool JSBaker::bakeJS(const QByteArray* inputFile, QByteArray* outputFile) {
} else if (currentCharacter == '/') {
// Check if single line comment i.e. //
if (nextCharacter == '/') {
handleSingleLineComments(&in);
handleSingleLineComments(in);
//Start fresh after handling comments
previousCharacter = '\n';
@ -98,7 +98,7 @@ bool JSBaker::bakeJS(const QByteArray* inputFile, QByteArray* outputFile) {
continue;
} else if (nextCharacter == '*') {
// Check if multi line comment i.e. /*
bool success = handleMultiLineComments(&in);
bool success = handleMultiLineComments(in);
if (!success) {
// Errors present return false
return false;
@ -175,22 +175,22 @@ bool JSBaker::bakeJS(const QByteArray* inputFile, QByteArray* outputFile) {
return true;
}
void JSBaker::handleSingleLineComments(QTextStream* in) {
void JSBaker::handleSingleLineComments(QTextStream& in) {
QChar character;
while (!in->atEnd()) {
*in >> character;
while (!in.atEnd()) {
in >> character;
if (character == '\n') {
break;
}
}
}
bool JSBaker::handleMultiLineComments(QTextStream* in) {
bool JSBaker::handleMultiLineComments(QTextStream& in) {
QChar character;
while (!in->atEnd()) {
*in >> character;
while (!in.atEnd()) {
in >> character;
if (character == '*') {
if (in->read(1) == '/') {
if (in.read(1) == '/') {
return true;
}
}