Skip to content

Commit bd0f4c1

Browse files
committed
Rename all classes for consistency.
1 parent a92f3c3 commit bd0f4c1

File tree

127 files changed

+482
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+482
-442
lines changed

src/main/java/org/byteskript/skript/compiler/ElementTree.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import org.byteskript.skript.api.syntax.TriggerHolder;
1616
import org.byteskript.skript.error.ScriptCompileError;
1717
import org.byteskript.skript.lang.handler.StandardHandlers;
18-
import org.byteskript.skript.lang.syntax.entry.Trigger;
19-
import org.byteskript.skript.lang.syntax.variable.VariableExpression;
18+
import org.byteskript.skript.lang.syntax.entry.EntryTriggerSection;
19+
import org.byteskript.skript.lang.syntax.variable.ExprVariable;
2020

2121
import java.util.*;
2222

@@ -184,7 +184,7 @@ public String toString(Context context) {
184184
builder.append('(');
185185
if (current instanceof Literal<?>) {
186186
builder.append(match.matcher().group());
187-
} else if (current instanceof VariableExpression) {
187+
} else if (current instanceof ExprVariable) {
188188
builder.append(match.matcher().group("name"));
189189
} else if (current instanceof TriggerHolder && context != null && context.getLine() == this && context.getMethod() != null) {
190190
final MethodErasure erasure = context.getMethod().getErasure();
@@ -205,7 +205,7 @@ public String toString(Context context) {
205205
builder.append(')');
206206
if (context == null) return builder.toString();
207207
if (context.isSectionHeader() && context.getLine() == this) builder.append(':');
208-
if (current instanceof Trigger && context.getLine() == this && context.getMethod() != null) {
208+
if (current instanceof EntryTriggerSection && context.getLine() == this && context.getMethod() != null) {
209209
final MethodErasure erasure = context.getMethod().getErasure();
210210
builder.append(" // ");
211211
builder.append(erasure.name());

src/main/java/org/byteskript/skript/compiler/InlineController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.byteskript.skript.api.SyntaxElement;
1414
import org.byteskript.skript.compiler.structure.MultiLabel;
1515
import org.byteskript.skript.compiler.structure.PreVariable;
16-
import org.byteskript.skript.lang.syntax.variable.VariableExpression;
16+
import org.byteskript.skript.lang.syntax.variable.ExprVariable;
1717
import org.objectweb.asm.Label;
1818

1919
import java.lang.reflect.Method;
@@ -36,8 +36,8 @@ private void prepareVariables(Method method) {
3636
final ElementTree[] inputs = context.getCompileCurrent().nested();
3737
for (int i = 0; i < inputs.length; i++) {
3838
final SyntaxElement element = inputs[i].current();
39-
if (element.getClass() != VariableExpression.class) continue;
40-
final VariableExpression expression = (VariableExpression) inputs[i].current();
39+
if (element.getClass() != ExprVariable.class) continue;
40+
final ExprVariable expression = (ExprVariable) inputs[i].current();
4141
this.special.put(i, expression.getVariable(context, inputs[i].match()));
4242
}
4343
final MethodBuilder builder = context.getMethod();

0 commit comments

Comments
 (0)