Merge branch 'master' into terminal-funcs

Author: JoeStrout

.gitignore

@@ -52,3 +52,6 @@ Debug
 miniscript-cpp.dir
 *.vcxproj*
 *.sln
+
+# Tests fallout
+_*.txt

MiniScript-cpp/src/DateTimeUtils.cpp

@@ -13,7 +13,9 @@
 
 #if _WIN32 || _WIN64
 struct tm *localtime_r( const time_t *timer, struct tm *buf ) {
-	*buf = *_localtime64(timer);
+	struct tm *newtime = _localtime64(timer);
+	if (newtime == nullptr) return nullptr;
+	*buf = *newtime;
 	return buf;
 }
 #endif
@@ -31,7 +33,8 @@ static bool Match(const String s, size_t *posB, const String match) {
 
 String FormatDate(time_t t, String formatSpec) {
 	tm dateTime;
-	localtime_r(&t, &dateTime);
+	struct tm *newtime = localtime_r(&t, &dateTime);
+	if (newtime == nullptr) return "";  // arg t too large
 
 	const int BUFSIZE = 128;
 	char buffer[BUFSIZE];
@@ -304,6 +307,7 @@ time_t ParseDate(const String dateStr) {
 		dateTime.tm_mon = now.tm_mon;
 		dateTime.tm_mday = now.tm_mday;
 	}
+	dateTime.tm_isdst = -1;
 	return mktime(&dateTime);
 }
 

MiniScript-cpp/src/MiniScript/MiniscriptLexer.cpp

@@ -37,7 +37,7 @@ namespace MiniScript {
 			case Token::Type::OpLesser: 		result = "OpLesser"; 		break;
 			case Token::Type::OpLessEqual: 		result = "OpLessEqual"; 	break;
 			case Token::Type::OpAssignPlus:		result = "OpAssignPlus";	break;
-			case Token::Type::OpAssignMinus:	result = "OpAssignPMinus";	break;
+			case Token::Type::OpAssignMinus:	result = "OpAssignMinus";	break;
 			case Token::Type::OpAssignTimes:	result = "OpAssignTimes";	break;
 			case Token::Type::OpAssignDivide:	result = "OpAssignDivide";	break;
 			case Token::Type::OpAssignMod:		result = "OpAssignMod";		break;

MiniScript-cpp/src/MiniScript/MiniscriptTypes.cpp

@@ -15,7 +15,6 @@
 
 #include <iostream>
 #include <math.h>
-#include <bit>
 
 namespace MiniScript {
 

MiniScript-cpp/src/ShellExec.cpp

@@ -41,14 +41,12 @@ String readFromFd(HANDLE fd, bool trimTrailingNewline=true) {
 		buffer[bytesRead] = '\0';
 		if (trimTrailingNewline and bytesRead < bufferSize-1 and bytesRead > 0 and buffer[bytesRead-1] == '\n') {
 			// Efficiently trim \n or \r\n from the end of the buffer
-			buffer[bytesRead-1] = '\0';
-			if (bytesRead > 1 and buffer[bytesRead-2] == '\r') {
-				buffer[bytesRead-2] = '\0';
-			}
+			bytesRead--;
+			if (bytesRead > 0 and buffer[bytesRead-1] == '\r') bytesRead--;
 			trimmed = true;
 		}
 
-		String s(buffer, bytesRead+1);
+		String s(buffer, bytesRead);
 		output += s;
 	}
 

MiniScript-cpp/src/ShellIntrinsics.cpp

@@ -50,7 +50,6 @@
 #else
 	#include <fcntl.h>
 	#include <unistd.h>
-	#include <unistd.h>
 	#include <dirent.h>		// for readdir
 	#include <libgen.h>		// for basename and dirname
 	#include <sys/stat.h>	// for stat
@@ -61,7 +60,6 @@
 		#include <sys/sendfile.h>
 	#endif
 	#define PATHSEP '/'
-	#include <unistd.h>
 	#include <sys/wait.h>
 #endif
 
@@ -105,15 +103,16 @@ class RawDataHandleStorage : public RefCountedStorage {
 	}
 	virtual ~RawDataHandleStorage() { free(data); }
 	void resize(size_t newSize) {
-		if (data) {
+		if (newSize == 0) {
+			free(data);
+			data = nullptr;
+			dataSize = 0;
+		} else {
 			void *newData = realloc(data, newSize);
 			if (newData) {
 				data = newData;
 				dataSize = newSize;
 			}
-		} else {
-			data = malloc(newSize);
-			if (data) dataSize = newSize;
 		}
 	}
 
@@ -350,8 +349,12 @@ static IntrinsicResult intrinsic_basename(Context *context, IntrinsicResult part
 		char extBuf[256];
 		_splitpath_s(pathStr.c_str(), driveBuf, sizeof(driveBuf), nullptr, 0, nameBuf, sizeof(nameBuf), extBuf, sizeof(extBuf));
 		String result = String(nameBuf) + String(extBuf);
-    #else
+	#elif defined(__APPLE__) || defined(__FreeBSD__)
 		String result(basename((char*)pathStr.c_str()));
+	#else
+		char *duplicate = strdup((char*)pathStr.c_str());
+		String result(basename(duplicate));
+		free(duplicate);
 	#endif
 	return IntrinsicResult(result);
 }
@@ -740,7 +743,7 @@ static IntrinsicResult intrinsic_readLines(Context *context, IntrinsicResult par
 					partialLine = "";
 				}
 				list.Add(line);
-				if (buf[i] == '\n' && i+1 < bytesRead && buf[i+1] == '\r') i++;
+				if (buf[i] == '\r' && i+1 < bytesRead && buf[i+1] == '\n') i++;
 				if (i+1 < bytesRead && buf[i+1] == 0) i++;
 				lineStart = i + 1;
 			}
@@ -749,6 +752,7 @@ static IntrinsicResult intrinsic_readLines(Context *context, IntrinsicResult par
 			partialLine = String(&buf[lineStart], bytesRead - lineStart);
 		}
 	}
+	if (!partialLine.empty()) list.Add(partialLine);
 	fclose(handle);
 	return IntrinsicResult(list);
 }
@@ -1139,7 +1143,6 @@ static IntrinsicResult intrinsic_rawDataSetUtf8(Context *context, IntrinsicResul
 	return IntrinsicResult(nBytes);
 }
 
-
 static IntrinsicResult intrinsic_keyAvailable(Context *context, IntrinsicResult partialResult) {
 	return IntrinsicResult(KeyAvailable());
 }
@@ -1330,7 +1333,6 @@ static IntrinsicResult intrinsic_exec(Context* context, IntrinsicResult partialR
 }
 #else
 
-
 static IntrinsicResult intrinsic_exec(Context *context, IntrinsicResult partialResult) {
 	double now = context->vm->RunTime();
 	if (partialResult.Done()) {
@@ -1362,7 +1364,6 @@ static IntrinsicResult intrinsic_exec(Context *context, IntrinsicResult partialR
 		return IntrinsicResult(data, false);
 	}
 }
-#endif
 
 static bool disallowAssignment(ValueDict& dict, Value key, Value value) {
 	return true;

MiniScript-cpp/src/main.cpp

@@ -317,6 +317,7 @@ int main(int argc, const char * argv[]) {
 			AddScriptPathVar(arg.c_str());
 			int rc = DoScriptFile(interp, arg);
 			if (!launchReplAfterScript) return rc;
+			break;
 		} else {
 			PrintHeaderInfo();
 			return ReturnErr(String("Unknown option: ") + arg);

MiniScript-cpp/tests/testDateTimeDateStr.ms

@@ -0,0 +1,8 @@
+import "qa"
+
+testDateTimeDateStr = function
+	qa.assertEqual _dateStr(0), "2000-01-01 00:00:00"
+	qa.assertEqual _dateStr(1e20), ""
+end function
+
+if refEquals(locals, globals) then testDateTimeDateStr

MiniScript-cpp/tests/testDaylight.ms

@@ -0,0 +1,14 @@
+import "qa"
+
+testDaylight = function
+	
+	// This test always only tests a half of functionality depending on whether the host system has "daylight savings" on or off.
+	
+	d = "2000-01-01 11:00:00"
+	qa.assertEqual _dateStr(d, "%H"), "11"
+	
+	d = "2000-07-01 11:00:00"
+	qa.assertEqual _dateStr(d, "%H"), "11"
+end function
+
+if refEquals(locals, globals) then testDaylight

MiniScript-cpp/tests/testFileName.ms

@@ -0,0 +1,12 @@
+import "qa"
+
+testDir = "tests/"
+
+testFileName = function
+	p = "a/b/"
+	n = file.name(p)
+	qa.assertEqual n, "b"
+	qa.assertEqual p, "a/b/"
+end function
+
+if refEquals(locals, globals) then testFileName