support Type.IsAbstract, #433

yanghuan · Oct 7, 2023 · 467585d · 467585d
1 parent 0a00dd1
commit 467585d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 16 deletions.
diff --git a/CSharp.lua/CoreSystem.Lua/CoreSystem/Core.lua b/CSharp.lua/CoreSystem.Lua/CoreSystem/Core.lua
@@ -235,12 +235,11 @@ local function setBase(cls, kind)
   cls.__index = cls
   cls.__call = new
 
-  local object = kind ~= "S" and Object or ValueType
   if extends then
     local base = extends[1]
     if not base then error(cls.__name__ .. "'s base is nil") end
     if base.class == "I" then
-      setmetatable(cls, object)
+      setmetatable(cls, kind ~= "S" and Object or ValueType)
       setInterface(cls, extends)
     else
       setmetatable(cls, base)
@@ -250,7 +249,7 @@ local function setBase(cls, kind)
       end
     end
   else
-    setmetatable(cls, object)
+    setmetatable(cls, kind ~= "S" and Object or ValueType)
   end
 end
 

diff --git a/CSharp.lua/CoreSystem.Lua/CoreSystem/Reflection/Assembly.lua b/CSharp.lua/CoreSystem.Lua/CoreSystem/Reflection/Assembly.lua
@@ -82,16 +82,23 @@ local function getName(this)
   return this.name
 end
 
-local function isAccessibility(memberInfo, kind)
-  local metadata = memberInfo.metadata
-  if not metadata then
-    throwNoMatadata(memberInfo.c.__name__ .. "." .. memberInfo.name)
-  end
+local function isAccessibility(this, kind)
+  local metadata = this:getMetadata()
   return band(metadata[2], 0x7) == kind
 end
 
 local MemberInfo = define("System.Reflection.MemberInfo", {
   getName = getName,
+  getCls = function (this)
+    return this.c
+  end,
+  getMetadata = function (this)
+	  local metadata = this.metadata
+    if not metadata then
+      throwNoMatadata(this:getCls().__name__ .. "." .. this.name)
+    end
+    return metadata
+  end,
   EqualsObj = function (this, obj)
     if getmetatable(this) ~= getmetatable(obj) then
       return false
@@ -102,14 +109,15 @@ local MemberInfo = define("System.Reflection.MemberInfo", {
     return this.memberType
   end,
   getDeclaringType = function (this)
-    return typeof(this.c)
+    return typeof(this:getCls())
+  end,
+  getIsAbstract = function (this)
+	  local metadata = this:getMetadata()
+    return band(metadata[2], 0x10) ~= 0
   end,
   getIsStatic = function (this)
-    local metadata = this.metadata
-    if not metadata then
-      throwNoMatadata(this.c.__name__ .. "." .. this.name)
-    end
-    return band(metadata[2], 0x8) == 1
+    local metadata = this:getMetadata()
+    return band(metadata[2], 0x8) ~= 0
   end,
   getIsPrivate = function (this)
     return isAccessibility(this, 1)
@@ -853,8 +861,24 @@ function System.GetExecutingAssembly(assembly)
 	return setmetatable(assembly, Assembly)
 end
 
+setmetatable(Type, MemberInfo)
 Type.getAssembly = getAssembly
 
+Type.memberType = 32
+
+Type.getCls = function (this)
+  return this[1]
+end
+
+Type.getMetadata = function (this)
+  local cls = this[1]
+  local metadata = rawget(cls, "__metadata__")
+  if not metadata then
+    throwNoMatadata(cls.__name__)
+  end
+  return metadata.class
+end
+
 function Type.getAssemblyQualifiedName(this)
   return this:getName() .. ', ' .. getName(assembly)
 end

diff --git a/CSharp.lua/LuaSyntaxNodeTransform.cs b/CSharp.lua/LuaSyntaxNodeTransform.cs
@@ -450,6 +450,7 @@ private void CheckTypeDeclaration(INamedTypeSymbol typeSymbol, LuaTypeDeclaratio
 
       if (IsCurTypeExportMetadataAll || attributes.Count > 0 || typeDeclaration.IsExportMetadata) {
         var data = new LuaTableExpression { IsSingleLine = true };
+        data.Add(new LuaStringLiteralExpressionSyntax(typeSymbol.Name));
         data.Add(typeSymbol.GetMetaDataAttributeFlags());
         data.AddRange(typeDeclaration.TypeParameterExpressions);
         data.AddRange(attributes);

diff --git a/CSharp.lua/Utils.cs b/CSharp.lua/Utils.cs
@@ -1384,8 +1384,12 @@ public static string GetMetaDataAttributeFlags(this ISymbol symbol, PropertyMeth
       const int kParametersMaxCount = 256;
 
       int accessibility = (int)symbol.DeclaredAccessibility;
-      int isStatic = symbol.IsStatic ? 1 : 0;
-      int flags = accessibility | (isStatic << 3);
+      int flags = accessibility;
+      if (symbol.IsStatic) {
+        flags |= 1 << 3;
+      } else if (symbol.IsAbstract) {
+         flags |= 1 << 4;
+      }
       switch (symbol.Kind) {
         case SymbolKind.Method: {
           var methodSymbol = (IMethodSymbol)symbol;
@@ -1406,6 +1410,12 @@ public static string GetMetaDataAttributeFlags(this ISymbol symbol, PropertyMeth
         }
         case SymbolKind.NamedType: {
           var nameType = (INamedTypeSymbol)symbol;
+          if (nameType.IsStatic) {
+            flags |= 1 << 4;
+            flags |= 1 << 5;
+          } else if (nameType.IsSealed) {
+            flags |= 1 << 5;
+          }
           if (nameType.IsGenericType) {
             int typeCount = nameType.TypeParameters.Length;
             Contract.Assert(typeCount < kParametersMaxCount);