Move to v0.6.1 by upgrading Parser and IR

Author: srydell

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(
   Frontend.py
-  VERSION 0.6.0
+  VERSION 0.6.1
   LANGUAGES CXX)
 
 configure_file(docs/ReleaseNotes/version.in
@@ -37,7 +37,7 @@ include(FetchContent)
 FetchContent_Declare(
   IRSpecification
   GIT_REPOSITORY https://github.com/Tolc-Software/IntermediateRepresentation.git
-  GIT_TAG v0.14.0)
+  GIT_TAG v0.15.1)
 
 FetchContent_MakeAvailable(IRSpecification)
 

docs/ReleaseNotes/v0.6.1.md

@@ -0,0 +1,5 @@
+# News #
+
+## Bindings ##
+
+* Update to Parser v0.5.6 and IR v0.15.1

src/Pybind/Builders/classBuilder.cpp

@@ -141,7 +141,7 @@ buildClass(IR::Struct const& cppClass, Pybind::Proxy::TypeInfo& typeInfo) {
 		pyClass.addMemberVariable(variable.m_name,
 		                          variable.m_documentation,
 		                          variable.m_type.m_isConst,
-		                          variable.m_type.m_isStatic);
+		                          variable.m_isStatic);
 	}
 
 	// Add default constructor

tests/CMakeLists.txt

@@ -1,7 +1,7 @@
 include_guard()
 
 include(${modules}/GetParser.cmake)
-get_parser(VERSION v0.4.1)
+get_parser(VERSION v0.5.6)
 
 # Set the include path for the system library in the variable
 # We are using the standard library shipped

tests/Pybind/Builders/classBuilder.cpp

@@ -36,7 +36,7 @@ TEST_CASE("Class with static member variables", "[classBuilder]") {
 		IR::Type t;
 		t.m_representation = var.type;
 		t.m_isConst = var.isConst;
-		t.m_isStatic = true;
+		v.m_isStatic = true;
 		v.m_type = t;
 		s.m_public.m_memberVariables.push_back(v);
 	}
@@ -163,7 +163,7 @@ TEST_CASE("Class with a constructor", "[classBuilder]") {
 	f.m_name = s.m_name;
 	f.m_representation = f.m_name;
 	f.m_isStatic = false;
-	IR::Variable v;
+	IR::Argument v;
 	v.m_name = 's';
 	IR::Type t;
 	t.m_representation = "const std::string&";
@@ -201,7 +201,7 @@ TEST_CASE("Class with functions", "[classBuilder]") {
 		f.m_representation = f.m_name;
 		f.m_isStatic = false;
 
-		IR::Variable v;
+		IR::Argument v;
 		v.m_name = "myVar";
 
 		IR::Type arg;
@@ -247,7 +247,7 @@ TEST_CASE("Class with member variables", "[classBuilder]") {
 		IR::Type t;
 		t.m_representation = var.type;
 		t.m_isConst = var.isConst;
-		t.m_isStatic = false;
+		v.m_isStatic = false;
 		v.m_type = t;
 		s.m_public.m_memberVariables.push_back(v);
 	}
@@ -282,7 +282,7 @@ TEST_CASE("Class with vector in constructor gives the correct include",
 	IR::Type::Container c;
 	c.m_container = IR::ContainerType::Vector;
 	arg.m_type = c;
-	constructor.m_arguments.push_back({"myVar", "", arg});
+	constructor.m_arguments.push_back({"myVar", arg});
 	s.m_public.m_functions.push_back(constructor);
 
 	Pybind::Proxy::TypeInfo typeInfo;
@@ -306,7 +306,7 @@ TEST_CASE("Class with vector in member function gives the correct include",
 	IR::Type::Container c;
 	c.m_container = IR::ContainerType::Vector;
 	arg.m_type = c;
-	constructor.m_arguments.push_back({"myVar", "", arg});
+	constructor.m_arguments.push_back({"myVar", arg});
 	s.m_public.m_functions.push_back(constructor);
 
 	Pybind::Proxy::TypeInfo typeInfo;

tests/Pybind/Builders/functionBuilder.cpp

@@ -23,7 +23,7 @@ TEST_CASE("function fails on unique_ptr argument", "[functionBuilder]") {
 	IR::Type::Container c;
 	c.m_container = IR::ContainerType::UniquePtr;
 	t.m_type = c;
-	IR::Variable v;
+	IR::Argument v;
 	v.m_type = t;
 	v.m_name = "v";
 	f.m_arguments.push_back(v);

tests/Pybind/Builders/moduleFileBuilder.cpp

@@ -17,7 +17,6 @@ TEST_CASE(
 	c.m_container = IR::ContainerType::Vector;
 	returnType.m_type = c;
 	returnType.m_isConst = false;
-	returnType.m_isStatic = false;
 	returnType.m_isReference = false;
 	returnType.m_numPointers = 0;
 	f.m_returnType = returnType;

tests/TestUtil/include/TestStage/stageFunctions.hpp

@@ -66,7 +66,7 @@ int runPythonUnittest(std::filesystem::path const& stage,
 
 	// Switch to stage
 	std::filesystem::current_path(stage / "build");
-	auto cmd = "python3 test_" + moduleName + ".py";
+	auto cmd = "python test_" + moduleName + ".py";
 	std::cout << cmd << '\n';
 	auto errorCode = std::system(cmd.c_str());
 

tests/TestUtil/include/TestUtil/parse.hpp

@@ -10,14 +10,14 @@
 namespace TestUtil {
 
 IR::Namespace parseString(std::string const& code) {
-	auto ns = Parser::parseString(code, TestUtil::getParserConfig());
-	REQUIRE(ns.has_value());
-	return ns.has_value() ? ns.value() : IR::Namespace();
+	auto parsed = Parser::parseString(code, TestUtil::getParserConfig());
+	REQUIRE(parsed.has_value());
+	return parsed.value();
 }
 
 IR::Namespace parseFile(std::string const& filepath) {
-	auto ns = Parser::parseFile(filepath, TestUtil::getParserConfig());
-	REQUIRE(ns.has_value());
-	return ns.has_value() ? ns.value() : IR::Namespace();
+	auto parsed = Parser::parseFile(filepath, TestUtil::getParserConfig());
+	REQUIRE(parsed.has_value());
+	return parsed.value();
 }
 }    // namespace TestUtil

tests/dependency.cpp

@@ -0,0 +1,33 @@
+#include "TestStage/paths.hpp"
+#include "TestUtil/pybindStage.hpp"
+#include <catch2/catch.hpp>
+#include <fmt/format.h>
+
+TEST_CASE("You can refer to things as long as they are previously defined",
+          "[dependency]") {
+	std::string moduleName = "m";
+	auto stage =
+	    TestUtil::PybindStage(TestStage::getRootStagePath(), moduleName);
+
+	auto cppCode = R"(
+namespace MyLib {
+struct Data { int i; };
+}
+
+MyLib::Data complexFunction() {
+	MyLib::Data d;
+	d.i = 5;
+	return d;
+}
+)";
+
+	auto pythonTestCode = fmt::format(R"(
+# Can call a function which depends on an inner object
+data = {moduleName}.complexFunction()
+self.assertEqual(data.i, 5)
+)",
+	                                  fmt::arg("moduleName", moduleName));
+
+	auto errorCode = stage.runPybindTest(cppCode, pythonTestCode);
+	REQUIRE(errorCode == 0);
+}