More fixes

Source/DafnyCore/Options/DafnyProject.cs

@@ -143,33 +143,40 @@ public class DafnyProject : IEquatable<DafnyProject> {
  return false;
  }
 
- var printTomlValue = PrintTomlOptionToCliValue(tomlValue);
+ var printTomlValue = PrintTomlOptionToCliValue(tomlValue, option);
  var parseResult = option.Parse(new[] { option.Aliases.First(), printTomlValue });
  if (parseResult.Errors.Any()) {
+ errorWriter.WriteLine($"Error: Could not parse value '{tomlValue}' for option '{option.Name}' that has type '{option.ValueType.Name}'");
  value = null;
  return false;
  }
- var previousWorkingDirectory = Directory.GetCurrentDirectory();
- // Change the current directory, for when converting string to file-paths.
- Directory.SetCurrentDirectory(Path.GetDirectoryName(Uri.LocalPath)!);
  // By using the dynamic keyword, we can use the generic version of GetValueForOption which does type conversion,
  // which is sadly not accessible without generics.
  value = parseResult.GetValueForOption((dynamic)option);
- Directory.SetCurrentDirectory(previousWorkingDirectory);
  return true;
  }
 
- record Verbatim(string value) {
- public override string ToString() {
- return value;
- }
- }
+ string PrintTomlOptionToCliValue(object value, Option valueType) {
+ var projectDirectory = Path.GetDirectoryName(Uri.LocalPath);
 
- string PrintTomlOptionToCliValue(object value) {
  if (value is TomlArray array) {
+ if (valueType.ValueType == typeof(IEnumerable<FileInfo>)) {
+ return string.Join(" ", array.Select(element => {
+ if (element is string elementString) {
+ return Path.GetFullPath(elementString, projectDirectory!);
+ }
+
+ return element.ToString();
+ }));
+ }
+
  return string.Join(" ", array);
  }
 
+ if (value is string stringValue && valueType.ValueType == typeof(FileInfo)) {
+ value = Path.GetFullPath(stringValue, projectDirectory);
+ }
+
  return value.ToString();
  }
 

Test/cli/projectFile/projectFile.dfy.expect

@@ -9,7 +9,7 @@ Warning: only Dafny project files named dfyconfig.toml are recognised by the Daf
 Warning: option 'does-not-exist' that was specified in the project file, is not a valid Dafny option.
 
 Dafny program verifier did not attempt verification
-Error: property 'warn-shadowing' is of type 'System.Int64' but should be of type 'System.Boolean'
+Error: Could not parse value '3' for option 'warn-shadowing' that has type 'Boolean'
 input.dfy(6,8): Warning: Shadowed local-variable name: x
 moreInput.dfy(6,8): Warning: Shadowed local-variable name: x