Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Escape names of nested modules in C# and Java #5049

Merged
merged 8 commits into from
Feb 9, 2024
Merged

fix: Escape names of nested modules in C# and Java #5049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
228a56c
test
fabiomadge Feb 2, 2024
422e112
improve test
fabiomadge Feb 2, 2024
d7e2781
fix
fabiomadge Feb 2, 2024
cf5d1aa
news
fabiomadge Feb 2, 2024
155ce8b
formatter
fabiomadge Feb 2, 2024
77d7fa1
Merge branch 'master' into fix_5048
RustanLeino Feb 9, 2024
c0878e6
Merge branch 'master' into fix_5048
RustanLeino Feb 9, 2024
6c84ec9
Merge branch 'master' into fix_5048
fabiomadge Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions Source/DafnyCore/Compilers/CSharp/Compiler-Csharp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,14 @@ protected override ConcreteSyntaxTree CreateStaticMain(IClassWriter cw, string a
return wr.NewBlock($"public static void _StaticMain(Dafny.ISequence<Dafny.ISequence<{CharTypeName}>> {argsParameterName})");
}

string IdProtectModule(string moduleName) {
return string.Join(".", moduleName.Split(".").Select(IdProtect));
}

protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, ModuleDefinition externModule,
string libraryName /*?*/, ConcreteSyntaxTree wr) {
return wr.NewBlock($"namespace {IdProtect(moduleName)}", " // end of " + $"namespace {IdProtect(moduleName)}");
moduleName = IdProtectModule(moduleName);
return wr.NewBlock($"namespace {moduleName}", " // end of " + $"namespace {moduleName}");
}

protected override string GetHelperModuleName() => DafnyHelpersClass;
Expand Down Expand Up @@ -1213,7 +1218,11 @@ string DtCtorName(DatatypeCtor ctor) {
Contract.Ensures(Contract.Result<string>() != null);

var dt = ctor.EnclosingDatatype;
var dtName = dt.EnclosingModuleDefinition.TryToAvoidName ? IdName(dt) : dt.GetFullCompileName(Options);
var dtName = IdName(dt);
if (!dt.EnclosingModuleDefinition.TryToAvoidName) {
dtName = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + dtName;
}

return dt.IsRecordType ? dtName : dtName + "_" + ctor.GetCompileName(Options);
}

Expand Down Expand Up @@ -2472,7 +2481,7 @@ private string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null,
if ((cl is DatatypeDecl)
&& !ignoreInterface
&& (member is null || !NeedsCustomReceiver(member))) {
return (cl.EnclosingModuleDefinition.TryToAvoidName ? "" : IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + ".") + DtTypeName(cl, false);
return (cl.EnclosingModuleDefinition.TryToAvoidName ? "" : IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + ".") + DtTypeName(cl, false);
}

if (cl.EnclosingModuleDefinition.TryToAvoidName) {
Expand All @@ -2482,7 +2491,7 @@ private string FullTypeName(UserDefinedType udt, MemberDecl/*?*/ member = null,
if (cl.IsExtern(Options, out _, out _)) {
return cl.EnclosingModuleDefinition.GetCompileName(Options) + "." + cl.GetCompileName(Options);
}
return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
return IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
}

protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMember) {
Expand All @@ -2496,7 +2505,7 @@ protected override void EmitThis(ConcreteSyntaxTree wr, bool callToInheritedMemb

protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
var dt = dtv.Ctor.EnclosingDatatype;
var dtName = dt.GetFullCompileName(Options);
var dtName = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdName(dt);

var nonGhostInferredTypeArgs = SelectNonGhost(dt, dtv.InferredTypeArgs);
var typeParams = nonGhostInferredTypeArgs.Count == 0 ? "" : $"<{TypeNames(nonGhostInferredTypeArgs, wr, dtv.tok)}>";
Expand Down
13 changes: 10 additions & 3 deletions Source/DafnyCore/Compilers/Java/Compiler-java.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,13 @@ private void EmitImport(Import import, ConcreteSyntaxTree importWriter) {
importWriter.WriteLine($"import {import.Path.Replace('/', '.')}.*;");
}

string IdProtectModule(string moduleName) {
return string.Join(".", moduleName.Split(".").Select(IdProtect));
}

protected override ConcreteSyntaxTree CreateModule(string moduleName, bool isDefault, ModuleDefinition externModule,
string libraryName /*?*/, ConcreteSyntaxTree wr) {
moduleName = IdProtectModule(moduleName);
if (isDefault) {
// Fold the default module into the main module
moduleName = "_System";
Expand Down Expand Up @@ -824,7 +829,7 @@ protected string FullTypeName(UserDefinedType udt, MemberDecl member, bool useCo
} else if (cl.EnclosingModuleDefinition.GetCompileName(Options) == ModuleName || cl.EnclosingModuleDefinition.TryToAvoidName) {
return IdProtect(cl.GetCompileName(Options));
} else {
return IdProtect(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
return IdProtectModule(cl.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdProtect(cl.GetCompileName(Options));
}
}

Expand Down Expand Up @@ -2248,7 +2253,7 @@ string DtCtorName(DatatypeCtor ctor) {
if (dt is TupleTypeDecl tupleDecl) {
return DafnyTupleClass(tupleDecl.NonGhostDims);
}
var dtName = IdProtect(dt.GetFullCompileName(Options));
var dtName = IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdName(dt);
return dt.IsRecordType ? dtName : dtName + "_" + ctor.GetCompileName(Options);
}
string DtCreateName(DatatypeCtor ctor) {
Expand Down Expand Up @@ -2657,7 +2662,9 @@ protected override void EmitDatatypeValue(DatatypeValue dtv, string typeDescript

void EmitDatatypeValue(DatatypeDecl dt, DatatypeCtor ctor, List<Type> typeArgs, bool isCoCall,
string typeDescriptorArguments, string arguments, ConcreteSyntaxTree wr) {
var dtName = dt is TupleTypeDecl tupleDecl ? DafnyTupleClass(tupleDecl.NonGhostDims) : dt.GetFullCompileName(Options);
var dtName = dt is TupleTypeDecl tupleDecl
? DafnyTupleClass(tupleDecl.NonGhostDims)
: IdProtectModule(dt.EnclosingModuleDefinition.GetCompileName(Options)) + "." + IdName(dt);
var typeParams = typeArgs.Count == 0 ? "" : $"<{BoxedTypeNames(typeArgs, wr, dt.tok)}>";
var sep = typeDescriptorArguments.Length != 0 && arguments.Length != 0 ? ", " : "";
if (!isCoCall) {
Expand Down
9 changes: 9 additions & 0 deletions Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// RUN: %testDafnyForEachCompiler --refresh-exit-code=0 "%s"

module A.try {
datatype Dt = Dt
}

method Main() {
print A.try.Dt, "\n";
}
1 change: 1 addition & 0 deletions Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
try.Dt.Dt
1 change: 1 addition & 0 deletions Source/IntegrationTests/TestFiles/LitTests/LitTest/git-issues/git-issue-5048.dfy.rs.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A.try.Dt.Dt
1 change: 1 addition & 0 deletions docs/dev/news/5049.fix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Escape names of nested modules in C# and Java
Loading