Prepare for making new resolver the default

Source/AutoExtern.Test/Minimal/Library.dfy.expect

@@ -1,19 +1,19 @@
 
-  trait {:compile false} {:extern} Intf {
+  trait {:compile false} {:extern} Intf extends object {
     var {:extern "Prop"} Intf_Prop: System.String // interface property
   }
 
-  trait {:compile false} {:extern} Impl extends Intf {
+  trait {:compile false} {:extern} Impl extends object, Intf {
     var Field: System.int32
     var Prop: System.String // property
   }
 
-  trait {:compile false} {:extern} ICanClone<T> {
+  trait {:compile false} {:extern} ICanClone<T> extends object {
   }
 
-  trait {:compile false} {:extern} Base {
+  trait {:compile false} {:extern} Base extends object {
   }
 
-  trait {:compile false} {:extern} Derived {
+  trait {:compile false} {:extern} Derived extends object {
   }
 

Source/AutoExtern/AutoProgram.cs

@@ -48,9 +48,8 @@ protected void PpBlockOpen(TextWriter wr, string indent, object? kind, Name name
     }
     var paramsStr = parameters == null ? "" : $"<{String.Join(", ", parameters)}>";
     parts.Add($"{name.AsDecl(forceExtern: true)}{paramsStr}");
-    if (inheritance != null) {
-      parts.Add($"extends {String.Join(", ", inheritance.Select(t => t.ToString()))}");
-    }
+    var parentTypes = inheritance == null ? "" : string.Concat(inheritance.Select(t => ", " + t.ToString()));
+    parts.Add("extends object" + parentTypes);
     wr.WriteLine($"{indent}{String.Join(" ", parts)} {{");
   }
 
@@ -519,7 +518,7 @@ public static int Main(string[] args) {
 
     var skipInterfaceOption = new Option<List<string>>(
       name: "--skip-interface",
-      description: "An interface to ommit from `extends` lists, e.g. `--skip-interface Microsoft.Dafny.ICloneable`.") {
+      description: "An interface to omit from `extends` lists, e.g. `--skip-interface Microsoft.Dafny.ICloneable`.") {
       ArgumentHelpName = "interfaceName",
       Arity = ArgumentArity.ZeroOrMore,
       AllowMultipleArgumentsPerToken = false

Source/DafnyCore/AST/Cloner.cs

@@ -261,6 +261,9 @@ public virtual Type CloneType(Type t) {
       } else if (t is TypeRefinementWrapper typeRefinementWrapper) {
         // don't bother keeping TypeRefinementWrapper wrappers
         return CloneType(typeRefinementWrapper.T);
+      } else if (t is BottomTypePlaceholder bottomTypePlaceholder) {
+        // don't bother keeping BottomTypePlaceholder wrappers
+        return CloneType(bottomTypePlaceholder.T);
       } else {
         Contract.Assert(false); // unexpected type (e.g., no other type proxies are expected at this time)
         return null; // to please compiler

Source/DafnyCore/AST/DafnyInterface.dfy

@@ -7,7 +7,7 @@ module {:extern "Microsoft.Dafny"} MicrosoftDafny {
   import opened System
 
   @Compile(false)
-  trait {:extern "Token"} Token {
+  trait {:extern "Token"} Token extends object {
     var val: CsString
     var LeadingTrivia: CsString
     var TrailingTrivia: CsString

Source/DafnyCore/AST/Expressions/Expression.cs

@@ -63,7 +63,7 @@ public Type Type {
 
   /// <summary>
   /// The new type inference includes a "type refinement" phase, which determines the best subset types for a program. This phase works
-  /// by refining (mutating in the direction from bottom, meaning un ansatisfiable constraint, to top, meaning no constraint) types in place,
+  /// by refining (mutating in the direction from bottom, meaning an unsatisfiable constraint, to top, meaning no constraint) types in place,
   /// using "TypeRefinementWrapper" type proxies. During that phase, it is necessary to obtain the
   /// un-normalized type stored in each AST node, which is what the "UnnormalizedType" property does. This property should only be used
   /// during the type refinement phase. After type inference is complete, use ".Type" instead.

Source/DafnyCore/AST/Modules/ModuleDefinition.cs

@@ -321,14 +321,6 @@ public static IEnumerable<Field> AllFields(IEnumerable<TopLevelDecl> declaration
     }
   }
 
-  public static IEnumerable<TopLevelDeclWithMembers> AllTypesWithMembers(List<TopLevelDecl> declarations) {
-    foreach (var d in declarations) {
-      if (d is TopLevelDeclWithMembers cl) {
-        yield return cl;
-      }
-    }
-  }
-
   /// <summary>
   /// Yields all functions and methods that are members of some type in the given list of
   /// declarations.
@@ -905,7 +897,9 @@ public ModuleSignature RegisterTopLevelDecls(ModuleResolver resolver, bool useIm
               }
             }
 
-            ctor.Destructors.Add(dtor);
+            if (!localDuplicate) {
+              ctor.Destructors.Add(dtor);
+            }
           }
 
           foreach (var duplicate in duplicates) {

Source/DafnyCore/AST/Statements/Assignment/AssignOrReturnStmt.cs

@@ -19,6 +19,10 @@ public class AssignOrReturnStmt : ConcreteAssignStatement, ICloneable<AssignOrRe
 
   public override IEnumerable<Statement> PreResolveSubStatements => [];
 
+  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
+    return ResolvedStatements.SelectMany(r => r.GetAssignedLocals());
+  }
+
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(Lhss != null);

Source/DafnyCore/AST/Statements/Assignment/AssignStatement.cs

@@ -24,6 +24,10 @@
 
   public override IEnumerable<Statement> PreResolveSubStatements => [];
 
+  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
+    return ResolvedStatements.SelectMany(r => r.GetAssignedLocals());
+  }
+
   [ContractInvariantMethod]
   void ObjectInvariant() {
     Contract.Invariant(cce.NonNullElements(Lhss));

Source/DafnyCore/AST/Statements/Assignment/AssignSuchThatStmt.cs

@@ -27,6 +27,10 @@ public override BoundedPool Clone(Cloner cloner) {
     }
   }
 
+  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
+    return Lhss.Select(lhs => lhs.Resolved).OfType<IdentifierExpr>();
+  }
+
   public override IEnumerable<INode> Children => Lhss.Concat<Node>(new[] { Expr });
 
   public AssignSuchThatStmt Clone(Cloner cloner) {

Source/DafnyCore/AST/Statements/Assignment/ConcreteAssignStatement.cs

@@ -22,9 +22,6 @@ public ConcreteAssignStatement(IOrigin origin, List<Expression> lhss, Attributes
 
   public override IEnumerable<INode> Children => Lhss;
   public override IEnumerable<INode> PreResolveChildren => Lhss;
-  public override IEnumerable<IdentifierExpr> GetAssignedLocals() {
-    return Lhss.Select(lhs => lhs.Resolved).OfType<IdentifierExpr>();
-  }
 
   public bool SetIndent(int indentBefore, TokenNewIndentCollector formatter) {
     return formatter.SetIndentUpdateStmt(this, indentBefore, false);

Source/DafnyCore/AST/Statements/Statement.cs

@@ -142,7 +142,7 @@ public virtual IEnumerable<Expression> NonSpecificationSubExpressions {
   /// </summary>
   public static Statement StripByBlocks(Statement stmt) {
     while (stmt is BlockByProofStmt blockByProofStmt) {
-      stmt = blockByProofStmt;
+      stmt = blockByProofStmt.Body;
     }
     return stmt;
   }
@@ -192,6 +192,9 @@ public override string ToString() {
       Concat<Node>(
       PreResolveSubStatements).Concat(PreResolveSubExpressions);
 
+  /// <summary>
+  /// GetAssignedLocals should only be called after successful resolution
+  /// </summary>
   public virtual IEnumerable<IdentifierExpr> GetAssignedLocals() => [];
 
 

Source/DafnyCore/AST/SystemModuleManager.cs

@@ -72,6 +72,7 @@ public byte[] MyHash {
   public readonly ISet<int> Bitwidths = new HashSet<int>();
   [FilledInDuringResolution] public SpecialField ORDINAL_Offset;  // used by the translator
 
+  public readonly TypeSynonymDecl StringDecl;
   public readonly SubsetTypeDecl NatDecl;
   public UserDefinedType Nat() { return new UserDefinedType(Token.NoToken, "nat", NatDecl, []); }
   public readonly TraitDecl ObjectDecl;
@@ -92,10 +93,10 @@ public SystemModuleManager(DafnyOptions options) {
     this.Options = options;
     SystemModule.Height = -1;  // the system module doesn't get a height assigned later, so we set it here to something below everything else
     // create type synonym 'string'
-    var str = new ConcreteTypeSynonymDecl(SourceOrigin.NoToken, new Name("string"),
+    StringDecl = new ConcreteTypeSynonymDecl(SourceOrigin.NoToken, new Name("string"),
       new TypeParameterCharacteristics(TypeParameter.EqualitySupportValue.InferredRequired, Type.AutoInitInfo.CompilableValue, false),
       [], SystemModule, new SeqType(new CharType()), null);
-    SystemModule.SourceDecls.Add(str);
+    SystemModule.SourceDecls.Add(StringDecl);
     // create subset type 'nat'
     var bvNat = new BoundVar(Token.NoToken, "x", Type.Int);
     var natConstraint = Expression.CreateAtMost(Expression.CreateIntLiteral(Token.NoToken, 0), Expression.CreateIdentExpr(bvNat));

Source/DafnyCore/AST/TypeDeclarations/Declaration.cs

@@ -15,6 +15,10 @@ void ObjectInvariant() {
   public IOrigin BodyStartTok = Token.NoToken;
   public Name NameNode;
 
+  public string GetNameRelativeToModule() {
+    return this is ICallable iCallable ? iCallable.NameRelativeToModule : ToString();
+  }
+
   public virtual TokenRange NavigationRange => NameNode.ReportingRange;
 
   public string Name => NameNode.Value;
@@ -174,4 +178,4 @@ public override string ToString() {
 
   // For Compilation
   internal CodeGenIdGenerator CodeGenIdGenerator = new();
-}
+}

Source/DafnyCore/Backends/CSharp/CsharpCodeGenerator.cs

@@ -3366,7 +3366,8 @@ protected override void EmitConversionExpr(Expression fromExpr, Type fromType, T
       } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
         wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
       } else {
-        Contract.Assert(false, $"not implemented for C#: {fromType} -> {toType}");
+        wr = EmitDowncast(fromType, toType, fromExpr.Origin, wr);
+        EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
       }
     }
 

Source/DafnyCore/Backends/GoLang/GoCodeGenerator.cs

@@ -3794,7 +3794,8 @@ protected override void EmitConversionExpr(Expression fromExpr, Type fromType, T
       } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
         wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
       } else {
-        Contract.Assert(false, $"not implemented for go: {fromType} -> {toType}");
+        wr = EmitCoercionIfNecessary(fromType, toType, fromExpr.Origin, wr);
+        EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
       }
     }
 

Source/DafnyCore/Backends/Java/JavaCodeGenerator.cs

@@ -4265,7 +4265,8 @@ protected override void EmitConversionExpr(Expression fromExpr, Type fromType, T
       } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
         wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
       } else {
-        Contract.Assert(false, $"not implemented for java: {fromType} -> {toType}");
+        wr = EmitDowncast(fromType, toType, fromExpr.Origin, wr);
+        EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
       }
     }
 

Source/DafnyCore/Backends/JavaScript/JavaScriptCodeGenerator.cs

@@ -2464,7 +2464,7 @@ protected override void EmitConversionExpr(Expression fromExpr, Type fromType, T
       } else if (fromType.Equals(toType) || fromType.AsNewtype != null || toType.AsNewtype != null) {
         wr.Append(Expr(fromExpr, inLetExprBody, wStmts));
       } else {
-        Contract.Assert(false, $"not implemented for javascript: {fromType} -> {toType}");
+        EmitExpr(fromExpr, inLetExprBody, wr, wStmts);
       }
     }
 

Source/DafnyCore/Backends/SinglePassCodeGenerator/SinglePassCodeGenerator.cs

@@ -4572,9 +4572,9 @@ protected virtual void TrCallStmt(CallStmt s, string receiverReplacement, Concre
           if (!p.IsGhost) {
             wr.Write(sep);
             var fromType = s.Args[i].Type;
-            var toType = s.Method.Ins[i].Type;
-            var instantiatedToType = toType.Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
-            var w = EmitCoercionIfNecessary(fromType, instantiatedToType, s.Origin, wr, toType);
+            var origToType = s.Method.Original.Ins[i].Type;
+            var instantiatedToType = origToType.Subst(s.MethodSelect.TypeArgumentSubstitutionsWithParents());
+            var w = EmitCoercionIfNecessary(fromType, instantiatedToType, s.Origin, wr, origToType);
             w = EmitDowncastIfNecessary(fromType, instantiatedToType, s.Origin, w);
             EmitExpr(s.Args[i], false, w, wStmts);
             sep = ", ";
@@ -5350,7 +5350,7 @@ protected virtual void CompileFunctionCallExpr(FunctionCallExpr e, ConcreteSynta
           wr.Write(sep);
           var fromType = e.Args[i].Type;
           var instantiatedToType = e.Function.Ins[i].Type.Subst(e.TypeArgumentSubstitutionsWithParents());
-          var w = EmitCoercionIfNecessary(fromType, instantiatedToType, tok: e.Origin, wr: wr, e.Function.Ins[i].Type);
+          var w = EmitCoercionIfNecessary(fromType, instantiatedToType, tok: e.Origin, wr: wr, e.Function.Original.Ins[i].Type);
           w = EmitDowncastIfNecessary(fromType, instantiatedToType, e.Origin, w);
           tr(e.Args[i], w, inLetExprBody, wStmts);
           sep = ", ";

Source/DafnyCore/CompileNestedMatch/MatchFlattener.cs

@@ -160,12 +160,12 @@ private ExtendedPattern RemoveIllegalSubpatterns(ExtendedPattern pat, bool inDis
         return pat;
       case IdPattern p:
         if (inDisjunctivePattern && p.ResolvedLit == null && p.Arguments == null && !p.IsWildcardPattern) {
-          return new IdPattern(p.Origin, FreshTempVarName("_", null), null, p.IsGhost);
+          return new IdPattern(p.Origin, "_", null, p.IsGhost);
         }
         var args = p.Arguments?.ConvertAll(a => RemoveIllegalSubpatterns(a, inDisjunctivePattern));
         return new IdPattern(p.Origin, p.Id, p.Type, args, p.IsGhost) { ResolvedLit = p.ResolvedLit, BoundVar = p.BoundVar };
       case DisjunctivePattern p:
-        return new IdPattern(p.Origin, FreshTempVarName("_", null), null, p.IsGhost);
+        return new IdPattern(p.Origin, "_", null, p.IsGhost);
       default:
         Contract.Assert(false);
         return null;

Source/DafnyCore/DafnyGeneratedFromDafny.sh

@@ -27,10 +27,10 @@ else
   output="GeneratedFromDafny"
 fi
 
-../../Scripts/dafny translate cs dfyconfig.toml --output $output.cs $noverify
+../../Scripts/dafny translate cs dfyconfig.toml --type-system-refresh --general-traits=datatype --general-newtypes --output $output.cs $noverify
 # Exit with error code if the previous command fails
 if [ $? -ne 0 ]; then
   exit 1
 fi
 
-python3 DafnyGeneratedFromDafnyPost.py $output
+python3 DafnyGeneratedFromDafnyPost.py $output

Source/DafnyCore/DafnyMain.cs

@@ -89,10 +89,6 @@ public static string Resolve(Program program) {
         return null;
       }
 
-      if (program.Options.Get(CommonOptionBag.GeneralNewtypes) && !program.Options.Get(CommonOptionBag.TypeSystemRefresh)) {
-        return "use of --general-newtypes requires --type-system-refresh";
-      }
-
       var programResolver = new ProgramResolver(program);
 #pragma warning disable VSTHRD002
       LargeStackFactory.StartNew(() => programResolver.Resolve(CancellationToken.None)).Wait();

Source/DafnyCore/GeneratedFromDafny/Formatting.cs

@@ -23,7 +23,7 @@ public static System.String ReindentProgramFromFirstToken(Microsoft.Dafny.Token
       System.Text.StringBuilder _1_sb;
       System.Text.StringBuilder _nw0 = new System.Text.StringBuilder();
       _1_sb = _nw0;
-      while ((_0_token) != (object) ((Microsoft.Dafny.Token)null)) {
+      while ((_0_token) != (object) ((object)null)) {
         System.String _2_newLeadingTrivia;
         _2_newLeadingTrivia = (reindent).GetNewLeadingTrivia(_0_token);
         System.String _3_newTrailingTrivia;

Source/DafnyCore/GeneratedFromDafny/RAST.cs

@@ -1179,7 +1179,7 @@ public RAST._IFields ReplaceFields(RAST._IFields fields) {
         if (_source0.is_NamedFields) {
           Dafny.ISequence<RAST._IField> _0_sFields = _source0.dtor_fields;
           return RAST.Fields.create_NamedFields(Std.Collections.Seq.__default.Map<RAST._IField, RAST._IField>(((System.Func<RAST._IField, RAST._IField>)((_1_f) => {
-  return Dafny.Helpers.Let<RAST._IField, RAST._IField>(_1_f, _pat_let7_0 => Dafny.Helpers.Let<RAST._IField, RAST._IField>(_pat_let7_0, _2_dt__update__tmp_h0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IField>(Dafny.Helpers.Let<RAST._IFormal, RAST._IFormal>((_1_f).dtor_formal, _pat_let9_0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IFormal>(_pat_let9_0, _3_dt__update__tmp_h1 => Dafny.Helpers.Let<RAST._IType, RAST._IFormal>((this).ReplaceType(((_1_f).dtor_formal).dtor_tpe), _pat_let10_0 => Dafny.Helpers.Let<RAST._IType, RAST._IFormal>(_pat_let10_0, _4_dt__update_htpe_h0 => RAST.Formal.create((_3_dt__update__tmp_h1).dtor_name, _4_dt__update_htpe_h0))))), _pat_let8_0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IField>(_pat_let8_0, _5_dt__update_hformal_h0 => RAST.Field.create((_2_dt__update__tmp_h0).dtor_visibility, _5_dt__update_hformal_h0)))));
+  return Dafny.Helpers.Let<RAST._IField, RAST._IField>(_1_f, _pat_let7_0 => Dafny.Helpers.Let<RAST._IField, RAST._IField>(_pat_let7_0, _2_dt__update__tmp_h1 => Dafny.Helpers.Let<RAST._IFormal, RAST._IField>(Dafny.Helpers.Let<RAST._IFormal, RAST._IFormal>((_1_f).dtor_formal, _pat_let9_0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IFormal>(_pat_let9_0, _3_dt__update__tmp_h0 => Dafny.Helpers.Let<RAST._IType, RAST._IFormal>((this).ReplaceType(((_1_f).dtor_formal).dtor_tpe), _pat_let10_0 => Dafny.Helpers.Let<RAST._IType, RAST._IFormal>(_pat_let10_0, _4_dt__update_htpe_h0 => RAST.Formal.create((_3_dt__update__tmp_h0).dtor_name, _4_dt__update_htpe_h0))))), _pat_let8_0 => Dafny.Helpers.Let<RAST._IFormal, RAST._IField>(_pat_let8_0, _5_dt__update_hformal_h0 => RAST.Field.create((_2_dt__update__tmp_h1).dtor_visibility, _5_dt__update_hformal_h0)))));
 })), _0_sFields));
         }
       }

Source/DafnyCore/Generic/ErrorReporter.cs

@@ -87,7 +87,7 @@ public void Error(MessageSource source, Enum errorId, IOrigin tok, string format
     Contract.Requires(tok != null);
     Contract.Requires(format != null);
     Contract.Requires(args != null);
-    Error(source, errorId.ToString(), tok, string.Format(format, args));
+    Error(source, errorId.ToString(), tok, Format(format, args));
   }
 
   public void Error(MessageSource source, Enum errorId, IOrigin tok, string msg) {
@@ -156,7 +156,7 @@ public void Warning(MessageSource source, Enum errorId, IOrigin tok, string form
     Contract.Requires(tok != null);
     Contract.Requires(format != null);
     Contract.Requires(args != null);
-    Warning(source, errorId, tok, String.Format(format, args));
+    Warning(source, errorId, tok, Format(format, args));
   }
 
   public void Warning(MessageSource source, Enum errorId, IOrigin tok, string msg) {
@@ -196,7 +196,7 @@ public void Deprecated(MessageSource source, Enum errorId, IOrigin tok, string f
     Contract.Requires(format != null);
     Contract.Requires(args != null);
     if (Options.DeprecationNoise != 0) {
-      Warning(source, errorId, tok, String.Format(format, args));
+      Warning(source, errorId, tok, Format(format, args));
     }
   }
 
@@ -206,14 +206,22 @@ public void Info(MessageSource source, IOrigin tok, string msg, object errorId =
     Message(source, ErrorLevel.Info, errorId?.ToString(), tok, msg);
   }
 
-  public void Info(MessageSource source, IOrigin tok, string msg, params object[] args) {
+  public void Info(MessageSource source, IOrigin tok, string format, params object[] args) {
     Contract.Requires(tok != null);
-    Contract.Requires(msg != null);
+    Contract.Requires(format != null);
     Contract.Requires(args != null);
-    Info(source, tok, String.Format(msg, args));
+    Info(source, tok, Format(format, args));
+  }
+
+  private string Format(string format, object[] args) {
+    // In some cases, the "format" isn't actually a (Dafny-generated) format string, but a (user-defined) literal string.
+    // Such a user-defined literal may contain format information, like the "{0}" in the "ensures x in {0} <==> x in {1}".
+    // To prevent such string from going to string.Format, we first check if "args" has any arguments at all.
+    // This solves all known issues.
+    return args.Length == 0 ? format : string.Format(format, args);
   }
 
   public string ErrorToString(ErrorLevel header, SourceOrigin tok, string msg) {
     return $"{tok.OriginToString(Options)}: {header.ToString()}: {msg}";
   }
-}
+}