mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-06 10:54:49 +01:00
Rename the builtin FloatType to LegacyFloatType, Error to ErrorInst (#4555)
This is for more clearly distinct names, and to make it a clearer transition from `BuiltinInst` for name conflicts. `FloatType` is also an instruction, and we have `Carbon::Error` (common/error.h). This avoids affecting tests, although the name is embedded in the builtin test. In `LegacyFloatType`, `Legacy` because I was having trouble coming up with a more appropriate name. I'm not clear this is a `FloatLiteralType` at present, it needs some work to mirror `IntLiteralType`. In `ErrorInst`, the suffix `Inst` was discussed as good and similar to `BuiltinInst` (although I'm trying to get rid of that).
This commit is contained in:
@@ -569,7 +569,7 @@ static auto CheckCompleteAdapterClassType(Context& context,
|
||||
.Build(class_info.adapt_id, AdaptWithBase)
|
||||
.Note(class_info.base_id, AdaptWithBaseHere)
|
||||
.Emit();
|
||||
return SemIR::InstId::BuiltinError;
|
||||
return SemIR::InstId::BuiltinErrorInst;
|
||||
}
|
||||
|
||||
if (auto fields = context.struct_type_fields().Get(fields_id);
|
||||
@@ -584,7 +584,7 @@ static auto CheckCompleteAdapterClassType(Context& context,
|
||||
.Build(class_info.adapt_id, AdaptWithFields)
|
||||
.Note(first_field_inst_id, AdaptWithFieldHere)
|
||||
.Emit();
|
||||
return SemIR::InstId::BuiltinError;
|
||||
return SemIR::InstId::BuiltinErrorInst;
|
||||
}
|
||||
|
||||
for (auto inst_id : context.inst_block_stack().PeekCurrentBlockContents()) {
|
||||
@@ -601,7 +601,7 @@ static auto CheckCompleteAdapterClassType(Context& context,
|
||||
.Build(class_info.adapt_id, AdaptWithVirtual)
|
||||
.Note(inst_id, AdaptWithVirtualHere)
|
||||
.Emit();
|
||||
return SemIR::InstId::BuiltinError;
|
||||
return SemIR::InstId::BuiltinErrorInst;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user