fix error message (neo-project#854)

Jim8y · Jan 4, 2024 · 8fdc94d · 8fdc94d
1 parent 065f04d
commit 8fdc94d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/src/Neo.Compiler.CSharp/DiagnosticId.cs b/src/Neo.Compiler.CSharp/DiagnosticId.cs
@@ -33,5 +33,6 @@ static class DiagnosticId
         public const string InvalidMethodName = "NC3002";
         public const string MethodNameConflict = "NC3003";
         public const string EventNameConflict = "NC3004";
+        public const string InvalidInitialValue = "NC3005";
     }
 }
diff --git a/src/Neo.Compiler.CSharp/MethodConvert.cs b/src/Neo.Compiler.CSharp/MethodConvert.cs
@@ -339,22 +339,29 @@ private void ProcessFieldInitializer(SemanticModel model, IFieldSymbol field, Ac
                 preInitialize?.Invoke();
                 string value = (string)initialValue.ConstructorArguments[0].Value!;
                 ContractParameterType type = (ContractParameterType)initialValue.ConstructorArguments[1].Value!;
-                switch (type)
+                try
                 {
-                    case ContractParameterType.String:
-                        Push(value);
-                        break;
-                    case ContractParameterType.ByteArray:
-                        Push(value.HexToBytes(true));
-                        break;
-                    case ContractParameterType.Hash160:
-                        Push((UInt160.TryParse(value, out var hash) ? hash : value.ToScriptHash(context.Options.AddressVersion)).ToArray());
-                        break;
-                    case ContractParameterType.PublicKey:
-                        Push(ECPoint.Parse(value, ECCurve.Secp256r1).EncodePoint(true));
-                        break;
-                    default:
-                        throw new CompilationException(field, DiagnosticId.InvalidInitialValueType, $"Unsupported initial value type: {type}");
+                    switch (type)
+                    {
+                        case ContractParameterType.String:
+                            Push(value);
+                            break;
+                        case ContractParameterType.ByteArray:
+                            Push(value.HexToBytes(true));
+                            break;
+                        case ContractParameterType.Hash160:
+                            Push((UInt160.TryParse(value, out var hash) ? hash : value.ToScriptHash(context.Options.AddressVersion)).ToArray());
+                            break;
+                        case ContractParameterType.PublicKey:
+                            Push(ECPoint.Parse(value, ECCurve.Secp256r1).EncodePoint(true));
+                            break;
+                        default:
+                            throw new CompilationException(field, DiagnosticId.InvalidInitialValueType, $"Unsupported initial value type: {type}");
+                    }
+                }
+                catch (Exception ex) when (ex is not CompilationException)
+                {
+                    throw new CompilationException(field, DiagnosticId.InvalidInitialValue, $"Invalid initial value: {value} of type: {type}");
                 }
                 postInitialize?.Invoke();
             }