diff options
Diffstat (limited to 'src/main')
42 files changed, 42 insertions, 42 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/AnnotationNode.java b/src/main/java/org/zwobble/couscous/ast/AnnotationNode.java index ab7b05a..b52f7e6 100644 --- a/src/main/java/org/zwobble/couscous/ast/AnnotationNode.java +++ b/src/main/java/org/zwobble/couscous/ast/AnnotationNode.java @@ -20,7 +20,7 @@ public class AnnotationNode implements Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.ANNOTATION; } diff --git a/src/main/java/org/zwobble/couscous/ast/ArrayNode.java b/src/main/java/org/zwobble/couscous/ast/ArrayNode.java index 804f051..336cbc6 100644 --- a/src/main/java/org/zwobble/couscous/ast/ArrayNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ArrayNode.java @@ -33,7 +33,7 @@ public class ArrayNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.ARRAY; } diff --git a/src/main/java/org/zwobble/couscous/ast/AssignmentNode.java b/src/main/java/org/zwobble/couscous/ast/AssignmentNode.java index 89f09a8..eafdd34 100644 --- a/src/main/java/org/zwobble/couscous/ast/AssignmentNode.java +++ b/src/main/java/org/zwobble/couscous/ast/AssignmentNode.java @@ -41,7 +41,7 @@ public class AssignmentNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.ASSIGNMENT; } diff --git a/src/main/java/org/zwobble/couscous/ast/CastNode.java b/src/main/java/org/zwobble/couscous/ast/CastNode.java index ef9af52..c7de534 100644 --- a/src/main/java/org/zwobble/couscous/ast/CastNode.java +++ b/src/main/java/org/zwobble/couscous/ast/CastNode.java @@ -27,7 +27,7 @@ public class CastNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.CAST; } diff --git a/src/main/java/org/zwobble/couscous/ast/ClassNode.java b/src/main/java/org/zwobble/couscous/ast/ClassNode.java index fd78626..3a53cfd 100644 --- a/src/main/java/org/zwobble/couscous/ast/ClassNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ClassNode.java @@ -92,7 +92,7 @@ public class ClassNode implements TypeNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.CLASS; } diff --git a/src/main/java/org/zwobble/couscous/ast/ConstructorCallNode.java b/src/main/java/org/zwobble/couscous/ast/ConstructorCallNode.java index 715c34a..238d70b 100644 --- a/src/main/java/org/zwobble/couscous/ast/ConstructorCallNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ConstructorCallNode.java @@ -34,7 +34,7 @@ public class ConstructorCallNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.CONSTRUCTOR_CALL; } diff --git a/src/main/java/org/zwobble/couscous/ast/ConstructorNode.java b/src/main/java/org/zwobble/couscous/ast/ConstructorNode.java index a7843eb..5f118dd 100644 --- a/src/main/java/org/zwobble/couscous/ast/ConstructorNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ConstructorNode.java @@ -34,7 +34,7 @@ public class ConstructorNode implements Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.CONSTRUCTOR; } diff --git a/src/main/java/org/zwobble/couscous/ast/EnumNode.java b/src/main/java/org/zwobble/couscous/ast/EnumNode.java index 35200ce..92084dd 100644 --- a/src/main/java/org/zwobble/couscous/ast/EnumNode.java +++ b/src/main/java/org/zwobble/couscous/ast/EnumNode.java @@ -50,7 +50,7 @@ public class EnumNode implements TypeNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.ENUM; } diff --git a/src/main/java/org/zwobble/couscous/ast/ExpressionStatementNode.java b/src/main/java/org/zwobble/couscous/ast/ExpressionStatementNode.java index 5c4aaaf..11d593b 100644 --- a/src/main/java/org/zwobble/couscous/ast/ExpressionStatementNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ExpressionStatementNode.java @@ -19,7 +19,7 @@ public class ExpressionStatementNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.EXPRESSION_STATEMENT; } diff --git a/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java b/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java index 0bb8ffe..558b5b9 100644 --- a/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java @@ -60,7 +60,7 @@ public class FieldAccessNode implements AssignableExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.FIELD_ACCESS; } diff --git a/src/main/java/org/zwobble/couscous/ast/FieldDeclarationNode.java b/src/main/java/org/zwobble/couscous/ast/FieldDeclarationNode.java index f6fe1b3..e96d89c 100644 --- a/src/main/java/org/zwobble/couscous/ast/FieldDeclarationNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FieldDeclarationNode.java @@ -40,7 +40,7 @@ public class FieldDeclarationNode implements Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.FIELD_DECLARATION; } diff --git a/src/main/java/org/zwobble/couscous/ast/ForEachNode.java b/src/main/java/org/zwobble/couscous/ast/ForEachNode.java index e30f130..515cceb 100644 --- a/src/main/java/org/zwobble/couscous/ast/ForEachNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ForEachNode.java @@ -29,7 +29,7 @@ public class ForEachNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.FOR_EACH; } diff --git a/src/main/java/org/zwobble/couscous/ast/ForNode.java b/src/main/java/org/zwobble/couscous/ast/ForNode.java index 4642b85..4b14a49 100644 --- a/src/main/java/org/zwobble/couscous/ast/ForNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ForNode.java @@ -42,7 +42,7 @@ public class ForNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.FOR; } diff --git a/src/main/java/org/zwobble/couscous/ast/FormalArgumentNode.java b/src/main/java/org/zwobble/couscous/ast/FormalArgumentNode.java index 797c875..92e932a 100644 --- a/src/main/java/org/zwobble/couscous/ast/FormalArgumentNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FormalArgumentNode.java @@ -28,7 +28,7 @@ public class FormalArgumentNode implements VariableNode, Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.FORMAL_ARGUMENT; } diff --git a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java index f4fd8f9..0d1df8e 100644 --- a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java @@ -29,7 +29,7 @@ public class FormalTypeParameterNode implements Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.FORMAL_TYPE_PARAMETER; } diff --git a/src/main/java/org/zwobble/couscous/ast/IfStatementNode.java b/src/main/java/org/zwobble/couscous/ast/IfStatementNode.java index d164939..aa0ea56 100644 --- a/src/main/java/org/zwobble/couscous/ast/IfStatementNode.java +++ b/src/main/java/org/zwobble/couscous/ast/IfStatementNode.java @@ -40,7 +40,7 @@ public class IfStatementNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.IF_STATEMENT; } diff --git a/src/main/java/org/zwobble/couscous/ast/InstanceOfNode.java b/src/main/java/org/zwobble/couscous/ast/InstanceOfNode.java index e47490f..26c8673 100644 --- a/src/main/java/org/zwobble/couscous/ast/InstanceOfNode.java +++ b/src/main/java/org/zwobble/couscous/ast/InstanceOfNode.java @@ -29,7 +29,7 @@ public class InstanceOfNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.INSTANCE_OF; } diff --git a/src/main/java/org/zwobble/couscous/ast/InstanceReceiver.java b/src/main/java/org/zwobble/couscous/ast/InstanceReceiver.java index 6227131..ad117f8 100644 --- a/src/main/java/org/zwobble/couscous/ast/InstanceReceiver.java +++ b/src/main/java/org/zwobble/couscous/ast/InstanceReceiver.java @@ -24,7 +24,7 @@ public class InstanceReceiver implements Receiver { } @Override - public int type() { + public int nodeType() { return NodeTypes.INSTANCE_RECEIVER; } diff --git a/src/main/java/org/zwobble/couscous/ast/InterfaceNode.java b/src/main/java/org/zwobble/couscous/ast/InterfaceNode.java index 8af21c7..de151e4 100644 --- a/src/main/java/org/zwobble/couscous/ast/InterfaceNode.java +++ b/src/main/java/org/zwobble/couscous/ast/InterfaceNode.java @@ -65,7 +65,7 @@ public class InterfaceNode implements TypeNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.INTERFACE; } diff --git a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java index 7e7be0b..43e5c0b 100644 --- a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java +++ b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java @@ -58,7 +58,7 @@ public class LiteralNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.LITERAL; } diff --git a/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java b/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java index 550f58b..0bd14ef 100644 --- a/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java +++ b/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java @@ -50,7 +50,7 @@ public class LocalVariableDeclarationNode implements VariableNode, StatementNode } @Override - public int type() { + public int nodeType() { return NodeTypes.LOCAL_VARIABLE_DECLARATION; } diff --git a/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java b/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java index 61419e4..2a6f408 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java @@ -154,7 +154,7 @@ public class MethodCallNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.METHOD_CALL; } diff --git a/src/main/java/org/zwobble/couscous/ast/MethodNode.java b/src/main/java/org/zwobble/couscous/ast/MethodNode.java index 42b6f5d..ccef0da 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodNode.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodNode.java @@ -189,7 +189,7 @@ public class MethodNode implements Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.METHOD; } diff --git a/src/main/java/org/zwobble/couscous/ast/Node.java b/src/main/java/org/zwobble/couscous/ast/Node.java index 643730b..16b3f97 100644 --- a/src/main/java/org/zwobble/couscous/ast/Node.java +++ b/src/main/java/org/zwobble/couscous/ast/Node.java @@ -3,7 +3,7 @@ package org.zwobble.couscous.ast; import org.zwobble.couscous.ast.visitors.NodeTransformer; public interface Node { - int type(); + int nodeType(); Iterable<? extends Node> childNodes(); Node transformSubtree(NodeTransformer transformer); } diff --git a/src/main/java/org/zwobble/couscous/ast/OperationNode.java b/src/main/java/org/zwobble/couscous/ast/OperationNode.java index 6373642..dbff078 100644 --- a/src/main/java/org/zwobble/couscous/ast/OperationNode.java +++ b/src/main/java/org/zwobble/couscous/ast/OperationNode.java @@ -46,7 +46,7 @@ public class OperationNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.OPERATION; } diff --git a/src/main/java/org/zwobble/couscous/ast/ReturnNode.java b/src/main/java/org/zwobble/couscous/ast/ReturnNode.java index 90d4fed..6ee05e2 100644 --- a/src/main/java/org/zwobble/couscous/ast/ReturnNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ReturnNode.java @@ -19,7 +19,7 @@ public class ReturnNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.RETURN; } diff --git a/src/main/java/org/zwobble/couscous/ast/StatementBlockNode.java b/src/main/java/org/zwobble/couscous/ast/StatementBlockNode.java index 79b092a..dc85c48 100644 --- a/src/main/java/org/zwobble/couscous/ast/StatementBlockNode.java +++ b/src/main/java/org/zwobble/couscous/ast/StatementBlockNode.java @@ -16,7 +16,7 @@ public class StatementBlockNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.STATEMENT_BLOCK; } diff --git a/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java b/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java index 862c6e4..7ae7ec1 100644 --- a/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java +++ b/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java @@ -29,7 +29,7 @@ public class StaticReceiver implements Receiver { } @Override - public int type() { + public int nodeType() { return NodeTypes.STATIC_RECEIVER; } diff --git a/src/main/java/org/zwobble/couscous/ast/TernaryConditionalNode.java b/src/main/java/org/zwobble/couscous/ast/TernaryConditionalNode.java index 47a7695..556b99a 100644 --- a/src/main/java/org/zwobble/couscous/ast/TernaryConditionalNode.java +++ b/src/main/java/org/zwobble/couscous/ast/TernaryConditionalNode.java @@ -38,7 +38,7 @@ public class TernaryConditionalNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.TERNARY_CONDITIONAL; } diff --git a/src/main/java/org/zwobble/couscous/ast/ThisReferenceNode.java b/src/main/java/org/zwobble/couscous/ast/ThisReferenceNode.java index 121cbc4..fc94d7d 100644 --- a/src/main/java/org/zwobble/couscous/ast/ThisReferenceNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ThisReferenceNode.java @@ -25,7 +25,7 @@ public class ThisReferenceNode implements ExpressionNode, ReferenceNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.THIS_REFERENCE; } diff --git a/src/main/java/org/zwobble/couscous/ast/ThrowNode.java b/src/main/java/org/zwobble/couscous/ast/ThrowNode.java index 2b4c530..fdfeba3 100644 --- a/src/main/java/org/zwobble/couscous/ast/ThrowNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ThrowNode.java @@ -19,7 +19,7 @@ public class ThrowNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.THROW; } diff --git a/src/main/java/org/zwobble/couscous/ast/TryNode.java b/src/main/java/org/zwobble/couscous/ast/TryNode.java index 070a7f9..34b64b6 100644 --- a/src/main/java/org/zwobble/couscous/ast/TryNode.java +++ b/src/main/java/org/zwobble/couscous/ast/TryNode.java @@ -44,7 +44,7 @@ public class TryNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.TRY; } diff --git a/src/main/java/org/zwobble/couscous/ast/TypeCoercionNode.java b/src/main/java/org/zwobble/couscous/ast/TypeCoercionNode.java index 916c278..a39bb4f 100644 --- a/src/main/java/org/zwobble/couscous/ast/TypeCoercionNode.java +++ b/src/main/java/org/zwobble/couscous/ast/TypeCoercionNode.java @@ -37,7 +37,7 @@ public class TypeCoercionNode implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.TYPE_COERCION; } diff --git a/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java b/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java index e9aac1e..f200644 100644 --- a/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java +++ b/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java @@ -39,7 +39,7 @@ public class VariableReferenceNode implements AssignableExpressionNode, Referenc } @Override - public int type() { + public int nodeType() { return NodeTypes.VARIABLE_REFERENCE; } diff --git a/src/main/java/org/zwobble/couscous/ast/WhileNode.java b/src/main/java/org/zwobble/couscous/ast/WhileNode.java index 7c06fac..9d89ec6 100644 --- a/src/main/java/org/zwobble/couscous/ast/WhileNode.java +++ b/src/main/java/org/zwobble/couscous/ast/WhileNode.java @@ -28,7 +28,7 @@ public class WhileNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.WHILE; } diff --git a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java index 6bd7870..243a7ef 100644 --- a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java +++ b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java @@ -45,7 +45,7 @@ public class SwitchCaseNode implements Node { } @Override - public int type() { + public int nodeType() { return NodeTypes.SWITCH_CASE; } diff --git a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java index 0cd2848..d4b2fee 100644 --- a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java +++ b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java @@ -29,7 +29,7 @@ public class SwitchNode implements StatementNode { } @Override - public int type() { + public int nodeType() { return NodeTypes.SWITCH; } diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeVisitor.java b/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeVisitor.java index 4dc46ec..0985a29 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeVisitor.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeVisitor.java @@ -170,7 +170,7 @@ public class DynamicNodeVisitor { .method(ElementMatchers.isAbstract()) .intercept(Implementations.stackManipulation(target -> { - MethodDescription typeMethod = TypeDescriptions.findMethod(Node.class, "type"); + MethodDescription typeMethod = TypeDescriptions.findMethod(Node.class, "nodeType"); return new StackManipulation.Compound( MethodVariableAccess.REFERENCE.loadOffset(1), MethodInvocation.invoke(typeMethod), diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveInstanceMethodCall.java b/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveInstanceMethodCall.java index 4eeb22c..233d747 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveInstanceMethodCall.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveInstanceMethodCall.java @@ -29,7 +29,7 @@ public class PrimitiveInstanceMethodCall implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NODE_TYPE; } diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveStaticMethodCall.java b/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveStaticMethodCall.java index 6ce3660..5c0083c 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveStaticMethodCall.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/primitives/PrimitiveStaticMethodCall.java @@ -25,7 +25,7 @@ public class PrimitiveStaticMethodCall implements ExpressionNode { } @Override - public int type() { + public int nodeType() { return NODE_TYPE; } diff --git a/src/main/java/org/zwobble/couscous/transforms/DesugarStatement.java b/src/main/java/org/zwobble/couscous/transforms/DesugarStatement.java index 700b31b..0a5cb05 100644 --- a/src/main/java/org/zwobble/couscous/transforms/DesugarStatement.java +++ b/src/main/java/org/zwobble/couscous/transforms/DesugarStatement.java @@ -11,7 +11,7 @@ class DesugarStatement { static <T extends StatementNode> NodeTransformer transformer(int nodeType, Function<T, List<StatementNode>> desugar) { return NodeTransformer.builder() .transformStatement(statement -> { - if (statement.type() == nodeType) { + if (statement.nodeType() == nodeType) { return Optional.of(desugar.apply((T) statement)); } else { return Optional.empty(); diff --git a/src/main/java/org/zwobble/couscous/transforms/DesugarSwitchToIfElse.java b/src/main/java/org/zwobble/couscous/transforms/DesugarSwitchToIfElse.java index 006a7c9..30c8f66 100644 --- a/src/main/java/org/zwobble/couscous/transforms/DesugarSwitchToIfElse.java +++ b/src/main/java/org/zwobble/couscous/transforms/DesugarSwitchToIfElse.java @@ -76,6 +76,6 @@ public class DesugarSwitchToIfElse { } private static boolean isEndOfCase(StatementNode statement) { - return statement.type() == NodeTypes.RETURN; + return statement.nodeType() == NodeTypes.RETURN; } } |