Merge branch 'rewrite-export' of https://github.com/ZnPdCo/Project_LemonLime into rewrite-export

Author: ZnPdCo

src/base/LemonBaseApplication.cpp

@@ -22,7 +22,7 @@ using namespace Lemon;
 auto LemonBaseApplication::Initialize() -> bool {
 	QString errorMessage;
 	bool canContinue;
-	const auto hasError = parseCommandLine(&canContinue, &errorMessage);
+	const auto hasError = ! parseCommandLine(&canContinue, &errorMessage);
 	if (hasError) {
 		LOG("Command line: " GEN_PAIR(errorMessage));
 		if (! canContinue) {
@@ -48,7 +48,7 @@ auto LemonBaseApplication::Initialize() -> bool {
 		}
 	}
 	LemonLimeTranslator->InstallTranslation(settings->getUiLanguage());
-
+	delete settings;
 	return true;
 }
 

src/base/LemonLog.hpp

@@ -48,10 +48,10 @@ Q_DECLARE_METATYPE(const char *)
 
 namespace Lemon::base {
 	inline std::shared_ptr<spdlog::logger> logger;
-	inline QString tempBuffer;
-	inline QTextStream tempStream{&tempBuffer};
 
 	template <LemonLogType t, typename... T> inline void log_concat(T... v) {
+		QString tempBuffer;
+		QTextStream tempStream{&tempBuffer};
 		((tempStream << v << " "), ...);
 
 		const auto logString = tempStream.readAll().toStdString();

src/base/LemonTranslator.cpp

@@ -55,6 +55,7 @@ namespace Lemon::common {
 				bool success = translatorNew->load(code + ".qm", path);
 				if (! success) {
 					LOG("Cannot load translation: " + code);
+					return false;
 				}
 				if (pTranslator) {
 					LOG("Removed translations");

src/base/settings.cpp

@@ -533,7 +533,7 @@ void Settings::loadSettings() {
 	rejudgeTimes = settings.value("MaximumRejudgeTimes", 1).toInt();
 	maxJudgingThreads = settings.value("MaximumJudgingThreads", 1).toInt();
 	defaultInputFileExtension = settings.value("DefaultInputFileExtension", "in").toString();
-	defaultOutputFileExtension = settings.value("DefaultOuputFileExtension", "out").toString();
+	defaultOutputFileExtension = settings.value("DefaultOutputFileExtension", "out").toString();
 	inputFileExtensions = settings.value("InputFileExtensions", QStringList() << "in").toStringList();
 	outputFileExtensions =
 	    settings.value("OutputFileExtensions", QStringList() << "out" << "ans").toStringList();

src/base/settings.h

@@ -142,7 +142,6 @@ class Settings {
 	static double upperBoundForExtraTimeRatio();
 	static QString dataPath();
 	static QString sourcePath();
-	static QString temporaryPath();
 	static QString selfTestPath();
 
   private:

src/core/judgingthread.cpp

@@ -98,12 +98,21 @@ auto JudgingThread::getNeedRejudge() const -> bool { return needRejudge; }
 
 void JudgingThread::stopJudgingSlot() { stopJudging = true; }
 
+// Chunked file reader used by the line/space comparators below.
+//
+// nextUntilNewLine() / nextUntilSpace() return at most 32 chars per call --
+// they do NOT truncate a long line; callers must loop until eof() to consume
+// the whole line/token. The 32-byte cap keeps `result` (a fixed-capacity
+// std::string reserved at 32) from reallocating, which is the hot path of
+// per-test-case comparison.
 class BufferedStreamReader {
 
   public:
 	static const int BUFFER_SIZE = 1 << 18; // 128 KiB
 	explicit BufferedStreamReader(const char *filename) : file(fopen(filename, "r")) {
 		result.reserve(32);
+		// Start with bufPos == bufEnd so the first peekChar() triggers an
+		// fread; avoids a separate "primed?" flag.
 		bufPos = buffer + BUFFER_SIZE;
 		bufEnd = buffer + BUFFER_SIZE;
 		lineNumber = 1;
@@ -140,6 +149,8 @@ auto BufferedStreamReader::peekChar() -> char {
 		return '\0';
 	}
 	if (bufPos == bufEnd) {
+		// Buffer drained -- refill. fread returning 0 means real EOF; latch it
+		// so further peekChar() calls short-circuit without touching the FILE*.
 		bufPos = buffer;
 		bufEnd = buffer + fread(buffer, 1, BUFFER_SIZE, file);
 		if (bufPos == bufEnd) {
@@ -150,6 +161,9 @@ auto BufferedStreamReader::peekChar() -> char {
 	return *bufPos;
 }
 
+// Consume one line terminator (\n, \r, or \r\n) if the cursor sits on one,
+// and bump lineNumber. Idempotent when not on a terminator -- safe to call
+// before each token read.
 void BufferedStreamReader::tryNextLine() {
 	char c = peekChar();
 	if (c != '\r' && c != '\n')
@@ -162,6 +176,11 @@ void BufferedStreamReader::tryNextLine() {
 	lineNumber++;
 }
 
+// Read up to 32 chars from the current position, stopping at any line
+// terminator or EOF. Does NOT consume the terminator -- the next call to
+// tryNextLine() (invoked at the top here) will. Returning a chunk shorter
+// than 32 chars is the signal that the caller has reached end-of-line/EOF;
+// otherwise the caller must call again to read the rest of a long line.
 auto BufferedStreamReader::nextUntilNewLine() -> std::string_view {
 	result.clear();
 	tryNextLine();
@@ -175,6 +194,10 @@ auto BufferedStreamReader::nextUntilNewLine() -> std::string_view {
 	return result;
 }
 
+// Skip leading whitespace (advancing lineNumber across newlines), then read
+// up to 32 non-space chars. Same chunked-read contract as nextUntilNewLine:
+// short return means token end; long tokens must be read across multiple
+// calls. Returns an empty view at EOF.
 auto BufferedStreamReader::nextUntilSpace() -> std::string_view {
 	result.clear();
 	for (char c = peekChar(); std::isspace(c) && ! eof(); c = peekChar())
@@ -482,7 +505,7 @@ void JudgingThread::lemonSpecialJudge(const QString &fileName) {
 	bool flag = false;
 
 	while (timer.elapsed() < specialJudgeTimeLimit) {
-		if (judge->state() != QProcess::Running) {
+		if (judge->waitForFinished(10)) {
 			flag = true;
 			break;
 		}
@@ -493,8 +516,6 @@ void JudgingThread::lemonSpecialJudge(const QString &fileName) {
 			judge->kill();
 			return;
 		}
-
-		msleep(10);
 	}
 
 	if (! flag) {
@@ -592,7 +613,7 @@ void JudgingThread::testlibSpecialJudge(const QString &fileName) {
 	bool flag = false;
 
 	while (timer.elapsed() < specialJudgeTimeLimit) {
-		if (judge->state() != QProcess::Running) {
+		if (judge->waitForFinished(10)) {
 			flag = true;
 			break;
 		}
@@ -603,8 +624,6 @@ void JudgingThread::testlibSpecialJudge(const QString &fileName) {
 			judge->kill();
 			return;
 		}
-
-		msleep(10);
 	}
 
 	if (! flag) {

src/core/processrunner_unix.cpp

@@ -186,7 +186,7 @@ ProcessRunnerResult UnixProcessRunner::run() {
 	// so here it is rounded up to an integer second.
 	long long killTimeLimit = (config.timeLimit + 999) / 1000 * 1000 + extraTime;
 	while (timer.elapsed() <= killTimeLimit) {
-		if (runner->state() != QProcess::Running) {
+		if (runner->waitForFinished(10)) {
 			isProgramFinishedInExtraTimeLimit = true;
 			break;
 		}
@@ -200,8 +200,6 @@ ProcessRunnerResult UnixProcessRunner::run() {
 
 			return res;
 		}
-
-		QThread::msleep(10);
 	}
 
 	if (! isProgramFinishedInExtraTimeLimit) {

src/core/processrunner_win.cpp

@@ -39,7 +39,8 @@ namespace {
 		    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789");
 		std::mt19937 gen(std::random_device{}());
 
-		std::uniform_int_distribution<int> rand(0, possibleCharacters.length());
+		std::uniform_int_distribution<int> rand(0, // [0, length of possibleCharacters - 1]
+		                                        possibleCharacters.length() - 1);
 		QString randomString;
 		for (int i = 0; i < length; ++i) {
 			int index = rand(gen) % possibleCharacters.length();

src/core/taskjudger.cpp

@@ -261,7 +261,7 @@ auto TaskJudger::traditionalTaskPrepare() -> bool {
 				bool flag = false;
 
 				while (timer.elapsed() < settings->getCompileTimeLimit()) {
-					if (compilerProcess.state() != QProcess::Running) {
+					if (compilerProcess.waitForFinished(10)) {
 						flag = true;
 						break;
 					}
@@ -272,7 +272,6 @@ auto TaskJudger::traditionalTaskPrepare() -> bool {
 						compilerProcess.kill();
 						return false;
 					}
-					QThread::msleep(10);
 				}
 
 				if (! flag) {

src/generalsettings.cpp

@@ -131,6 +131,7 @@ auto GeneralSettings::checkValid() -> bool {
 	if (ui->rejudgeTimes->text().isEmpty()) {
 		ui->rejudgeTimes->setFocus();
 		QMessageBox::warning(this, tr("Error"), tr("Empty maximum rejudge times!"), QMessageBox::Close);
+		return false;
 	}
 
 	return true;