属性描述格式调整

dreamanlan · Oct 30, 2018 · ab6f329 · ab6f329
1 parent dd6edd5
commit ab6f329
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 2 deletions.
diff --git a/Cs2LuaUtility/bin/Debug/Cs2LuaUtility.dll b/Cs2LuaUtility/bin/Debug/Cs2LuaUtility.dll
diff --git a/Cs2LuaUtility/bin/Debug/Cs2LuaUtility.pdb b/Cs2LuaUtility/bin/Debug/Cs2LuaUtility.pdb
diff --git a/CsToLua/CsToLuaProcessor.cs b/CsToLua/CsToLuaProcessor.cs
@@ -437,6 +437,7 @@ public static ExitCode Process(string srcFile, string outputDir, string outputEx
             StringBuilder nsBuilder = new StringBuilder();
             BuildNamespaces(nsBuilder, toplevelMni);
             StringBuilder attrBuilder = new StringBuilder();
+            attrBuilder.AppendLine("__cs2lua__AllAttrs = {};");
             BuildAttributes(attrBuilder, compilation.Assembly, ignoredClasses);
             StringBuilder enumBuilder = new StringBuilder();
             BuildExternEnums(enumBuilder);
@@ -616,7 +617,8 @@ private static void BuildClassAttributes(StringBuilder sb, INamedTypeSymbol type
             foreach (var sym in typesym.GetMembers()) {
                 var msym = sym as IMethodSymbol;
                 if (null != msym && msym.GetAttributes().Length > 0 && !ClassInfo.HasAttribute(sym, "Cs2Lua.IgnoreAttribute")) {
-                    temp.AppendFormat("{0}{1} = {{", GetIndentString(indent), sym.Name);
+                    string mname = SymbolTable.Instance.NameMangling(msym);
+                    temp.AppendFormat("{0}{1} = {{", GetIndentString(indent), mname);
                     temp.AppendLine();
                     ++indent;
                     BuildAttributes(temp, indent, msym.GetAttributes());
@@ -662,7 +664,7 @@ private static void BuildClassAttributes(StringBuilder sb, INamedTypeSymbol type
             }
             --indent;
             if (csb.Length > 0) {
-                sb.AppendFormat("{0}__Attrs = {{", ClassInfo.GetFullName(typesym).Replace(".", "__"));
+                sb.AppendFormat("__cs2lua__AllAttrs[\"{0}\"] = {{", ClassInfo.GetFullName(typesym));
                 sb.AppendLine();
                 sb.Append(csb.ToString());
                 sb.Append("};");

diff --git a/Test/Cs2LuaScript/bin/Debug/Cs2LuaScript.dll b/Test/Cs2LuaScript/bin/Debug/Cs2LuaScript.dll
diff --git a/Test/Cs2LuaScript/bin/Debug/Cs2LuaScript.pdb b/Test/Cs2LuaScript/bin/Debug/Cs2LuaScript.pdb
diff --git a/Test/Cs2LuaScript/bin/Debug/CustomApi.dll b/Test/Cs2LuaScript/bin/Debug/CustomApi.dll
diff --git a/Test/Cs2LuaScript/bin/Debug/CustomApi.pdb b/Test/Cs2LuaScript/bin/Debug/CustomApi.pdb
diff --git a/Test/CustomApi/bin/Debug/CustomApi.dll b/Test/CustomApi/bin/Debug/CustomApi.dll
diff --git a/Test/CustomApi/bin/Debug/CustomApi.pdb b/Test/CustomApi/bin/Debug/CustomApi.pdb
diff --git a/Test/Tools/Cs2Lua.exe b/Test/Tools/Cs2Lua.exe
diff --git a/bin/Debug/Cs2Lua.exe b/bin/Debug/Cs2Lua.exe
diff --git a/bin/Debug/Cs2Lua.pdb b/bin/Debug/Cs2Lua.pdb
diff --git a/bin/Debug/Cs2LuaUtility.dll b/bin/Debug/Cs2LuaUtility.dll
diff --git a/bin/Debug/Cs2LuaUtility.pdb b/bin/Debug/Cs2LuaUtility.pdb