fix: allow fully qualified type name from other packages (#83)

ecsact-dev · Mar 7, 2023 · 4e019a5 · 4e019a5
1 parent ef59501
commit 4e019a5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 5 deletions.
diff --git a/ecsact/detail/grammar.hh b/ecsact/detail/grammar.hh
@@ -65,7 +65,20 @@ struct whitespace {
 		lexy::dsl::inline_<line_comment> | lexy::dsl::inline_<block_comment>;
 };
 
+/**
+ * Lookupable type name
+ */
 struct type_name {
+	static constexpr auto rule = lexy::dsl::
+		identifier(lexy::dsl::ascii::alpha, lexy::dsl::ascii::alnum / lexy::dsl::lit_c<'.'>);
+
+	static constexpr auto value = lexy::as_string<std::string_view>;
+};
+
+/**
+ * Type name used for declaration
+ */
+struct type_name_decl {
 	static constexpr auto rule =
 		lexy::dsl::identifier(lexy::dsl::ascii::alpha, lexy::dsl::ascii::alnum);
 
@@ -179,7 +192,7 @@ struct component_statement {
 	};
 
 	static constexpr auto rule = lexy::dsl::p<component_keyword> >>
-		lexy::dsl::p<type_name>;
+		lexy::dsl::p<type_name_decl>;
 
 	static constexpr auto value =
 		lexy::callback<ecsact_statement>([](std::string_view component_name) {
@@ -206,7 +219,7 @@ struct transient_statement {
 	};
 
 	static constexpr auto rule = lexy::dsl::p<transient_keyword> >>
-		lexy::dsl::p<type_name>;
+		lexy::dsl::p<type_name_decl>;
 
 	static constexpr auto value =
 		lexy::callback<ecsact_statement>([](std::string_view transient_name) {
@@ -229,7 +242,7 @@ struct system_statement {
 	};
 
 	static constexpr auto rule = lexy::dsl::p<system_keyword> >>
-		lexy::dsl::opt(lexy::dsl::p<type_name>);
+		lexy::dsl::opt(lexy::dsl::p<type_name_decl>);
 
 	static constexpr auto value = lexy::callback<ecsact_statement>(
 		[](std::optional<std::string_view> system_name) {
@@ -257,7 +270,7 @@ struct action_statement {
 	};
 
 	static constexpr auto rule = lexy::dsl::p<action_keyword> >>
-		lexy::dsl::p<type_name>;
+		lexy::dsl::p<type_name_decl>;
 
 	static constexpr auto value =
 		lexy::callback<ecsact_statement>([](std::string_view action_name) {
@@ -284,7 +297,7 @@ struct enum_statement {
 	};
 
 	static constexpr auto rule = lexy::dsl::p<enum_keyword> >>
-		lexy::dsl::p<type_name>;
+		lexy::dsl::p<type_name_decl>;
 
 	static constexpr auto value =
 		lexy::callback<ecsact_statement>([](std::string_view enum_name) {

diff --git a/test/parse_test_system_component_statement.cc b/test/parse_test_system_component_statement.cc
@@ -204,3 +204,24 @@ TEST(Parse, IncludeSystemComponentWithEntity) {
 		"example_entity"
 	);
 }
+
+////////////////////////////////////
+// components from other packages //
+////////////////////////////////////
+
+TEST(Parse, OtherPackageFullyQualified) {
+	TestValidSystemComponent(
+		"readwrite other.pkg.ExampleComponent;"s,
+		ECSACT_SYS_CAP_READWRITE,
+		"other.pkg.ExampleComponent"
+	);
+}
+
+TEST(Parse, IncludeSystemComponentWithEntityFullQualified) {
+	TestValidSystemComponent(
+		"include other.pkg.ExampleComponent with example_entity;"s,
+		ECSACT_SYS_CAP_INCLUDE,
+		"other.pkg.ExampleComponent",
+		"example_entity"
+	);
+}