Merge branch 'development'

JamesBoer · Jun 18, 2022 · f2280a7 · f2280a7
2 parents 6ddfe82 + ccd4999
commit f2280a7
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ Build/
 
 
 .DS_Store
+
+.idea/
diff --git a/Docs/Changelog.md b/Docs/Changelog.md
@@ -1,12 +1,19 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [1.3.7] - 2022-03-27
+## [1.3.9] - 2022-06-17
+
+- Fixed issue with duplicate non-local function registration
+- Fix unit tests to allow easier max instruction tests
+- Minor spelling corrections
+- Corrected previously out-of-sync patch messages in changelog
+
+## [1.3.8] - 2022-03-27
 
 - Improved error messages
 - Fixed URL to tutorial in JinxPad
 
-## [1.3.6] - 2022-03-27
+## [1.3.7] - 2022-03-27
 
 - Fixed memory allocation stats in amalgamated header
 

diff --git a/Include/Jinx.hpp b/Include/Jinx.hpp
@@ -768,7 +768,7 @@ namespace Jinx
 	const uint32_t MinorVersion = 3;
 
 	/// Patch number
-	const uint32_t PatchNumber = 8;
+	const uint32_t PatchNumber = 9;
 
 	// Forward declaration
 	class IScript;
@@ -5174,7 +5174,7 @@ namespace Jinx::Impl
 		if (!signature.IsValid())
 			return false;
 
-		// Register function in library table.  This allows the the parser to find
+		// Register function in library table.  This allows the parser to find
 		// and use this function.
 		RegisterFunctionSignature(signature);
 
@@ -5192,7 +5192,10 @@ namespace Jinx::Impl
 	inline void Library::RegisterFunctionSignature(const FunctionSignature & signature)
 	{
 		std::lock_guard<std::mutex> lock(m_functionMutex);
-		m_functionList.push_back(signature);
+        auto itr = std::find(m_functionList.begin(), m_functionList.end(), signature);
+        if (itr != m_functionList.end())
+            return;
+        m_functionList.push_back(signature);
 	}
 
 	inline bool Library::RegisterProperty(Visibility visibility, Access access, const String & name, const Variant & value)
@@ -9723,7 +9726,7 @@ namespace Jinx::Impl
 				auto result = op1 - op2;
 				if (result.IsNull())
 				{
-					Error("Invalid variable for subraction");
+					Error("Invalid variable for subtraction");
 					return false;
 				}
 				Push(result);

diff --git a/Source/Jinx.h b/Source/Jinx.h
@@ -106,7 +106,7 @@ namespace Jinx
 	const uint32_t MinorVersion = 3;
 
 	/// Patch number
-	const uint32_t PatchNumber = 8;
+	const uint32_t PatchNumber = 9;
 
 	// Forward declaration
 	class IScript;

diff --git a/Source/JxLibrary.cpp b/Source/JxLibrary.cpp
@@ -104,7 +104,7 @@ namespace Jinx::Impl
 		if (!signature.IsValid())
 			return false;
 
-		// Register function in library table.  This allows the the parser to find
+		// Register function in library table.  This allows the parser to find
 		// and use this function.
 		RegisterFunctionSignature(signature);
 
@@ -122,7 +122,10 @@ namespace Jinx::Impl
 	inline_t void Library::RegisterFunctionSignature(const FunctionSignature & signature)
 	{
 		std::lock_guard<std::mutex> lock(m_functionMutex);
-		m_functionList.push_back(signature);
+        auto itr = std::find(m_functionList.begin(), m_functionList.end(), signature);
+        if (itr != m_functionList.end())
+            return;
+        m_functionList.push_back(signature);
 	}
 
 	inline_t bool Library::RegisterProperty(Visibility visibility, Access access, const String & name, const Variant & value)

diff --git a/Source/JxScript.cpp b/Source/JxScript.cpp
@@ -990,7 +990,7 @@ namespace Jinx::Impl
 				auto result = op1 - op2;
 				if (result.IsNull())
 				{
-					Error("Invalid variable for subraction");
+					Error("Invalid variable for subtraction");
 					return false;
 				}
 				Push(result);

diff --git a/Tests/Features/Main.cpp b/Tests/Features/Main.cpp
@@ -11,6 +11,7 @@ Copyright (c) 2016 James Boer
 #include <string.h>
 #include <assert.h>
 #include <stdexcept>
+#include <inttypes.h>
 
 #include "../../Source/Jinx.h"
 
@@ -83,9 +84,9 @@ int main(int argc, char ** argv)
 	auto memStats = GetMemoryStats();
 	printf("\nMemory Stats\n");
 	printf("-------------\n");
