From 42f38ec99eed9b126720852a821ad42c12659fea Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Tue, 28 Sep 2021 00:28:01 +0300 Subject: [PATCH] Generate valid C# for constants in namespaceless modules Signed-off-by: Dimitar Dobrev --- src/Generator/Generators/CSharp/CSharpSources.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs index e5dcf90b..891e58f4 100644 --- a/src/Generator/Generators/CSharp/CSharpSources.cs +++ b/src/Generator/Generators/CSharp/CSharpSources.cs @@ -967,7 +967,7 @@ namespace CppSharp.Generators.CSharp var libraryPath = GetLibraryOf(var); if (!LibrarySymbols.TryGetValue(libraryPath, out var lib)) - LibrarySymbols[libraryPath] = lib = new LibrarySymbolInfo(libraryPath, Module.OutputNamespace + ".__Symbols"); + LibrarySymbols[libraryPath] = lib = new LibrarySymbolInfo(libraryPath, Module.OutputNamespace); var location = lib.GetFullVariablePath(var.Mangled); @@ -976,9 +976,9 @@ namespace CppSharp.Generators.CSharp if (arrayType != null) { if (arrayType.Type.IsPrimitiveType(PrimitiveType.Char) && arrayType.SizeType != ArrayType.ArraySize.Constant) - WriteLine($@"var {ptr} = {location};"); + WriteLine($"var {ptr} = {location};"); else - WriteLine($@"var {ptr} = ({arrayType.Type.Visit(TypePrinter)}*){location};"); + WriteLine($"var {ptr} = ({arrayType.Type.Visit(TypePrinter)}*){location};"); } else { @@ -3567,9 +3567,9 @@ internal static{(@new ? " new" : string.Empty)} {printedClass} __GetInstance({Ty public LibrarySymbolInfo(string path, string @namespace) { - this.path = path; - this.@namespace = @namespace; + this.path = path; @class = identifierCleanerRegex.Replace(path, "_"); + this.@namespace = (!string.IsNullOrEmpty(@namespace) ? @namespace : @class) + ".__Symbols"; } public string Generate()