Value types

src/MiniZinc.Client/SolveResult.cs

@@ -126,62 +126,6 @@ public abstract record SolveResult<T>
             SolveStatus.Unsatisfiable => true,
             _ => false
         };
-
-    /// <summary>
-    /// Get the solution assigned to the given variable
-    /// </summary>
-    /// <param name="id">Name of the model variable</param>
-    /// <exception cref="Exception">The variable does not exists or was not of the expected type</exception>
-    public U Get<U>(string id)
-        where U : ExpressionSyntax
-    {
-        if (TryGet<U>(id) is not { } value)
-            throw new KeyNotFoundException($"Result did not contain a solution for \"{id}\"");
-
-        return value;
-    }
-
-    public ValueSyntax? TryGet(string id) => Data.Values.GetValueOrDefault(id);
-
-    /// <summary>
-    /// Try to get the solution assigned to the given variable
-    /// </summary>
-    /// <param name="id">Name of the model variable</param>
-    public U? TryGet<U>(string id)
-        where U : ExpressionSyntax
-    {
-        var value = TryGet(id);
-        if (value is null)
-            return null;
-
-        if (value is not U u)
-            throw new Exception();
-
-        return u;
-    }
-
-    public ExpressionSyntax this[string name] => Get<ExpressionSyntax>(name);
-
-    /// Get the int solution for the given variable
-    public int GetInt(string id) => Get<IntLiteralSyntax>(id).Value;
-
-    /// Get the bool solution for the given variable
-    public bool GetBool(string id) => Get<BoolLiteralSyntax>(id).Value;
-
-    /// Get the float solution for the given variable
-    public decimal GetFloat(string id) => Get<FloatLiteralSyntax>(id).Value;
-
-    /// Get the array solution for the given variable
-    public IEnumerable<U> GetArray1D<U>(string id)
-    {
-        var array = Get<Array1dSyntax>(id);
-        foreach (var node in array.Elements)
-        {
-            if (node is not ValueSyntax<U> literal)
-                throw new Exception();
-            yield return literal.Value;
-        }
-    }
 }
 
 public sealed record SolveResult : SolveResult<IntOrFloat> { }

src/MiniZinc.Client/SolverProcess.cs

@@ -258,7 +258,7 @@ private void OnSolutionOutput(SolutionOutput o)
             goto send;
         }
 
-        _data.Values.TryGetValue("_objective", out var objectiveNode);
+        _data.TryGetValue("_objective", out var objectiveNode);
         switch (objectiveNode)
         {
             case null:

src/MiniZinc.Parser/DataSyntax.cs

@@ -11,11 +11,10 @@
 /// Data is different from a <see cref="ModelSyntax"/> in that it can only
 /// contain assignments of the form `$name = $expr;`
 /// </remarks>
-public sealed class DataSyntax(Dictionary<string, ValueSyntax> values)
-    : IEquatable<IReadOnlyDictionary<string, ValueSyntax>>
+public sealed class DataSyntax(Dictionary<string, ValueSyntax> dict)
+    : IEquatable<IReadOnlyDictionary<string, ValueSyntax>>,
+        IReadOnlyDictionary<string, ValueSyntax>
 {
-    public IReadOnlyDictionary<string, ValueSyntax> Values => values;
-
     public string Write(WriteOptions? options = null)
     {
         var writer = new Writer(options);
@@ -30,6 +29,11 @@ public override string ToString()
         return mzn;
     }
 
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
     public bool Equals(IReadOnlyDictionary<string, ValueSyntax>? other)
     {
         if (other is null)
@@ -39,7 +43,7 @@ public bool Equals(IReadOnlyDictionary<string, ValueSyntax>? other)
             return true;
 
         // TODO - faster/better
-        foreach (var kv in values)
+        foreach (var kv in dict)
         {
             var name = kv.Key;
             var a = kv.Value;
@@ -57,18 +61,85 @@ public bool Equals(IReadOnlyDictionary<string, ValueSyntax>? other)
         foreach (var kv in other)
         {
             var name = kv.Key;
-            if (!values.ContainsKey(name))
+            if (!dict.ContainsKey(name))
                 return false;
         }
 
         return true;
     }
 
+    public IEnumerator<KeyValuePair<string, ValueSyntax>> GetEnumerator() => dict.GetEnumerator();
+
     public override bool Equals(object? obj)
     {
         if (!Equals(obj as IReadOnlyDictionary<string, ExpressionSyntax>))
             return false;
 
         return true;
     }
+
+    /// <summary>
+    /// Get the solution assigned to the given variable
+    /// </summary>
+    /// <param name="id">Name of the model variable</param>
+    /// <exception cref="Exception">The variable does not exists or was not of the expected type</exception>
+    public U Get<U>(string id)
+        where U : ExpressionSyntax
+    {
+        if (TryGet<U>(id) is not { } value)
+            throw new KeyNotFoundException($"Result did not contain a solution for \"{id}\"");
+
+        return value;
+    }
+
+    public ValueSyntax? TryGet(string id) => dict.GetValueOrDefault(id);
+
+    /// <summary>
+    /// Try to get the solution assigned to the given variable
+    /// </summary>
+    /// <param name="id">Name of the model variable</param>
+    public U? TryGet<U>(string id)
+        where U : ExpressionSyntax
+    {
+        var value = TryGet(id);
+        if (value is null)
+            return null;
+
+        if (value is not U u)
+            throw new Exception();
+
+        return u;
+    }
+
+    public bool ContainsKey(string key) => dict.ContainsKey(key);
+
+    public bool TryGetValue(string key, out ValueSyntax value) => dict.TryGetValue(key, out value);
+
+    public ValueSyntax this[string name] => Get<ValueSyntax>(name);
+
+    public IEnumerable<string> Keys => dict.Keys;
+    public IEnumerable<ValueSyntax> Values => dict.Values;
+
+    /// Get the int solution for the given variable
+    public int GetInt(string id) => Get<IntLiteralSyntax>(id);
+
+    /// Get the bool solution for the given variable
+    public bool GetBool(string id) => Get<BoolLiteralSyntax>(id);
+
+    /// Get the float solution for the given variable
+    public decimal GetFloat(string id) => Get<FloatLiteralSyntax>(id);
+
+    /// Get the array solution for the given variable
+    public IEnumerable<U> GetArray1D<U>(string id)
+    {
+        var array = Get<Array1dValueSyntax>(id);
+        foreach (var node in array.Values)
+        {
+            if (node is not ValueSyntax<U> literal)
+                throw new Exception();
+            yield return literal.Value;
+        }
+    }
+
+    public int Count { get; }
 }

src/MiniZinc.Parser/Expressions/IdentifierSyntax.cs

@@ -10,4 +10,6 @@ public IdentifierSyntax(in Token token)
     public string Name => Start.StringValue;
 
     public override string ToString() => Start.ToString();
+
+    public static implicit operator string(IdentifierSyntax f) => f.Name;
 }