Merge branch 'development'

JamesBoer · Jan 5, 2023 · e8dc44b · e8dc44b
2 parents f2280a7 + 02ff797
commit e8dc44b
Show file tree

Hide file tree

Showing 13 changed files with 6,967 additions and 3,010 deletions.
diff --git a/Docs/API/html/_jinx_8h.html b/Docs/API/html/_jinx_8h.html
@@ -213,7 +213,7 @@
 <tr class="memdesc:a1c7318012adc2d64540cd28ed5f78b01"><td class="mdescLeft">&#160;</td><td class="mdescRight">Minor version number. <br /></td></tr>
 <tr class="separator:a1c7318012adc2d64540cd28ed5f78b01"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ae0e5e517609d07abbe8c6aa37e974d3a"><td class="memItemLeft" align="right" valign="top"><a id="ae0e5e517609d07abbe8c6aa37e974d3a"></a>
-const uint32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="_jinx_8h.html#ae0e5e517609d07abbe8c6aa37e974d3a">Jinx::PatchNumber</a> = 4</td></tr>
+const uint32_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="_jinx_8h.html#ae0e5e517609d07abbe8c6aa37e974d3a">Jinx::PatchNumber</a> = 10</td></tr>
 <tr class="memdesc:ae0e5e517609d07abbe8c6aa37e974d3a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Patch number. <br /></td></tr>
 <tr class="separator:ae0e5e517609d07abbe8c6aa37e974d3a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>

diff --git a/Docs/API/html/_jinx_8h_source.html b/Docs/API/html/_jinx_8h_source.html
diff --git a/Docs/Changelog.md b/Docs/Changelog.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [1.3.10] - 2023-01-05
+
+- Updated Catch2 to fix several compilation issues
+- Correct error in tutorial about precedence of functions
+
 ## [1.3.9] - 2022-06-17
 
 - Fixed issue with duplicate non-local function registration

diff --git a/Docs/Tutorial.docx b/Docs/Tutorial.docx
diff --git a/Docs/Tutorial.htm b/Docs/Tutorial.htm
diff --git a/Docs/Tutorial.pdf b/Docs/Tutorial.pdf
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 = 9;
+	const uint32_t PatchNumber = 10;
 
 	// Forward declaration
 	class IScript;
@@ -5604,6 +5604,7 @@ namespace Jinx::Impl
 
 	inline uint32_t Parser::GetOperatorPrecedence(Opcode opcode) const
 	{
+		// Lower values mean higher precedence
 		switch (opcode)
 		{
 		case Opcode::Multiply: return 1;

diff --git a/README.md b/README.md
@@ -45,5 +45,5 @@ There is a [more comprehensive tutorial](https://jamesboer.github.io/Jinx/Tutori
 
 ## Jinx Status
 
-Jinx was released as 1.0.0 (stable) on January 1, 2019, after three years of development, refinement, and testing.  Additional work, for the immediate future, will be restricted to bug fixing or critical refinements, with the intention of retaining backwards compatibility.
+Jinx was released as 1.0.0 (stable) on January 1, 2019, after three years of development, refinement, and testing.  Since then, mostly minor language features and API enhancements have been edded.  Additional work, for the immediate future, will be restricted to bug fixing or critical refinements, with the intention of retaining backwards compatibility.
 
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 = 9;
+	const uint32_t PatchNumber = 10;
 
 	// Forward declaration
 	class IScript;

diff --git a/Source/JxParser.cpp b/Source/JxParser.cpp
@@ -167,6 +167,7 @@ namespace Jinx::Impl
 
 	inline_t uint32_t Parser::GetOperatorPrecedence(Opcode opcode) const
 	{
+		// Lower values mean higher precedence
 		switch (opcode)
 		{
 		case Opcode::Multiply: return 1;

diff --git a/Tests/UnitTests/TestCasts.cpp b/Tests/UnitTests/TestCasts.cpp
@@ -90,4 +90,4 @@ TEST_CASE("Test Casts", "[Casts]")
 		REQUIRE(script->GetVariable("a").GetGuid() == guid);
 	}
 
-}
+}
diff --git a/Tests/UnitTests/UnitTest.h b/Tests/UnitTests/UnitTest.h
@@ -39,4 +39,4 @@ Jinx::ScriptPtr TestCreateScript(const char * scriptText, Jinx::RuntimePtr runti
 Jinx::ScriptPtr TestExecuteScript(const char * scriptText, Jinx::RuntimePtr runtime = nullptr, JinxAny userContext = nullptr);
 bool TestExecuteScript(Jinx::ScriptPtr script);
 
-#endif // UNIT_TESTS_H____
+#endif // UNIT_TESTS_H____