Switch SemanticsIR dumps to produce YAML (#2517)

The parser and lexer already produce YAML, so this is fundamentally a consistency issue. I've been thinking about this, and was looking again because I'm working on adding callables, and figured I'd just fix it now.
This commit is contained in:
Jon Ross-Perkins
2023-01-18 17:43:17 -08:00
committed by GitHub
parent 0d279b388a
commit a1f2d6341f
26 changed files with 755 additions and 665 deletions
+29 -29
View File
@@ -4,35 +4,35 @@
//
// AUTOUPDATE
// RUN: %{carbon-run-semantics}
// CHECK:STDOUT: cross_reference_irs.size == 1,
// CHECK:STDOUT: integer_literals = {
// CHECK:STDOUT: int0 = 0;
// CHECK:STDOUT: },
// CHECK:STDOUT: strings = {
// CHECK:STDOUT: str0 = "Main";
// CHECK:STDOUT: },
// CHECK:STDOUT: nodes = {
// CHECK:STDOUT: node0 = CrossReference(ir0, block0): node0;
// CHECK:STDOUT: node1 = CrossReference(ir0, block1): node1;
// CHECK:STDOUT: node2 = CrossReference(ir0, block2): node0;
// CHECK:STDOUT: node3 = CrossReference(ir0, block3): node0;
// CHECK:STDOUT: node4 = FunctionDeclaration();
// CHECK:STDOUT: node5 = BindName(str0, node4);
// CHECK:STDOUT: node6 = FunctionDefinition(node4, block1);
// CHECK:STDOUT: node7 = IntegerLiteral(int0): node2;
// CHECK:STDOUT: node8 = ReturnExpression(node7): node2;
// CHECK:STDOUT: },
// CHECK:STDOUT: node_blocks = {
// CHECK:STDOUT: block0 = {
// CHECK:STDOUT: node4;
// CHECK:STDOUT: node5;
// CHECK:STDOUT: node6;
// CHECK:STDOUT: },
// CHECK:STDOUT: block1 = {
// CHECK:STDOUT: node7;
// CHECK:STDOUT: node8;
// CHECK:STDOUT: },
// CHECK:STDOUT: }
// CHECK:STDOUT: cross_reference_irs_size: 1
// CHECK:STDOUT: integer_literals: [
// CHECK:STDOUT: 0,
// CHECK:STDOUT: ]
// CHECK:STDOUT: strings: [
// CHECK:STDOUT: Main,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block0, type: node0},
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block1, type: node1},
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block2, type: node0},
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block3, type: node0},
// CHECK:STDOUT: {kind: FunctionDeclaration},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node4},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node4, arg1: block1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node7, type: node2},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
// CHECK:STDOUT: node4,
// CHECK:STDOUT: node5,
// CHECK:STDOUT: node6,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node7,
// CHECK:STDOUT: node8,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
fn Main() {
return 0;
+26 -26
View File
@@ -4,32 +4,32 @@
//
// AUTOUPDATE
// RUN: %{carbon-run-semantics}
// CHECK:STDOUT: cross_reference_irs.size == 1,
// CHECK:STDOUT: integer_literals = {
// CHECK:STDOUT: },
// CHECK:STDOUT: strings = {
// CHECK:STDOUT: str0 = "Main";
// CHECK:STDOUT: },
// CHECK:STDOUT: nodes = {
// CHECK:STDOUT: node0 = CrossReference(ir0, block0): node0;
// CHECK:STDOUT: node1 = CrossReference(ir0, block1): node1;
// CHECK:STDOUT: node2 = CrossReference(ir0, block2): node0;
// CHECK:STDOUT: node3 = CrossReference(ir0, block3): node0;
// CHECK:STDOUT: node4 = FunctionDeclaration();
// CHECK:STDOUT: node5 = BindName(str0, node4);
// CHECK:STDOUT: node6 = FunctionDefinition(node4, block1);
// CHECK:STDOUT: node7 = Return();
// CHECK:STDOUT: },
// CHECK:STDOUT: node_blocks = {
// CHECK:STDOUT: block0 = {
// CHECK:STDOUT: node4;
// CHECK:STDOUT: node5;
// CHECK:STDOUT: node6;
// CHECK:STDOUT: },
// CHECK:STDOUT: block1 = {
// CHECK:STDOUT: node7;
// CHECK:STDOUT: },
// CHECK:STDOUT: }
// CHECK:STDOUT: cross_reference_irs_size: 1
// CHECK:STDOUT: integer_literals: [
// CHECK:STDOUT: ]
// CHECK:STDOUT: strings: [
// CHECK:STDOUT: Main,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block0, type: node0},
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block1, type: node1},
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block2, type: node0},
// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: block3, type: node0},
// CHECK:STDOUT: {kind: FunctionDeclaration},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node4},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node4, arg1: block1},
// CHECK:STDOUT: {kind: Return},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
// CHECK:STDOUT: node4,
// CHECK:STDOUT: node5,
// CHECK:STDOUT: node6,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node7,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
fn Main() {
return;