Skip to content

Commit e9b8340

Browse files
author
estudiante
committed
Fix AST field index
1 parent 5a06ed0 commit e9b8340

13 files changed

Lines changed: 3736 additions & 876 deletions

File tree

.idea/workspace.xml

Lines changed: 56 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

foo.asm

Whitespace-only changes.

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ts/ClassEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ private void checkIfMethodNameClash(TinyRustLexerToken name) {
240240
}
241241

242242
protected void consolidateFields() {
243-
List<VariableEntry> allFields = Utils.concat(superClassLink.fields, fields);
244-
IntStream.range(0, fields.size()).forEach(i -> fields.get(i).index = superClassLink.fields.size() + i); // Set index self fields
243+
List<VariableEntry> allFields = getAllFields();
244+
IntStream.range(0, fields.size()).forEach(i -> fields.get(i).index = superClassLink.getAllFields().size() + i); // Set index self fields
245245
List<VariableEntry> repeatedFields = Utils.getRepeatedAttributeNames(allFields);
246246
if (!repeatedFields.isEmpty()) throw new FieldRedeclaredError(repeatedFields);
247247
fields.forEach(VariableEntry::consolidate);

0 commit comments

Comments
 (0)