Simplified intermediate emitting for structures.

It is now equivalent to how functions are emitted.
PhosphorLang · Mar 9, 2024 · 4f6c50e · 4f6c50e
1 parent 0eb207f
commit 4f6c50e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/src/transpiler/common/instructions/index.ts b/src/transpiler/common/instructions/index.ts
@@ -3,4 +3,3 @@ export { Instruction } from './instruction';
 export { FunctionInstruction as Function } from './functionInstruction';
 export { LabelInstruction as Label } from './labelInstruction';
 export { RenderOptions as RenderOptions } from './renderOptions';
-export { StructureInstruction as Structure } from './structureInstruction';
diff --git a/src/transpiler/common/instructions/structureInstruction.ts b/src/transpiler/common/instructions/structureInstruction.ts
diff --git a/src/transpiler/intermediate/transpilerIntermediate.ts b/src/transpiler/intermediate/transpilerIntermediate.ts
@@ -233,20 +233,24 @@ export class TranspilerIntermediate
 
     private transpileStructure (structureIntermediate: Intermediates.Structure): void
     {
-        const fieldStrings: string[] = [];
+        this.instructions.push(
+            new Instructions.Instruction(
+                this.getIntermediateInstructionString(structureIntermediate),
+                structureIntermediate.symbol.name
+            ),
+            new Instructions.Instruction('{'),
+        );
+
         for (const field of structureIntermediate.symbol.fields)
         {
-            const fieldString = `${field.name}: ${field.size}`;
-            fieldStrings.push(fieldString);
+            this.instructions.push(
+                new Instructions.Instruction(`${field.name}:`, `${field.size}`),
+            );
         }
 
-        const instruction = new Instructions.Structure(
-            this.getIntermediateInstructionString(structureIntermediate),
-            structureIntermediate.symbol.name,
-            fieldStrings,
+        this.instructions.push(
+            new Instructions.Instruction('}'),
         );
-
-        this.instructions.push(instruction);
     }
 
     private transpileFunction (functionIntermediate: Intermediates.Function): void