Skip to content

Commit f8710a3

Browse files
committed
Migrate serialization to an enum
1 parent 85c011d commit f8710a3

31 files changed

Lines changed: 281 additions & 128 deletions

.idea/workspace.xml

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

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TinyRustSymbolTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import java.util.function.BiConsumer;
1414
import java.util.function.Predicate;
1515

16-
import static ko.carbonel.json.SerializeClass.AST;
17-
import static ko.carbonel.json.SerializeClass.TS;
16+
import static ko.carbonel.json.SerializeClass.Value.AST;
17+
import static ko.carbonel.json.SerializeClass.Value.TS;
1818

1919
public final class TinyRustSymbolTable implements SymbolTable {
2020
public static final String OBJECT = "Object";

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ArrayAccessExpressionEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import ko.carbonel.compiler.stream.reader.FileLocation;
77
import ko.carbonel.json.SerializeClass;
88

9-
import static ko.carbonel.json.SerializeClass.AST;
9+
import static ko.carbonel.json.SerializeClass.Value.AST;
1010

1111
public class ArrayAccessExpressionEntry extends ExpressionEntry {
1212
@SerializeClass(AST) public ExpressionEntry array;

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/BinaryExpressionEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import java.util.Optional;
1313

14-
import static ko.carbonel.json.SerializeClass.AST;
14+
import static ko.carbonel.json.SerializeClass.Value.AST;
1515

1616
public class BinaryExpressionEntry extends ExpressionEntry {
1717
@SerializeClass(AST)

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ChainedExpressionEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import ko.carbonel.compiler.stream.reader.FileLocation;
77
import ko.carbonel.json.SerializeClass;
88

9-
import static ko.carbonel.json.SerializeClass.AST;
9+
import static ko.carbonel.json.SerializeClass.Value.AST;
1010

1111
public class ChainedExpressionEntry extends ExpressionEntry {
1212
@SerializeClass(AST) public ExpressionEntry base;

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/ClassRefEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import ko.carbonel.compiler.stream.reader.FileLocation;
1010
import ko.carbonel.json.SerializeClass;
1111

12-
import static ko.carbonel.json.SerializeClass.AST;
12+
import static ko.carbonel.json.SerializeClass.Value.AST;
1313

1414
public class ClassRefEntry extends AttributeAccessEntry {
1515
@SerializeClass(AST) public TinyRustLexerToken name;

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/FieldAccessEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import ko.carbonel.compiler.stream.reader.FileLocation;
99
import ko.carbonel.json.SerializeClass;
1010

11-
import static ko.carbonel.json.SerializeClass.AST;
11+
import static ko.carbonel.json.SerializeClass.Value.AST;
1212

1313
public class FieldAccessEntry extends AttributeAccessEntry {
1414
@SerializeClass(AST) public TinyRustLexerToken fieldName;

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/LiteralExpressionEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import ko.carbonel.compiler.stream.reader.FileLocation;
88
import ko.carbonel.json.SerializeClass;
99

10-
import static ko.carbonel.json.SerializeClass.AST;
10+
import static ko.carbonel.json.SerializeClass.Value.AST;
1111

1212
public class LiteralExpressionEntry extends ExpressionEntry {
1313
@SerializeClass(AST)

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/MethodCallExpressionEntry.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111

1212
import java.util.List;
1313

14+
import static ko.carbonel.json.SerializeClass.Value.AST;
15+
1416
public class MethodCallExpressionEntry extends AttributeAccessEntry {
15-
@SerializeClass("ast")
17+
@SerializeClass(AST)
1618
public TinyRustLexerToken methodName;
17-
@SerializeClass("ast")
19+
@SerializeClass(AST)
1820
public List<ExpressionEntry> arguments;
1921

2022
public TinyRustLexerToken methodName() {

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/expression/NewArrayExpressionEntry.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import ko.carbonel.compiler.stream.reader.FileLocation;
99
import ko.carbonel.json.SerializeClass;
1010

11+
import static ko.carbonel.json.SerializeClass.Value.AST;
12+
1113
public class NewArrayExpressionEntry extends ExpressionEntry {
12-
@SerializeClass("ast") public ExpressionEntry size;
13-
@SerializeClass("ast") public TinyRustLexerToken type;
14+
@SerializeClass(AST) public ExpressionEntry size;
15+
@SerializeClass(AST) public TinyRustLexerToken type;
1416

1517
public ExpressionEntry size() {
1618
return size;

0 commit comments

Comments
 (0)