Metadata for Structs

src/library/impl/meta_reader/key.h

@@ -124,6 +124,11 @@ namespace xlang::meta::reader
         return extends_type(*this, "System"sv, "MulticastDelegate"sv);
     }
 
+    inline bool TypeDef::is_struct() const
+    {
+        return extends_type(*this, "System"sv, "ValueType"sv);
+    }
+
     struct EnumDefinition
     {
         explicit EnumDefinition(TypeDef const& type)

src/library/impl/meta_reader/schema.h

@@ -78,6 +78,7 @@ namespace xlang::meta::reader
 
         bool is_enum() const;
         bool is_delegate() const;
+        bool is_struct() const;
         auto get_enum_definition() const;
     };
 

src/test/xmeta/example/deprecation_attributes.idl

@@ -0,0 +1,21 @@
+//Saving this now to user as a test later
+
+import "RtCopContract.idl";
+import "windows.foundation.idl";
+namespace Deprecation
+{
+    [contract(RtCop.RtCopContract, 1)]
+    runtimeclass Muffin
+    {
+        UInt32 WeightInGrams { get; };
+        [deprecated("Muffin is deprecated", deprecate, RtCop.RtCopContract, 2)]
+        String Flavor { get; };
+
+
+        [deprecated("Muffin is deprecated", deprecate, RtCop.RtCopContract, 2)]
+        {
+            void Consume();
+            Windows.Foundation.IAsyncAction CookAsync();
+        }
+    }
+}

src/test/xmeta/test_lexer.cpp

@@ -27,8 +27,8 @@ TEST_CASE("Namespace Identifier")
 
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener) == 0);
-
+    reader.read(test_idl, listener);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     auto& namespaces = listener.namespaces;
     REQUIRE(namespaces.find("test") != namespaces.end());
 }
@@ -46,7 +46,8 @@ TEST_CASE("Token identifier with unicode letter character")
 
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener) == 0);
+    reader.read(test_idl, listener);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     auto& namespaces = listener.namespaces;
 
     REQUIRE(namespaces.find("test1AÆĦdžＺ") != namespaces.end()); // LU
@@ -64,7 +65,8 @@ TEST_CASE("Identifer not starting with letter character")
     )" };
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener, true) != 0);
+    reader.read(test_idl, listener, true);
+    REQUIRE(reader.get_num_syntax_errors() != 0);
 }
 
 TEST_CASE("Remove comments")
@@ -76,7 +78,8 @@ TEST_CASE("Remove comments")
 
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener) == 0);
+    reader.read(test_idl, listener);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     auto& namespaces = listener.namespaces;
 
     REQUIRE(namespaces.find("test") != namespaces.end());
@@ -93,7 +96,8 @@ TEST_CASE("Spacing")
 
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener) == 0);
+    reader.read(test_idl, listener);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     auto& namespaces = listener.namespaces;
 
     REQUIRE(namespaces.find("test") != namespaces.end());
@@ -115,7 +119,8 @@ TEST_CASE("Lexer uuid")
 
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener) == 0);
+    reader.read(test_idl, listener);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     auto& expressions = listener.expressions;
 
     REQUIRE(expressions.find("b7de5527-4c8f-42dd-84da-5ec493abdb9a") != expressions.end());
@@ -148,7 +153,8 @@ TEST_CASE("Enum assignments")
 
     xlang_test_listener listener;
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl, listener) == 0);
+    reader.read(test_idl, listener);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     std::set<std::string> &enums = listener.enums;
 
     REQUIRE(enums.find("Color") != enums.end());
@@ -191,7 +197,9 @@ TEST_CASE("Enum illegal assignments")
 
     xmeta_idl_reader reader{ "" };
     xlang_test_listener listener;
-    REQUIRE(reader.read(test_idl_string_assignment, listener, true) == 1);
+    reader.read(test_idl_string_assignment, listener, true);
+    REQUIRE(reader.get_num_syntax_errors() == 1);
     listener.reset();
-    REQUIRE(reader.read(test_idl_float_assignment, listener, true) == 1);
+    reader.read(test_idl_float_assignment, listener, true);
+    REQUIRE(reader.get_num_syntax_errors() == 1);
 }