-	printf("Allocation count: %zu\n", memStats.allocationCount);
-	printf("Free count: %zu\n", memStats.freeCount);
-	printf("Allocated memory: %zu bytes\n", memStats.allocatedMemory);
+	printf("Allocation count: %" PRIu64 "\n", memStats.allocationCount);
+	printf("Free count: %" PRIu64 "\n", memStats.freeCount);
+	printf("Allocated memory: %" PRIu64 " bytes\n", memStats.allocatedMemory);
 
 	return 0;
 }
diff --git a/Tests/UnitTests/TestCollections.cpp b/Tests/UnitTests/TestCollections.cpp
@@ -533,7 +533,6 @@ TEST_CASE("Test Collections", "[Collections]")
 
 		auto script = TestExecuteScript(scriptText);
 		REQUIRE(script);
-		REQUIRE(script->Execute());
 		REQUIRE(script->GetVariable("a") == 2);
 	}
 
@@ -547,7 +546,7 @@ TEST_CASE("Test Collections", "[Collections]")
 			)";
 
 		auto script = TestExecuteScript(scriptText);
-		REQUIRE(script->Execute());
+        REQUIRE(script);
 		REQUIRE(script->GetVariable("a") == 5);
 	}
 
@@ -561,7 +560,7 @@ TEST_CASE("Test Collections", "[Collections]")
 			)";
 
 		auto script = TestExecuteScript(scriptText);
-		REQUIRE(script->Execute());
+		REQUIRE(script);
 		REQUIRE(script->GetLibrary()->GetProperty("a") == 5);
 	}
 
@@ -644,7 +643,7 @@ TEST_CASE("Test Collections", "[Collections]")
 
 		auto script = TestCreateScript(scriptText);
 		script->SetVariable("text", tableText);
-		REQUIRE(script->Execute());
+		REQUIRE(TestExecuteScript(script));
 		REQUIRE(script->GetVariable("table").IsCollection());
 		REQUIRE(script->GetVariable("a") == "Test Name A");
 		REQUIRE(script->GetVariable("b") == 2);
@@ -680,7 +679,7 @@ TEST_CASE("Test Collections", "[Collections]")
 		Variant table = tableText;
 		REQUIRE(table.ConvertTo(ValueType::Collection));
 		script->SetVariable("table", table);
-		REQUIRE(script->Execute());
+        REQUIRE(TestExecuteScript(script));
 		REQUIRE(script->GetVariable("table").IsCollection());
 		REQUIRE(script->GetVariable("a") == "Test Name A");
 		REQUIRE(script->GetVariable("b") == 2);
@@ -716,7 +715,7 @@ TEST_CASE("Test Collections", "[Collections]")
 		Variant table = tableText;
 		REQUIRE(table.ConvertTo(ValueType::Collection));
 		script->SetVariable("table", table);
-		REQUIRE(script->Execute());
+        REQUIRE(TestExecuteScript(script));
 		REQUIRE(script->GetVariable("table").IsCollection());
 		REQUIRE(script->GetVariable("a") == "Test Name A");
 		REQUIRE(script->GetVariable("b") == 2);
@@ -746,7 +745,7 @@ TEST_CASE("Test Collections", "[Collections]")
 
 		auto script = TestCreateScript(scriptText);
 		script->SetVariable("text", tableText);
-		REQUIRE(script->Execute());
+        REQUIRE(TestExecuteScript(script));
 		REQUIRE(script->GetVariable("table").IsCollection());
 		REQUIRE(script->GetVariable("a") == "Test 1, 2, 3");
 		REQUIRE(script->GetVariable("b") == "Test 4");
@@ -771,7 +770,7 @@ TEST_CASE("Test Collections", "[Collections]")
 
 		auto script = TestCreateScript(scriptText);
 		script->SetVariable("text", tableText);
-		REQUIRE(script->Execute());
+        REQUIRE(TestExecuteScript(script));
 		REQUIRE(script->GetVariable("table").IsCollection());
 		REQUIRE(script->GetVariable("a") == "\"Quoted text\"");
 	}
@@ -795,7 +794,7 @@ TEST_CASE("Test Collections", "[Collections]")
 
 		auto script = TestCreateScript(scriptText);
 		script->SetVariable("text", tableText);
-		REQUIRE(script->Execute());
+        REQUIRE(TestExecuteScript(script));
 		REQUIRE(script->GetVariable("table").IsCollection());
 		REQUIRE(script->GetVariable("a").GetNumber() == Approx(123.456));
 	}