diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-12-19 11:52:42 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-12-19 11:52:42 +0000 |
| commit | 869a539b7d2d75e311c92266aaaa92c31771892a (patch) | |
| tree | 28c025b06ef3a4468e566bdfef1ca6faec3a36b3 /src/main/java | |
| parent | a409f5706a7812beb9b2d9fdeee544ea35545416 (diff) | |
Rename ShidInstruction::isTerminator() to isBlockTerminator()
Diffstat (limited to 'src/main/java')
36 files changed, 37 insertions, 37 deletions
diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidBlock.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidBlock.java index cfecb515..33dd5a6a 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidBlock.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidBlock.java @@ -14,7 +14,7 @@ public record ShidBlock( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { - return instructions.stream().anyMatch(ShidInstruction::isTerminator); + public boolean isBlockTerminator() { + return instructions.stream().anyMatch(ShidInstruction::isBlockTerminator); } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidCall.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidCall.java index c275fef7..9e878469 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidCall.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidCall.java @@ -23,7 +23,7 @@ public record ShidCall( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineEffect.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineEffect.java index d3465539..8a0b8b84 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineEffect.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineEffect.java @@ -12,7 +12,7 @@ public record ShidDefineEffect( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineFunction.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineFunction.java index 3b4ce458..46b6c81e 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineFunction.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineFunction.java @@ -31,7 +31,7 @@ public record ShidDefineFunction( } @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineStruct.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineStruct.java index 715905ec..4400eb92 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineStruct.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDefineStruct.java @@ -20,7 +20,7 @@ public record ShidDefineStruct( } @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDiscard.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDiscard.java index 75e6cec6..9325115b 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDiscard.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDiscard.java @@ -7,7 +7,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidDiscard(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDuplicate.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDuplicate.java index 50610b0f..6fea55ac 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDuplicate.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDuplicate.java @@ -7,7 +7,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidDuplicate(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidEffectHandlerBreak.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidEffectHandlerBreak.java index b19edcd5..41ed61fa 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidEffectHandlerBreak.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidEffectHandlerBreak.java @@ -12,7 +12,7 @@ public record ShidEffectHandlerBreak( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return true; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidFieldLoad.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidFieldLoad.java index fb2b2749..4337dee1 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidFieldLoad.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidFieldLoad.java @@ -21,7 +21,7 @@ public record ShidFieldLoad( } @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIf.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIf.java index 9f49b65b..d29c8bbd 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIf.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIf.java @@ -17,7 +17,7 @@ public record ShidIf( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidInstruction.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidInstruction.java index 8eb2b3a0..86fdca54 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidInstruction.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidInstruction.java @@ -9,7 +9,7 @@ public sealed interface ShidInstruction * If an instruction is a terminator, execution is guaranteed to leave the * current block. */ - boolean isTerminator(); + boolean isBlockTerminator(); Source source(); } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntAdd.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntAdd.java index 7465b5ae..6cca5d2a 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntAdd.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntAdd.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidIntAdd(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntEquals.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntEquals.java index 600636d3..7c24a8d0 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntEquals.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntEquals.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidIntEquals(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntNotEqual.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntNotEqual.java index d3e4fe4b..68a69c26 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntNotEqual.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntNotEqual.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidIntNotEqual(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntSub.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntSub.java index 48182a4d..ca74cc97 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntSub.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidIntSub.java @@ -9,7 +9,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidIntSub(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalDrop.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalDrop.java index fd9bf37b..8295be45 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalDrop.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalDrop.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidLocalDrop(String name, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalLoad.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalLoad.java index 8817e4e0..d1742ee6 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalLoad.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalLoad.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidLocalLoad(String name, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalStore.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalStore.java index bcac4e9e..42c65f17 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalStore.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLocalStore.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidLocalStore(String name, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoop.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoop.java index ceb11c04..2394e88b 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoop.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoop.java @@ -13,7 +13,7 @@ public record ShidLoop( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopBreak.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopBreak.java index d6db4c52..22fb0014 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopBreak.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopBreak.java @@ -7,7 +7,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidLoopBreak(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return true; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopContinue.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopContinue.java index 1d0af6b2..edc1d625 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopContinue.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidLoopContinue.java @@ -7,7 +7,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidLoopContinue(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return true; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceFieldStore.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceFieldStore.java index dacf8a3f..07f4c4f3 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceFieldStore.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceFieldStore.java @@ -13,7 +13,7 @@ public record ShidNamespaceFieldStore( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceImport.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceImport.java index ca88dfd1..47f93619 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceImport.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidNamespaceImport.java @@ -11,7 +11,7 @@ public record ShidNamespaceImport( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushBool.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushBool.java index f1a71997..4935e3fa 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushBool.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushBool.java @@ -10,7 +10,7 @@ public record ShidPushBool( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushInt.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushInt.java index d8da8f31..4293c09f 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushInt.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushInt.java @@ -9,7 +9,7 @@ import java.math.BigInteger; */ public record ShidPushInt(BigInteger value, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushString.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushString.java index f53a8aef..82ea2aac 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushString.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushString.java @@ -7,7 +7,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidPushString(String value, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushUnit.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushUnit.java index 3504204f..18a0b336 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushUnit.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidPushUnit.java @@ -7,7 +7,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidPushUnit(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidResume.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidResume.java index 2a2e1b4d..5ee1a20e 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidResume.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidResume.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidResume(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return true; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidReturn.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidReturn.java index ec3609c2..aac962c5 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidReturn.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidReturn.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidReturn(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return true; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidStringAdd.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidStringAdd.java index 606e613b..b82d814f 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidStringAdd.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidStringAdd.java @@ -10,7 +10,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidStringAdd(Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidSwitch.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidSwitch.java index 8a06adf7..1f69dfea 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidSwitch.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidSwitch.java @@ -20,7 +20,7 @@ public record ShidSwitch( } @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidTry.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidTry.java index 3d701d20..82f2e083 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidTry.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidTry.java @@ -24,7 +24,7 @@ public record ShidTry( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleCreate.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleCreate.java index 4cfbb58b..a396492a 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleCreate.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleCreate.java @@ -12,7 +12,7 @@ public record ShidTupleCreate( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleGet.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleGet.java index 585d3ccb..0647e8d2 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleGet.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidTupleGet.java @@ -12,7 +12,7 @@ public record ShidTupleGet( Source source ) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarLoad.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarLoad.java index 1e22c4a8..b59d181b 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarLoad.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarLoad.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidVarLoad(String name, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarStore.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarStore.java index 4858c202..c7d5152c 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarStore.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidVarStore.java @@ -8,7 +8,7 @@ import org.shedlang.compiler.sources.Source; */ public record ShidVarStore(String name, Source source) implements ShidInstruction { @Override - public boolean isTerminator() { + public boolean isBlockTerminator() { return false; } } |