src/test/xmeta/test_symbol_table.cpp

@@ -21,7 +21,8 @@ TEST_CASE("Duplicate Namespaces")
     )");
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl) == 0);
+    reader.read(test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");
@@ -49,7 +50,8 @@ TEST_CASE("Multiple definition error test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl) == 0);
+    reader.read(test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     REQUIRE(reader.get_num_semantic_errors() == 3);
 }
 
@@ -70,7 +72,8 @@ TEST_CASE("Enum test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl) == 0);
+    reader.read(test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");
@@ -115,7 +118,8 @@ TEST_CASE("Enum circular implicit dependency")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(implicit_dependency_error_idl) == 0);
+    reader.read(implicit_dependency_error_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     REQUIRE(reader.get_num_semantic_errors() == 1);
 }
 
@@ -133,7 +137,8 @@ TEST_CASE("Enum circular explicit dependency")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(explicit_dependency_error_idl) == 0);
+    reader.read(explicit_dependency_error_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
     REQUIRE(reader.get_num_semantic_errors() == 1);
 }
 
@@ -150,7 +155,8 @@ TEST_CASE("Delegate test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl) == 0);
+    reader.read(test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");
@@ -204,7 +210,8 @@ TEST_CASE("Struct test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(struct_test_idl) == 0);
+    reader.read(struct_test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");
@@ -256,27 +263,81 @@ TEST_CASE("Struct test")
 
 TEST_CASE("Struct circular test")
 {
-    std::istringstream struct_test_idl{ R"(
-        namespace N
-        {
-            struct S1
+    {
+        std::istringstream struct_test_idl{ R"(
+            namespace N
             {
-                S2 field_1;
+                struct S0
+                {
+                    S1 field_1;
+                }
+                struct S1
+                {
+                    S2 field_1;
+                }
+                struct S2
+                {
+                    S3 field_1;
+                }
+                struct S3
+                {
+                    S1 field_1;       
+                }
             }
-            struct S2
+        )" };
+
+        xmeta_idl_reader reader{ "" };
+        reader.read(struct_test_idl);
+        REQUIRE(reader.get_num_syntax_errors() == 0);
+        REQUIRE(reader.get_num_semantic_errors() == 4);
+    }
+    {
+        std::istringstream struct_test_idl{ R"(
+            namespace N
             {
-                S3 field_1;
+                struct S0
+                {
+                    S1 field_1;
+                    S2 field_2;
+                }
+                struct S1
+                {
+                    S3 field_1;
+                }
+                struct S2
+                {
+                    S3 field_1;
+                }
+                struct S3
+                {
+                }
             }
-            struct S3
+        )" };
+
+        xmeta_idl_reader reader{ "" };
+        reader.read(struct_test_idl);
+        REQUIRE(reader.get_num_syntax_errors() == 0);
+        REQUIRE(reader.get_num_semantic_errors() == 0);
+    }
+}
+
+TEST_CASE("Struct duplicate member test")
+{
+    std::istringstream struct_test_idl{ R"(
+        namespace N
+        {
+            struct S0
             {
-                S1 field_1;       
+                Int32 field_1;
+                Int32 field_1;
             }
         }
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(struct_test_idl) == 0);
-    REQUIRE(reader.get_num_semantic_errors() == 3);
+    reader.read(struct_test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
+    REQUIRE(reader.get_num_semantic_errors() == 1);
     auto namespaces = reader.get_namespaces();
 }
 
@@ -298,7 +359,8 @@ TEST_CASE("Resolving delegates types test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl) == 0);
+    reader.read(test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");
@@ -361,7 +423,8 @@ TEST_CASE("Resolving struct types test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(struct_test_idl) == 0);
+    reader.read(struct_test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");
@@ -419,7 +482,8 @@ TEST_CASE("Resolving types across namespaces test")
     )" };
 
     xmeta_idl_reader reader{ "" };
-    REQUIRE(reader.read(test_idl) == 0);
+    reader.read(test_idl);
+    REQUIRE(reader.get_num_syntax_errors() == 0);
 
     auto namespaces = reader.get_namespaces();
     auto it = namespaces.find("N");