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

Give reference unions the exception treatment #424

Merged
merged 1 commit into from
Feb 22, 2024
Merged

Give reference unions the exception treatment #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions src/FlatSharp.Compiler/SchemaModel/ReferenceUnionSchemaModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private void AddUnionMember(CodeWriter writer, string resolvedType, EnumVal valu
writer.AppendLine($"if (this.Discriminator != {value.Value})");
using (writer.WithBlock())
{
writer.AppendLine("throw new InvalidOperationException();");
writer.AppendLine($"{typeof(FSThrow).GGCTN()}.{nameof(FSThrow.InvalidOperation_UnionIsNotOfType)}();");
}

writer.AppendLine($"return this.value_{value.Value}!;");
Expand Down Expand Up @@ -189,8 +189,12 @@ private void WriteAcceptMethod(
long index = item.value.Value;
writer.AppendLine($"case {index}: return visitor.Visit(this.value_{item.value.Value});");
}

writer.AppendLine($"default: throw new {typeof(InvalidOperationException).GetCompilableTypeName()}(\"Unexpected discriminator: \" + disc);");
writer.AppendLine($"default:");
using (writer.IncreaseIndent())
{
writer.AppendLine($"{typeof(FSThrow).GGCTN()}.{nameof(FSThrow.InvalidOperation_InvalidUnionDiscriminator)}<{this.Name}>(disc);");
writer.AppendLine("return default(TReturn);");
}
}
}
}
Expand All @@ -205,7 +209,7 @@ private void WriteConstructor(CodeWriter writer, string resolvedType, EnumVal un
writer.AppendLine("if (value is null)");
using (writer.WithBlock())
{
writer.AppendLine("throw new ArgumentNullException(nameof(value));");
writer.AppendLine($"{typeof(FSThrow).GGCTN()}.{nameof(FSThrow.ArgumentNull)}(nameof(value));");
}
}

Expand Down
Loading