diff --git a/runtime/src/main/fusion/modules/fusion/exception.fusion b/runtime/src/main/fusion/modules/fusion/exception.fusion index 55f2a79a4..0782b8e5d 100644 --- a/runtime/src/main/fusion/modules/fusion/exception.fusion +++ b/runtime/src/main/fusion/modules/fusion/exception.fusion @@ -158,7 +158,7 @@ See the [Racket Guide on Exceptions][racket-exn] for more details. stx))))) - (define FusionExn (java_class "dev.ionfusion.fusion.FusionException")) + (define FusionExn (java_class "dev.ionfusion.runtime.base.FusionException")) (define FusionUserExn (java_class "dev.ionfusion.fusion.FusionUserException")) (provide is_exn) diff --git a/runtime/src/main/java/dev/ionfusion/fusion/AddProc.java b/runtime/src/main/java/dev/ionfusion/fusion/AddProc.java index 8e3a9d8b5..e5edcb169 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/AddProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/AddProc.java @@ -8,6 +8,8 @@ import static dev.ionfusion.fusion.FusionSequence.checkNullableSequenceArg; import static dev.ionfusion.fusion.FusionSexp.unsafeSexpAdd; +import dev.ionfusion.runtime.base.FusionException; + final class AddProc extends Procedure2 diff --git a/runtime/src/main/java/dev/ionfusion/fusion/AnnotatableValue.java b/runtime/src/main/java/dev/ionfusion/fusion/AnnotatableValue.java index 040afbf3f..97c7e6765 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/AnnotatableValue.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/AnnotatableValue.java @@ -7,6 +7,7 @@ import static dev.ionfusion.fusion.FusionSymbol.BaseSymbol.unsafeSymbolsToJavaStrings; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; interface AnnotatableValue> { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/AnnotateProc.java b/runtime/src/main/java/dev/ionfusion/fusion/AnnotateProc.java index 0e4774f41..d24ed538d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/AnnotateProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/AnnotateProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionText.checkRequiredTextArg; +import dev.ionfusion.runtime.base.FusionException; + final class AnnotateProc extends Procedure diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ApplyProc.java b/runtime/src/main/java/dev/ionfusion/fusion/ApplyProc.java index e80e1b46b..a630059eb 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ApplyProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ApplyProc.java @@ -12,6 +12,8 @@ import static dev.ionfusion.fusion.FusionSexp.unsafePairTail; import static dev.ionfusion.fusion.FusionSexp.unsafeSexpSize; +import dev.ionfusion.runtime.base.FusionException; + final class ApplyProc extends Procedure diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ArityFailure.java b/runtime/src/main/java/dev/ionfusion/fusion/ArityFailure.java index 43412024e..40e1208ac 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ArityFailure.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ArityFailure.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionIo.safeWriteMany; +import dev.ionfusion.runtime.base.FusionException; + /** * Indicates a failure applying a procedure with the wrong number of arguments. diff --git a/runtime/src/main/java/dev/ionfusion/fusion/AssertForm.java b/runtime/src/main/java/dev/ionfusion/fusion/AssertForm.java index cacb54bed..b9aacf250 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/AssertForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/AssertForm.java @@ -11,6 +11,7 @@ import static dev.ionfusion.fusion.FusionVoid.voidValue; import dev.ionfusion.fusion.FusionSexp.BaseSexp; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; final class AssertForm diff --git a/runtime/src/main/java/dev/ionfusion/fusion/BaseValue.java b/runtime/src/main/java/dev/ionfusion/fusion/BaseValue.java index 682fdf686..41ef9140f 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/BaseValue.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/BaseValue.java @@ -18,6 +18,7 @@ import com.amazon.ion.util.IonTextUtils; import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.FusionRuntime; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/BeginForm.java b/runtime/src/main/java/dev/ionfusion/fusion/BeginForm.java index f6e5806f9..61228ccf2 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/BeginForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/BeginForm.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * The {@code begin} syntactic form. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Binding.java b/runtime/src/main/java/dev/ionfusion/fusion/Binding.java index ed71c3dcb..998c55516 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Binding.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Binding.java @@ -10,6 +10,7 @@ import dev.ionfusion.fusion.Namespace.NsDefinedBinding; import dev.ionfusion.fusion.Namespace.RequiredBinding; import dev.ionfusion.fusion.TopLevelNamespace.TopLevelDefinedBinding; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/CallWithHandlerProc.java b/runtime/src/main/java/dev/ionfusion/fusion/CallWithHandlerProc.java index 19bce5a85..b34b47a82 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/CallWithHandlerProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/CallWithHandlerProc.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * This class is an internal procedure used by the with_handlers form. * It evaluates a thunk, catches FusionExceptions returned by the evaluation, diff --git a/runtime/src/main/java/dev/ionfusion/fusion/CheckException.java b/runtime/src/main/java/dev/ionfusion/fusion/CheckException.java index 17436b351..5585dc7df 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/CheckException.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/CheckException.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionString.checkNonEmptyStringArg; +import dev.ionfusion.runtime.base.FusionException; + /** * Only needed so that {@code is_check_error} can detect it. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ClassLoaderModuleRepository.java b/runtime/src/main/java/dev/ionfusion/fusion/ClassLoaderModuleRepository.java index 6f5aa70b7..f4e26a4e6 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ClassLoaderModuleRepository.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ClassLoaderModuleRepository.java @@ -5,6 +5,7 @@ import static dev.ionfusion.runtime.base.SourceName.FUSION_SOURCE_EXTENSION; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.net.URL; import java.util.function.Consumer; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/CompiledConstant.java b/runtime/src/main/java/dev/ionfusion/fusion/CompiledConstant.java index f6c907323..ee1079ad9 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/CompiledConstant.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/CompiledConstant.java @@ -4,6 +4,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + final class CompiledConstant implements CompiledForm { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/CompiledForm.java b/runtime/src/main/java/dev/ionfusion/fusion/CompiledForm.java index 8471868cb..670eee81d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/CompiledForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/CompiledForm.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * The results of the syntax preparation phase, ready for execution. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Compiler.java b/runtime/src/main/java/dev/ionfusion/fusion/Compiler.java index e90fcb522..67a00a2dc 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Compiler.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Compiler.java @@ -50,6 +50,7 @@ import dev.ionfusion.fusion.TopLevelNamespace.TopLevelDefinedBinding; import dev.ionfusion.fusion._private.doc.model.BindingDoc; import dev.ionfusion.fusion._private.doc.model.BindingDoc.Kind; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/CoverageEvaluator.java b/runtime/src/main/java/dev/ionfusion/fusion/CoverageEvaluator.java index 36f8e58ca..945975a37 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/CoverageEvaluator.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/CoverageEvaluator.java @@ -3,6 +3,7 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/DatumToSyntaxProc.java b/runtime/src/main/java/dev/ionfusion/fusion/DatumToSyntaxProc.java index ffd244678..495fe3b4b 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/DatumToSyntaxProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/DatumToSyntaxProc.java @@ -8,6 +8,7 @@ import static dev.ionfusion.fusion.FusionSyntax.unsafeSyntaxLocation; import static dev.ionfusion.fusion.Syntax.datumToSyntax; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/DefineSyntaxForm.java b/runtime/src/main/java/dev/ionfusion/fusion/DefineSyntaxForm.java index 9c4015589..60298169c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/DefineSyntaxForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/DefineSyntaxForm.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionString.isString; +import dev.ionfusion.runtime.base.FusionException; + final class DefineSyntaxForm extends SyntacticForm { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/DefineValuesForm.java b/runtime/src/main/java/dev/ionfusion/fusion/DefineValuesForm.java index 339b2baff..caa9c83c2 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/DefineValuesForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/DefineValuesForm.java @@ -13,6 +13,8 @@ import static dev.ionfusion.fusion.GlobalState.DEFINE_VALUES; import static dev.ionfusion.fusion.SyntaxSymbol.ensureUniqueIdentifiers; +import dev.ionfusion.runtime.base.FusionException; + /** * Implementation of the fundamental definition syntax form. * diff --git a/runtime/src/main/java/dev/ionfusion/fusion/DynamicParameter.java b/runtime/src/main/java/dev/ionfusion/fusion/DynamicParameter.java index 21c406530..17c5eccde 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/DynamicParameter.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/DynamicParameter.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionString.stringToJavaString; +import dev.ionfusion.runtime.base.FusionException; + /** * diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Evaluator.java b/runtime/src/main/java/dev/ionfusion/fusion/Evaluator.java index 7229c8203..c67b4fefe 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Evaluator.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Evaluator.java @@ -36,6 +36,7 @@ import com.amazon.ion.IonValue; import com.amazon.ion.Timestamp; import com.amazon.ion.system.IonReaderBuilder; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ExitException.java b/runtime/src/main/java/dev/ionfusion/fusion/ExitException.java index 45f7edd9f..1953d4c40 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ExitException.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ExitException.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * Thown to force the exit of an evaluation. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Expander.java b/runtime/src/main/java/dev/ionfusion/fusion/Expander.java index 552f67cba..c4ab4568c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Expander.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Expander.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionValue.isAnnotated; import static dev.ionfusion.fusion.SyntaxException.makeSyntaxError; +import dev.ionfusion.runtime.base.FusionException; + /** * "Registers" used during macro expansion */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FileSystemModuleRepository.java b/runtime/src/main/java/dev/ionfusion/fusion/FileSystemModuleRepository.java index 0bf672a38..12d0f2efa 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FileSystemModuleRepository.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FileSystemModuleRepository.java @@ -6,6 +6,7 @@ import static dev.ionfusion.runtime.base.ModuleIdentity.isValidModuleName; import static dev.ionfusion.runtime.base.SourceName.FUSION_SOURCE_EXTENSION; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.io.File; import java.util.function.Consumer; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FileSystemSpecialist.java b/runtime/src/main/java/dev/ionfusion/fusion/FileSystemSpecialist.java index f50b7b879..c93aa9d5a 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FileSystemSpecialist.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FileSystemSpecialist.java @@ -3,6 +3,7 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.FusionRuntime; import java.io.File; import java.io.FileInputStream; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FreeBinding.java b/runtime/src/main/java/dev/ionfusion/fusion/FreeBinding.java index bbcf7083f..fd9488d18 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FreeBinding.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FreeBinding.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; final class FreeBinding diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionAssertionException.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionAssertionException.java index 44f38dbc9..f7ebc5bc0 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionAssertionException.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionAssertionException.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionIo.safeWrite; +import dev.ionfusion.runtime.base.FusionException; + @SuppressWarnings("serial") final class FusionAssertionException extends FusionErrorException diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionBlob.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionBlob.java index a36a9c658..c7d0dada5 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionBlob.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionBlob.java @@ -15,6 +15,7 @@ import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionLob.BaseLob; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionBool.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionBool.java index a26408f06..46d8537ac 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionBool.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionBool.java @@ -13,6 +13,7 @@ import com.amazon.ion.IonWriter; import com.amazon.ion.ValueFactory; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionClob.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionClob.java index 846af81d8..509347e57 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionClob.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionClob.java @@ -15,6 +15,7 @@ import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionLob.BaseLob; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionCollection.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionCollection.java index 41dea183f..fef821580 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionCollection.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionCollection.java @@ -7,6 +7,7 @@ import dev.ionfusion.fusion.FusionSexp.ImmutablePair; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; final class FusionCollection diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionCompare.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionCompare.java index ee4f7b5d3..ce11de86d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionCompare.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionCompare.java @@ -20,6 +20,7 @@ import com.amazon.ion.Timestamp; import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionNumber.BaseNumber; +import dev.ionfusion.runtime.base.FusionException; import java.math.BigDecimal; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionErrorException.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionErrorException.java index eccc3bc42..2afd7ac0a 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionErrorException.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionErrorException.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * Implementation of Fusion's {@code error_exn}. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionEval.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionEval.java index 6eb4ab717..ee65adda3 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionEval.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionEval.java @@ -14,6 +14,7 @@ import static dev.ionfusion.fusion.Syntax.datumToSyntax; import com.amazon.ion.IonReader; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; import dev.ionfusion.runtime.embed.TopLevel; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionInterrupt.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionInterrupt.java index bed682853..2e43cb697 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionInterrupt.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionInterrupt.java @@ -4,6 +4,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * Internal exception thrown when a Fusion evaluation is interrupted via * {@link Thread#interrupt()}. diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionInterruptedException.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionInterruptedException.java index d2c056d54..c6c4e3c69 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionInterruptedException.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionInterruptedException.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * Thrown to indicate that a Fusion computation was interrupted via * {@link Thread#interrupt()}. When thrown, diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionIo.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionIo.java index 360599804..14d7f1fd9 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionIo.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionIo.java @@ -17,6 +17,7 @@ import com.amazon.ion.IonValue; import com.amazon.ion.IonWriter; import com.amazon.ion.system.IonTextWriterBuilder; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionIterator.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionIterator.java index b4af76b49..87bc2e95c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionIterator.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionIterator.java @@ -14,6 +14,7 @@ import static dev.ionfusion.fusion._private.FusionUtils.EMPTY_OBJECT_ARRAY; import com.amazon.ion.IonValue; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionList.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionList.java index 89b1b3a0e..58b3f80dc 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionList.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionList.java @@ -28,6 +28,7 @@ import dev.ionfusion.fusion.FusionSequence.BaseSequence; import dev.ionfusion.fusion.FusionSexp.BaseSexp; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionLob.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionLob.java index de69d4273..e7aa5df4a 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionLob.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionLob.java @@ -10,6 +10,7 @@ import static dev.ionfusion.fusion.SimpleSyntaxValue.makeSyntax; import dev.ionfusion.fusion.FusionBool.BaseBool; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.security.MessageDigest; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionNamespace.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionNamespace.java index 2949d6717..6ef522792 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionNamespace.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionNamespace.java @@ -5,6 +5,7 @@ import static dev.ionfusion.fusion.FusionString.checkRequiredStringArg; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionNull.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionNull.java index 293b221b6..5369131f2 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionNull.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionNull.java @@ -12,6 +12,7 @@ import com.amazon.ion.ValueFactory; import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionNumber.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionNumber.java index ce16aff50..a76f4a39f 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionNumber.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionNumber.java @@ -23,6 +23,7 @@ import com.amazon.ion.util.IonTextUtils; import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionProcedure.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionProcedure.java index b77721857..21ccac559 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionProcedure.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionProcedure.java @@ -5,6 +5,7 @@ import static dev.ionfusion.fusion.FusionBool.makeBool; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionRuntimeBuilder.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionRuntimeBuilder.java index c136948b2..1f633ccf5 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionRuntimeBuilder.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionRuntimeBuilder.java @@ -10,6 +10,7 @@ import com.amazon.ion.IonCatalog; import com.amazon.ion.system.SimpleCatalog; import dev.ionfusion.runtime._private.cover.CoverageCollectorImpl; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.FusionRuntime; import dev.ionfusion.runtime.embed.TopLevel; import java.io.File; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionSequence.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionSequence.java index bc6a1854d..f7724c388 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionSequence.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionSequence.java @@ -8,6 +8,7 @@ import dev.ionfusion.fusion.FusionList.BaseList; import dev.ionfusion.fusion.FusionSexp.BaseSexp; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; final class FusionSequence diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionSexp.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionSexp.java index 0f321ffc7..ae876a35e 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionSexp.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionSexp.java @@ -28,6 +28,7 @@ import dev.ionfusion.fusion.FusionList.BaseList; import dev.ionfusion.fusion.FusionSequence.BaseSequence; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; import java.util.LinkedList; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionString.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionString.java index 6db1eba7c..6e0022ff3 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionString.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionString.java @@ -33,6 +33,7 @@ import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; import dev.ionfusion.fusion.FusionText.BaseText; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionStruct.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionStruct.java index 99854252b..ab7cba93c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionStruct.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionStruct.java @@ -34,6 +34,7 @@ import dev.ionfusion.fusion.FusionIterator.AbstractIterator; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; import dev.ionfusion.fusion.util.hamt.MultiHashTrie; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; import java.util.Collections; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java index 54d012cb6..a52264b90 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionSymbol.java @@ -17,6 +17,7 @@ import com.amazon.ion.util.IonTextUtils; import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion._private.InternMap; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionSyntax.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionSyntax.java index 0eae3b5ab..c326fde23 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionSyntax.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionSyntax.java @@ -5,6 +5,7 @@ import static dev.ionfusion.fusion.FusionBool.makeBool; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionText.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionText.java index 1492ba9c2..bbdfab328 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionText.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionText.java @@ -7,6 +7,7 @@ import static dev.ionfusion.fusion.FusionBool.trueBool; import dev.ionfusion.fusion.FusionBool.BaseBool; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionTimestamp.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionTimestamp.java index 54043dc1e..633b4c5ad 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionTimestamp.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionTimestamp.java @@ -34,6 +34,7 @@ import dev.ionfusion.fusion.FusionBool.BaseBool; import dev.ionfusion.fusion.FusionNumber.BaseDecimal; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionUserException.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionUserException.java index a50f7f5da..8238dab1e 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionUserException.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionUserException.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionIo.safeWriteToString; +import dev.ionfusion.runtime.base.FusionException; + /** * Represents an arbitrary, non-exception Fusion value thrown by {@code raise}. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionValue.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionValue.java index 45e4cdca7..24a518fe8 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionValue.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionValue.java @@ -10,6 +10,7 @@ import com.amazon.ion.IonValue; import com.amazon.ion.ValueFactory; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.FusionRuntime; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionVoid.java b/runtime/src/main/java/dev/ionfusion/fusion/FusionVoid.java index 0777c2224..ee57e2b3d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionVoid.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/FusionVoid.java @@ -7,6 +7,7 @@ import static dev.ionfusion.fusion.FusionBool.makeBool; import dev.ionfusion.fusion.FusionBool.BaseBool; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/GlobalState.java b/runtime/src/main/java/dev/ionfusion/fusion/GlobalState.java index d1f33d8ed..bbefe31c6 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/GlobalState.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/GlobalState.java @@ -13,6 +13,7 @@ import com.amazon.ion.system.IonReaderBuilder; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; import dev.ionfusion.fusion.ModuleNamespace.ModuleDefinedBinding; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.io.IOException; import java.io.InputStream; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/IfForm.java b/runtime/src/main/java/dev/ionfusion/fusion/IfForm.java index 28d167853..9cbef6db9 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/IfForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/IfForm.java @@ -4,6 +4,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * The {@code if} syntactic form. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/IntToStringProc.java b/runtime/src/main/java/dev/ionfusion/fusion/IntToStringProc.java index 395e23704..a9bf406e0 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/IntToStringProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/IntToStringProc.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionNumber.checkNullableIntArg; import static dev.ionfusion.fusion.FusionString.makeString; +import dev.ionfusion.runtime.base.FusionException; import java.math.BigInteger; final class IntToStringProc diff --git a/runtime/src/main/java/dev/ionfusion/fusion/IsNullProc.java b/runtime/src/main/java/dev/ionfusion/fusion/IsNullProc.java index 40a6b4490..b9dbbdf6b 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/IsNullProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/IsNullProc.java @@ -4,6 +4,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + final class IsNullProc extends Procedure1 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/JavaClassProc.java b/runtime/src/main/java/dev/ionfusion/fusion/JavaClassProc.java index ceaadf085..3d1f1fc48 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/JavaClassProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/JavaClassProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionString.checkRequiredStringArg; +import dev.ionfusion.runtime.base.FusionException; + final class JavaClassProc extends Procedure1 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/JavaInstanceOfProc.java b/runtime/src/main/java/dev/ionfusion/fusion/JavaInstanceOfProc.java index 9e2dc95ad..f2c7eead1 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/JavaInstanceOfProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/JavaInstanceOfProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionBool.makeBool; +import dev.ionfusion.runtime.base.FusionException; + final class JavaInstanceOfProc extends Procedure2 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/JavaNewProc.java b/runtime/src/main/java/dev/ionfusion/fusion/JavaNewProc.java index 514f8ad74..88dab9f17 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/JavaNewProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/JavaNewProc.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionText.checkNonEmptyTextArg; import static java.util.Arrays.copyOfRange; +import dev.ionfusion.runtime.base.FusionException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/LambdaForm.java b/runtime/src/main/java/dev/ionfusion/fusion/LambdaForm.java index 36f2aad3b..0279d0e3b 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/LambdaForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/LambdaForm.java @@ -8,6 +8,8 @@ import static dev.ionfusion.fusion.SyntaxSymbol.ensureUniqueIdentifiers; import static dev.ionfusion.fusion._private.FusionUtils.EMPTY_STRING_ARRAY; +import dev.ionfusion.runtime.base.FusionException; + /** * The {@code lambda} syntactic form, which evaluates to a {@link Closure}. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/LetValuesForm.java b/runtime/src/main/java/dev/ionfusion/fusion/LetValuesForm.java index 4d53b7c84..a74dfcb33 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/LetValuesForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/LetValuesForm.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.ResultFailure.makeResultError; import static dev.ionfusion.fusion.SyntaxSymbol.ensureUniqueIdentifiers; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.util.ArrayList; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/LetrecForm.java b/runtime/src/main/java/dev/ionfusion/fusion/LetrecForm.java index a0b08865c..1816f04ee 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/LetrecForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/LetrecForm.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionValue.UNDEF; import static dev.ionfusion.fusion.SyntaxSymbol.ensureUniqueIdentifiers; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/LoadHandler.java b/runtime/src/main/java/dev/ionfusion/fusion/LoadHandler.java index dc87b2704..208e9951a 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/LoadHandler.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/LoadHandler.java @@ -11,6 +11,7 @@ import com.amazon.ion.IonException; import com.amazon.ion.IonReader; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/LoadProc.java b/runtime/src/main/java/dev/ionfusion/fusion/LoadProc.java index 331472c4d..e9ae3c861 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/LoadProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/LoadProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionString.checkNonEmptyStringArg; +import dev.ionfusion.runtime.base.FusionException; + final class LoadProc extends Procedure1 diff --git a/runtime/src/main/java/dev/ionfusion/fusion/LocalEnvironment.java b/runtime/src/main/java/dev/ionfusion/fusion/LocalEnvironment.java index 14422b2a2..db88508e6 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/LocalEnvironment.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/LocalEnvironment.java @@ -8,6 +8,7 @@ import static dev.ionfusion.fusion._private.FusionUtils.EMPTY_STRING_ARRAY; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import java.util.Set; final class LocalEnvironment diff --git a/runtime/src/main/java/dev/ionfusion/fusion/MacroForm.java b/runtime/src/main/java/dev/ionfusion/fusion/MacroForm.java index b4860565d..31b2ba015 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/MacroForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/MacroForm.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionIo.safeWriteToString; import static dev.ionfusion.fusion.SyntaxException.makeSyntaxError; +import dev.ionfusion.runtime.base.FusionException; + /** * Runtime representation of Fusion macros, performing syntax expansion. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleBuilderImpl.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleBuilderImpl.java index cd4cf53d5..f3348c7ef 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleBuilderImpl.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleBuilderImpl.java @@ -8,6 +8,7 @@ import com.amazon.ion.IonValue; import dev.ionfusion.fusion.Namespace.NsDefinedBinding; import dev.ionfusion.fusion._private.doc.model.BindingDoc.Kind; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.embed.ModuleBuilder; import java.util.Collection; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleForm.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleForm.java index 5aeb83c21..7f4ea726d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleForm.java @@ -21,6 +21,7 @@ import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; import dev.ionfusion.fusion.ModuleNamespace.ProvidedBinding; import dev.ionfusion.fusion._private.doc.model.BindingDoc; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleInstance.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleInstance.java index 81d0e94ee..8f9f8e037 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleInstance.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleInstance.java @@ -10,6 +10,7 @@ import dev.ionfusion.fusion.Namespace.NsDefinedBinding; import dev.ionfusion.fusion._private.doc.model.BindingDoc; import dev.ionfusion.fusion._private.doc.model.ModuleDocs; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.Collection; import java.util.Collections; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleNameResolver.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleNameResolver.java index 1bdf4a951..8d5b36ec5 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleNameResolver.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleNameResolver.java @@ -13,6 +13,7 @@ import static dev.ionfusion.runtime.base.ModuleIdentity.isValidAbsoluteModulePath; import static dev.ionfusion.runtime.base.ModuleIdentity.isValidModulePath; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.HashSet; import java.util.List; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleNamespace.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleNamespace.java index eb503780d..f75150fa3 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleNamespace.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleNamespace.java @@ -9,6 +9,7 @@ import static dev.ionfusion.fusion.UnboundIdentifierException.makeUnboundError; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceLocation; import java.util.ArrayList; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleRegistry.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleRegistry.java index 976b3ebd4..5c504bcee 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleRegistry.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleRegistry.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; import dev.ionfusion.fusion.ModuleForm.CompiledModule; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.HashMap; import java.util.Map; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ModuleRepository.java b/runtime/src/main/java/dev/ionfusion/fusion/ModuleRepository.java index a78ea5bac..1ccc0a855 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ModuleRepository.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ModuleRepository.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.function.Consumer; import java.util.function.Predicate; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Namespace.java b/runtime/src/main/java/dev/ionfusion/fusion/Namespace.java index d237a8078..a768f0699 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Namespace.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Namespace.java @@ -17,6 +17,7 @@ import dev.ionfusion.fusion.ModuleNamespace.ProvidedBinding; import dev.ionfusion.fusion.TopLevelNamespace.TopLevelDefinedBinding; import dev.ionfusion.fusion._private.doc.model.BindingDoc; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceLocation; import java.util.ArrayList; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/NotProc.java b/runtime/src/main/java/dev/ionfusion/fusion/NotProc.java index d45bb9898..a26cd94be 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/NotProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/NotProc.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionBool.makeBool; +import dev.ionfusion.runtime.base.FusionException; + final class NotProc extends Procedure1 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ObjectNameProc.java b/runtime/src/main/java/dev/ionfusion/fusion/ObjectNameProc.java index 8d5de6043..aea3d4862 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ObjectNameProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ObjectNameProc.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * Implements {@code object_name}. * diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ParameterizeForm.java b/runtime/src/main/java/dev/ionfusion/fusion/ParameterizeForm.java index 1ece37542..bb1d15f3e 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ParameterizeForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ParameterizeForm.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionIo.safeWriteToString; +import dev.ionfusion.runtime.base.FusionException; + final class ParameterizeForm extends SyntacticForm diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Procedure.java b/runtime/src/main/java/dev/ionfusion/fusion/Procedure.java index 582acdabd..8d9de227a 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Procedure.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Procedure.java @@ -8,6 +8,7 @@ import com.amazon.ion.util.IonTextUtils; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Procedure0.java b/runtime/src/main/java/dev/ionfusion/fusion/Procedure0.java index efe6fba61..49cad2ffb 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Procedure0.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Procedure0.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * A procedure that accepts no arguments. * This class performs arity checking before invoking the subclass diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Procedure1.java b/runtime/src/main/java/dev/ionfusion/fusion/Procedure1.java index 07f15e2a2..1e994b831 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Procedure1.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Procedure1.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * A procedure of exactly one argument. * This class performs arity checking before invoking the subclass diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Procedure2.java b/runtime/src/main/java/dev/ionfusion/fusion/Procedure2.java index 422414a76..697cc97c6 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Procedure2.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Procedure2.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * A procedure of exactly two arguments. * This class performs arity checking before invoking the subclass diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ProvideForm.java b/runtime/src/main/java/dev/ionfusion/fusion/ProvideForm.java index d1fb574e8..a082e2b37 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ProvideForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ProvideForm.java @@ -12,6 +12,7 @@ import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; import dev.ionfusion.fusion.Namespace.NsDefinedBinding; +import dev.ionfusion.runtime.base.FusionException; import java.util.ArrayList; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/QuasiBaseForm.java b/runtime/src/main/java/dev/ionfusion/fusion/QuasiBaseForm.java index 04fb57e90..4ec7747e7 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/QuasiBaseForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/QuasiBaseForm.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionList.unsafeListElement; +import dev.ionfusion.runtime.base.FusionException; + /** * Base class for quasiquote and quasisyntax. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/QuasiQuoteForm.java b/runtime/src/main/java/dev/ionfusion/fusion/QuasiQuoteForm.java index 72ad2dc86..0daef405d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/QuasiQuoteForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/QuasiQuoteForm.java @@ -8,6 +8,7 @@ import dev.ionfusion.fusion.FusionList.BaseList; import dev.ionfusion.fusion.FusionSexp.BaseSexp; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; final class QuasiQuoteForm extends QuasiBaseForm diff --git a/runtime/src/main/java/dev/ionfusion/fusion/QuasiSyntaxForm.java b/runtime/src/main/java/dev/ionfusion/fusion/QuasiSyntaxForm.java index 131705aea..2ff739258 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/QuasiSyntaxForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/QuasiSyntaxForm.java @@ -8,6 +8,7 @@ import dev.ionfusion.fusion.FusionList.BaseList; import dev.ionfusion.fusion.FusionSexp.BaseSexp; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; final class QuasiSyntaxForm diff --git a/runtime/src/main/java/dev/ionfusion/fusion/QuoteForm.java b/runtime/src/main/java/dev/ionfusion/fusion/QuoteForm.java index ac141a37a..02ce90b42 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/QuoteForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/QuoteForm.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + /** * The {@code quote} syntactic form. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/QuoteSyntaxForm.java b/runtime/src/main/java/dev/ionfusion/fusion/QuoteSyntaxForm.java index 0e0e28ba7..06bc32f2e 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/QuoteSyntaxForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/QuoteSyntaxForm.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + final class QuoteSyntaxForm extends SyntacticForm { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/RaiseArgumentErrorProc.java b/runtime/src/main/java/dev/ionfusion/fusion/RaiseArgumentErrorProc.java index 51763add8..ec4acdc0c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/RaiseArgumentErrorProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/RaiseArgumentErrorProc.java @@ -8,6 +8,7 @@ import static dev.ionfusion.fusion.FusionString.checkRequiredStringArg; import static dev.ionfusion.fusion.FusionText.checkRequiredTextArg; +import dev.ionfusion.runtime.base.FusionException; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/RaiseArityErrorProc.java b/runtime/src/main/java/dev/ionfusion/fusion/RaiseArityErrorProc.java index cb0f19d6c..7f3a61166 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/RaiseArityErrorProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/RaiseArityErrorProc.java @@ -7,6 +7,7 @@ import static dev.ionfusion.fusion.FusionNumber.checkIntArgToJavaInt; import static dev.ionfusion.fusion.FusionText.checkRequiredTextArg; +import dev.ionfusion.runtime.base.FusionException; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/RaiseContractErrorProc.java b/runtime/src/main/java/dev/ionfusion/fusion/RaiseContractErrorProc.java index 8359c0513..5c4924d1d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/RaiseContractErrorProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/RaiseContractErrorProc.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionString.checkRequiredStringArg; import static dev.ionfusion.fusion.FusionText.checkRequiredTextArg; +import dev.ionfusion.runtime.base.FusionException; + final class RaiseContractErrorProc extends Procedure diff --git a/runtime/src/main/java/dev/ionfusion/fusion/RaiseProc.java b/runtime/src/main/java/dev/ionfusion/fusion/RaiseProc.java index 0e8014651..fd12c8678 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/RaiseProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/RaiseProc.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + final class RaiseProc extends Procedure1 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/RaiseResultErrorProc.java b/runtime/src/main/java/dev/ionfusion/fusion/RaiseResultErrorProc.java index a5c1ddb83..198882981 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/RaiseResultErrorProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/RaiseResultErrorProc.java @@ -7,6 +7,8 @@ import static dev.ionfusion.fusion.FusionText.checkRequiredTextArg; import static dev.ionfusion.fusion.ResultFailure.makeResultError; +import dev.ionfusion.runtime.base.FusionException; + final class RaiseResultErrorProc extends Procedure diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Records.java b/runtime/src/main/java/dev/ionfusion/fusion/Records.java index b91299085..494d19e00 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Records.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Records.java @@ -12,6 +12,7 @@ import static dev.ionfusion.fusion.FusionSymbol.makeSymbol; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; import java.math.BigInteger; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/RequireForm.java b/runtime/src/main/java/dev/ionfusion/fusion/RequireForm.java index 52d1e6949..1a721506d 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/RequireForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/RequireForm.java @@ -15,6 +15,7 @@ import static dev.ionfusion.fusion.GlobalState.REQUIRE; import dev.ionfusion.fusion.Namespace.RequireRenameMapping; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.ArrayList; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ResultFailure.java b/runtime/src/main/java/dev/ionfusion/fusion/ResultFailure.java index 61c0e5988..67c11c1ec 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ResultFailure.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ResultFailure.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionIo.safeWrite; import static dev.ionfusion.fusion._private.FusionUtils.writeFriendlyIndex; +import dev.ionfusion.runtime.base.FusionException; + /** * Indicates a contractual failure of a result from some computation. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SetForm.java b/runtime/src/main/java/dev/ionfusion/fusion/SetForm.java index 584185fbb..4c82d20f4 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SetForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SetForm.java @@ -3,6 +3,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + final class SetForm extends SyntacticForm { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SimpleSyntaxValue.java b/runtime/src/main/java/dev/ionfusion/fusion/SimpleSyntaxValue.java index 3b8e1ade5..ba2f25a73 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SimpleSyntaxValue.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SimpleSyntaxValue.java @@ -7,6 +7,7 @@ import com.amazon.ion.IonException; import com.amazon.ion.IonWriter; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/StandardReader.java b/runtime/src/main/java/dev/ionfusion/fusion/StandardReader.java index 67ddf80a9..e978904f1 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/StandardReader.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/StandardReader.java @@ -28,6 +28,7 @@ import com.amazon.ion.Timestamp; import dev.ionfusion.fusion.FusionList.BaseList; import dev.ionfusion.fusion.FusionSexp.BaseSexp; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; import java.math.BigInteger; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/StandardRuntime.java b/runtime/src/main/java/dev/ionfusion/fusion/StandardRuntime.java index a1402aba4..7412609b4 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/StandardRuntime.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/StandardRuntime.java @@ -13,6 +13,7 @@ import com.amazon.ion.IonValue; import com.amazon.ion.ValueFactory; import com.amazon.ion.system.IonSystemBuilder; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.embed.FusionRuntime; import dev.ionfusion.runtime.embed.ModuleBuilder; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/StandardTopLevel.java b/runtime/src/main/java/dev/ionfusion/fusion/StandardTopLevel.java index 6e2cd7704..cd80b7759 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/StandardTopLevel.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/StandardTopLevel.java @@ -11,6 +11,7 @@ import static dev.ionfusion.runtime.base.ModuleIdentity.isValidAbsoluteModulePath; import com.amazon.ion.IonReader; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceName; import dev.ionfusion.runtime.embed.TopLevel; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/StringToIntProc.java b/runtime/src/main/java/dev/ionfusion/fusion/StringToIntProc.java index 0cb422d7a..cfca633b0 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/StringToIntProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/StringToIntProc.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionNumber.makeInt; import static dev.ionfusion.fusion.FusionString.checkNullableStringArg; +import dev.ionfusion.runtime.base.FusionException; import java.math.BigInteger; final class StringToIntProc diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntacticForm.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntacticForm.java index 5ad198855..7f9677c8e 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntacticForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntacticForm.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; /** * Base class for syntactic forms. diff --git a/runtime/src/main/java/dev/ionfusion/fusion/Syntax.java b/runtime/src/main/java/dev/ionfusion/fusion/Syntax.java index 2d9d1ef4c..14e9c80ed 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/Syntax.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/Syntax.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.ArgumentException.makeArgumentError; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; /** diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxAppendProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxAppendProc.java index 124af2b63..ef9cb68a7 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxAppendProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxAppendProc.java @@ -4,6 +4,8 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; + final class SyntaxAppendProc extends Procedure { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxChecker.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxChecker.java index 928742090..5a2780d3c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxChecker.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxChecker.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionValue.isAnyNull; import static dev.ionfusion.fusion.SyntaxException.makeSyntaxError; +import dev.ionfusion.runtime.base.FusionException; + /** * Helper class for checking syntactic forms. diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java index 9bd5e2081..75f20ab67 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxColumnProc.java @@ -5,6 +5,7 @@ import static dev.ionfusion.fusion.FusionNumber.makeInt; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxContainer.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxContainer.java index 6e67361d9..ad8f9c7a4 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxContainer.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxContainer.java @@ -5,6 +5,7 @@ import static dev.ionfusion.fusion._private.FusionUtils.EMPTY_OBJECT_ARRAY; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; abstract class SyntaxContainer diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxGetProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxGetProc.java index 47c7dece3..110a912e1 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxGetProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxGetProc.java @@ -9,6 +9,8 @@ import static dev.ionfusion.fusion.FusionVoid.voidValue; import static dev.ionfusion.fusion._private.FusionUtils.writeFriendlyIndex; +import dev.ionfusion.runtime.base.FusionException; + final class SyntaxGetProc extends Procedure { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxKeyword.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxKeyword.java index 2bbf76374..be68b4a23 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxKeyword.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxKeyword.java @@ -9,6 +9,7 @@ import com.amazon.ion.IonException; import com.amazon.ion.IonWriter; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java index 02090e352..4f098c130 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxLineProc.java @@ -5,6 +5,7 @@ import static dev.ionfusion.fusion.FusionNumber.makeInt; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxList.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxList.java index 2b5b18e19..c491098bb 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxList.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxList.java @@ -13,6 +13,7 @@ import com.amazon.ion.IonWriter; import dev.ionfusion.fusion.FusionList.BaseList; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSequence.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSequence.java index 17cceb3a3..ec721c5df 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSequence.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSequence.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; abstract class SyntaxSequence diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSexp.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSexp.java index 2ad719133..0ef4b76e1 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSexp.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSexp.java @@ -21,6 +21,7 @@ import dev.ionfusion.fusion.FusionSexp.BaseSexp; import dev.ionfusion.fusion.FusionSexp.ImmutablePair; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; import java.lang.reflect.Array; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSizeProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSizeProc.java index 932d57e4b..5b1f7bd72 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSizeProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSizeProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionNumber.makeInt; +import dev.ionfusion.runtime.base.FusionException; + final class SyntaxSizeProc extends Procedure1 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSourceProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSourceProc.java index fe185083e..30c46d23c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSourceProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSourceProc.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionString.makeString; import static dev.ionfusion.fusion.FusionVoid.voidValue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxStruct.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxStruct.java index 104e47799..d774930ae 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxStruct.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxStruct.java @@ -7,6 +7,7 @@ import com.amazon.ion.IonWriter; import dev.ionfusion.fusion.FusionStruct.ImmutableStruct; import dev.ionfusion.fusion.FusionStruct.StructFieldVisitor; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; @@ -138,7 +139,7 @@ Object unwrap(Evaluator eval) StructFieldVisitor visitor = new StructFieldVisitor() { @Override public Object visit(String name, Object value) - throws FusionException + throws FusionException { return ((SyntaxValue) value).addWraps(myWraps); } diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSubseqProc.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSubseqProc.java index 31a7bc623..324e143ab 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSubseqProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSubseqProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion.FusionNumber.checkIntArgToJavaInt; +import dev.ionfusion.runtime.base.FusionException; + final class SyntaxSubseqProc extends Procedure { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSymbol.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSymbol.java index 9036f1c1c..fa7dd3c86 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSymbol.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxSymbol.java @@ -13,6 +13,7 @@ import static dev.ionfusion.fusion._private.FusionUtils.EMPTY_STRING_ARRAY; import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.util.Collections; import java.util.Set; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxText.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxText.java index 8f70a29b1..45f59ff2c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxText.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxText.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; import dev.ionfusion.fusion.FusionText.BaseText; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; abstract class SyntaxText diff --git a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxValue.java b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxValue.java index e45f7d5bc..6e6e66409 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/SyntaxValue.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/SyntaxValue.java @@ -10,6 +10,7 @@ import static java.lang.Boolean.TRUE; import com.amazon.ion.IonValue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/TopForm.java b/runtime/src/main/java/dev/ionfusion/fusion/TopForm.java index e7437378b..5f2453efb 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/TopForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/TopForm.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.UnboundIdentifierException.makeUnboundError; +import dev.ionfusion.runtime.base.FusionException; + /** * Implementation of {@code #%top}, which is introduced when identifiers are * macro-expanded in a scope where the identifier is not bound. diff --git a/runtime/src/main/java/dev/ionfusion/fusion/TopLevelNamespace.java b/runtime/src/main/java/dev/ionfusion/fusion/TopLevelNamespace.java index c786a5a59..bb9797d28 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/TopLevelNamespace.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/TopLevelNamespace.java @@ -10,6 +10,7 @@ import dev.ionfusion.fusion.FusionSymbol.BaseSymbol; import dev.ionfusion.fusion.ModuleNamespace.ProvidedBinding; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import java.util.Iterator; import java.util.Set; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/TypeAnnotationsProc.java b/runtime/src/main/java/dev/ionfusion/fusion/TypeAnnotationsProc.java index 9def6b741..d88853657 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/TypeAnnotationsProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/TypeAnnotationsProc.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionList.immutableList; import static dev.ionfusion.fusion.FusionValue.annotations; +import dev.ionfusion.runtime.base.FusionException; + final class TypeAnnotationsProc extends Procedure1 { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/ValuesProc.java b/runtime/src/main/java/dev/ionfusion/fusion/ValuesProc.java index cd298234d..e6ce07141 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/ValuesProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/ValuesProc.java @@ -5,6 +5,8 @@ import static dev.ionfusion.fusion._private.FusionUtils.EMPTY_OBJECT_ARRAY; +import dev.ionfusion.runtime.base.FusionException; + final class ValuesProc extends Procedure { diff --git a/runtime/src/main/java/dev/ionfusion/fusion/WrongSyntaxProc.java b/runtime/src/main/java/dev/ionfusion/fusion/WrongSyntaxProc.java index e6bef6cfc..8257bbe54 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/WrongSyntaxProc.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/WrongSyntaxProc.java @@ -6,6 +6,8 @@ import static dev.ionfusion.fusion.FusionIo.safeDisplayManyToString; import static dev.ionfusion.fusion.SyntaxException.makeSyntaxError; +import dev.ionfusion.runtime.base.FusionException; + /** * Fusion procedure to raise a syntax error. */ diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_Private_HelpForm.java b/runtime/src/main/java/dev/ionfusion/fusion/_Private_HelpForm.java index 154ad8c69..461e566aa 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_Private_HelpForm.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/_Private_HelpForm.java @@ -9,6 +9,7 @@ import dev.ionfusion.fusion.ModuleNamespace.CompiledImportedVariableReference; import dev.ionfusion.fusion.TopLevelNamespace.CompiledTopLevelVariableReference; import dev.ionfusion.fusion._private.doc.model.BindingDoc; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_Private_Trampoline.java b/runtime/src/main/java/dev/ionfusion/fusion/_Private_Trampoline.java index 99a916d9d..40d938b5c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_Private_Trampoline.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/_Private_Trampoline.java @@ -4,6 +4,7 @@ package dev.ionfusion.fusion; import dev.ionfusion.fusion._private.doc.model.ModuleDocs; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.embed.TopLevel; import java.nio.file.Path; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/RepoEntity.java b/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/RepoEntity.java index a22b21b56..2d7fc93ef 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/RepoEntity.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/RepoEntity.java @@ -7,8 +7,8 @@ import static dev.ionfusion.fusion._Private_Trampoline.instantiateModuleDocs; import static dev.ionfusion.fusion._Private_Trampoline.loadModule; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion._private.doc.model.ModuleDocs; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.embed.TopLevel; import java.nio.file.Path; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteBuilder.java b/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteBuilder.java index da54bd47a..4ef607eef 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteBuilder.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteBuilder.java @@ -5,7 +5,6 @@ import static java.nio.file.Files.isDirectory; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion._private.StreamWriter; import dev.ionfusion.fusion._private.doc.model.MarkdownArticle; import dev.ionfusion.fusion._private.doc.site.FileCopyTemplate; @@ -13,6 +12,7 @@ import dev.ionfusion.fusion._private.doc.site.Template; import dev.ionfusion.fusion._private.doc.tool.layout.StreamingTemplate; import dev.ionfusion.fusion._private.doc.tool.mustache.MustacheTemplate; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.embed.TopLevel; import java.nio.file.Path; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteModel.java b/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteModel.java index 1fc7ce347..36f38f309 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteModel.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/_private/doc/tool/SiteModel.java @@ -4,8 +4,8 @@ package dev.ionfusion.fusion._private.doc.tool; import com.amazon.ion.Timestamp; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion.util.FusionJarInfo; +import dev.ionfusion.runtime.base.FusionException; /** * Holds site-wide information available to templates. diff --git a/runtime/src/main/java/dev/ionfusion/fusion/cli/CoverageReportWriter.java b/runtime/src/main/java/dev/ionfusion/fusion/cli/CoverageReportWriter.java index 663e6f186..bd789e463 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/cli/CoverageReportWriter.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/cli/CoverageReportWriter.java @@ -16,11 +16,11 @@ import com.amazon.ion.SpanProvider; import com.amazon.ion.Timestamp; import com.amazon.ion.system.IonReaderBuilder; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion._private.HtmlWriter; import dev.ionfusion.fusion._private.StreamWriter; import dev.ionfusion.runtime._private.cover.CoverageConfiguration; import dev.ionfusion.runtime._private.cover.CoverageDatabase; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/cli/FusionExecutor.java b/runtime/src/main/java/dev/ionfusion/fusion/cli/FusionExecutor.java index 79c6fdf4c..7dd5be2ae 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/cli/FusionExecutor.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/cli/FusionExecutor.java @@ -7,7 +7,7 @@ import static dev.ionfusion.fusion.FusionVoid.isVoid; import dev.ionfusion.fusion.ExitException; -import dev.ionfusion.fusion.FusionException; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.FusionRuntime; import dev.ionfusion.runtime.embed.TopLevel; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/cli/GlobalOptions.java b/runtime/src/main/java/dev/ionfusion/fusion/cli/GlobalOptions.java index 092c47ece..d26f64894 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/cli/GlobalOptions.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/cli/GlobalOptions.java @@ -4,9 +4,9 @@ package dev.ionfusion.fusion.cli; import com.amazon.ion.IonException; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion.FusionRuntimeBuilder; import dev.ionfusion.fusion._Private_Trampoline; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.FusionRuntime; import java.io.File; import java.io.IOException; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/cli/Repl.java b/runtime/src/main/java/dev/ionfusion/fusion/cli/Repl.java index 766fc0e33..51538c160 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/cli/Repl.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/cli/Repl.java @@ -7,7 +7,7 @@ import com.amazon.ion.IonException; import dev.ionfusion.fusion.ExitException; -import dev.ionfusion.fusion.FusionException; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import java.io.BufferedReader; import java.io.Console; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/cli/Version.java b/runtime/src/main/java/dev/ionfusion/fusion/cli/Version.java index fabe24aed..dc0b1d65f 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/cli/Version.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/cli/Version.java @@ -3,13 +3,13 @@ package dev.ionfusion.fusion.cli; -import dev.ionfusion.fusion.FusionException; -import dev.ionfusion.fusion.util.FusionJarInfo; import com.amazon.ion.IonException; import com.amazon.ion.IonType; import com.amazon.ion.IonWriter; import com.amazon.ion.system.IonTextWriterBuilder; import com.amazon.ion.util.JarInfo; +import dev.ionfusion.fusion.util.FusionJarInfo; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; import java.io.PrintWriter; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/util/FusionJarInfo.java b/runtime/src/main/java/dev/ionfusion/fusion/util/FusionJarInfo.java index 41ceb1b35..3c7e5020c 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/util/FusionJarInfo.java +++ b/runtime/src/main/java/dev/ionfusion/fusion/util/FusionJarInfo.java @@ -3,8 +3,8 @@ package dev.ionfusion.fusion.util; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion._Private_Trampoline; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; import java.io.InputStream; import java.util.Properties; diff --git a/runtime/src/main/java/dev/ionfusion/fusion/FusionException.java b/runtime/src/main/java/dev/ionfusion/runtime/base/FusionException.java similarity index 98% rename from runtime/src/main/java/dev/ionfusion/fusion/FusionException.java rename to runtime/src/main/java/dev/ionfusion/runtime/base/FusionException.java index 08799e430..9e353bf09 100644 --- a/runtime/src/main/java/dev/ionfusion/fusion/FusionException.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/base/FusionException.java @@ -1,12 +1,11 @@ // Copyright Ion Fusion contributors. All rights reserved. // SPDX-License-Identifier: Apache-2.0 -package dev.ionfusion.fusion; +package dev.ionfusion.runtime.base; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; -import dev.ionfusion.runtime.base.SourceLocation; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/runtime/src/main/java/dev/ionfusion/runtime/embed/FusionRuntime.java b/runtime/src/main/java/dev/ionfusion/runtime/embed/FusionRuntime.java index d4bdcf6d6..528c698c3 100644 --- a/runtime/src/main/java/dev/ionfusion/runtime/embed/FusionRuntime.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/embed/FusionRuntime.java @@ -6,8 +6,8 @@ import com.amazon.ion.IonCatalog; import com.amazon.ion.IonValue; import com.amazon.ion.ValueFactory; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion.FusionRuntimeBuilder; +import dev.ionfusion.runtime.base.FusionException; /** * Primary entry point for embedding Fusion within a Java program. diff --git a/runtime/src/main/java/dev/ionfusion/runtime/embed/ModuleBuilder.java b/runtime/src/main/java/dev/ionfusion/runtime/embed/ModuleBuilder.java index 8c212040d..7b5bb9f32 100644 --- a/runtime/src/main/java/dev/ionfusion/runtime/embed/ModuleBuilder.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/embed/ModuleBuilder.java @@ -3,7 +3,7 @@ package dev.ionfusion.runtime.embed; -import dev.ionfusion.fusion.FusionException; +import dev.ionfusion.runtime.base.FusionException; /** * Constructs "built-in" modules via Java code. diff --git a/runtime/src/main/java/dev/ionfusion/runtime/embed/SandboxBuilder.java b/runtime/src/main/java/dev/ionfusion/runtime/embed/SandboxBuilder.java index 1a1988981..ca5dd1ef3 100644 --- a/runtime/src/main/java/dev/ionfusion/runtime/embed/SandboxBuilder.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/embed/SandboxBuilder.java @@ -3,8 +3,8 @@ package dev.ionfusion.runtime.embed; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion.FusionRuntimeBuilder; +import dev.ionfusion.runtime.base.FusionException; /** * Constructs {@link TopLevel} namespaces for evaluating code with limited diff --git a/runtime/src/main/java/dev/ionfusion/runtime/embed/TopLevel.java b/runtime/src/main/java/dev/ionfusion/runtime/embed/TopLevel.java index fbbc00b8e..148e7a718 100644 --- a/runtime/src/main/java/dev/ionfusion/runtime/embed/TopLevel.java +++ b/runtime/src/main/java/dev/ionfusion/runtime/embed/TopLevel.java @@ -5,8 +5,8 @@ import com.amazon.ion.IonReader; import dev.ionfusion.fusion.ExitException; -import dev.ionfusion.fusion.FusionException; import dev.ionfusion.fusion.FusionInterruptedException; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceName; import java.io.File; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/BlobTest.java b/runtime/src/test/java/dev/ionfusion/fusion/BlobTest.java index 89b65b4ce..f451b5ad1 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/BlobTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/BlobTest.java @@ -7,6 +7,7 @@ import static dev.ionfusion.fusion.FusionLob.isLob; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; /** diff --git a/runtime/src/test/java/dev/ionfusion/fusion/ClobTest.java b/runtime/src/test/java/dev/ionfusion/fusion/ClobTest.java index 45cbac86b..a7082732b 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/ClobTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/ClobTest.java @@ -7,6 +7,7 @@ import static dev.ionfusion.fusion.FusionLob.isLob; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; /** diff --git a/runtime/src/test/java/dev/ionfusion/fusion/CoreTestCase.java b/runtime/src/test/java/dev/ionfusion/fusion/CoreTestCase.java index 47afd7c79..6d2c07dfd 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/CoreTestCase.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/CoreTestCase.java @@ -27,6 +27,7 @@ import com.amazon.ion.IonText; import com.amazon.ion.IonValue; import com.amazon.ion.system.IonSystemBuilder; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.FusionRuntime; import dev.ionfusion.runtime.embed.TopLevel; import dev.ionfusion.testing.StdioTestCase; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/CoverageTest.java b/runtime/src/test/java/dev/ionfusion/fusion/CoverageTest.java index a326fc4a0..f764351a0 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/CoverageTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/CoverageTest.java @@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; import dev.ionfusion.runtime.embed.TopLevel; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/ExpandProgramTest.java b/runtime/src/test/java/dev/ionfusion/fusion/ExpandProgramTest.java index b99cf7455..402c9b605 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/ExpandProgramTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/ExpandProgramTest.java @@ -19,6 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/FusionValueTest.java b/runtime/src/test/java/dev/ionfusion/fusion/FusionValueTest.java index 17c0bf83f..951dd6c94 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/FusionValueTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/FusionValueTest.java @@ -18,6 +18,7 @@ import com.amazon.ion.IonInt; import com.amazon.ion.IonValue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/IdentifierBindingTest.java b/runtime/src/test/java/dev/ionfusion/fusion/IdentifierBindingTest.java index c57a54fd3..b1958973e 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/IdentifierBindingTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/IdentifierBindingTest.java @@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import dev.ionfusion.runtime.base.SourceName; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/JavaFfiTest.java b/runtime/src/test/java/dev/ionfusion/fusion/JavaFfiTest.java index 4f490e00f..31baf913a 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/JavaFfiTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/JavaFfiTest.java @@ -5,6 +5,7 @@ import static com.amazon.ion.util.IonTextUtils.printString; import dev.ionfusion.fusion.FusionNumber.SumProc; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/ListTest.java b/runtime/src/test/java/dev/ionfusion/fusion/ListTest.java index 31366d962..ed17597d7 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/ListTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/ListTest.java @@ -15,6 +15,7 @@ import com.amazon.ion.IonList; import com.amazon.ion.IonValue; import dev.ionfusion.fusion.FusionList.UnsafeListSizeProc; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/LobTestCase.java b/runtime/src/test/java/dev/ionfusion/fusion/LobTestCase.java index e910ec3ce..11c50d7e4 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/LobTestCase.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/LobTestCase.java @@ -18,6 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/ModuleTest.java b/runtime/src/test/java/dev/ionfusion/fusion/ModuleTest.java index 591ead080..8ec4a7cc6 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/ModuleTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/ModuleTest.java @@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.TopLevel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/NamespaceTest.java b/runtime/src/test/java/dev/ionfusion/fusion/NamespaceTest.java index f01c3ab2a..844227464 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/NamespaceTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/NamespaceTest.java @@ -19,6 +19,7 @@ import com.amazon.ion.IonReader; import com.amazon.ion.system.IonReaderBuilder; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/NumericsTest.java b/runtime/src/test/java/dev/ionfusion/fusion/NumericsTest.java index 42f252090..73669a3de 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/NumericsTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/NumericsTest.java @@ -4,6 +4,8 @@ package dev.ionfusion.fusion; import static dev.ionfusion.fusion.FusionNumber.checkIntArgToJavaLong; + +import dev.ionfusion.runtime.base.FusionException; import java.math.BigDecimal; import java.math.BigInteger; import org.junit.jupiter.api.BeforeEach; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/RuntimeTest.java b/runtime/src/test/java/dev/ionfusion/fusion/RuntimeTest.java index c81bfc1c0..991f89cd3 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/RuntimeTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/RuntimeTest.java @@ -23,6 +23,7 @@ import com.amazon.ion.SymbolTable; import com.amazon.ion.system.IonBinaryWriterBuilder; import com.amazon.ion.system.SimpleCatalog; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.ModuleIdentity; import dev.ionfusion.runtime.base.SourceName; import dev.ionfusion.runtime.embed.ModuleBuilder; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/SandboxTest.java b/runtime/src/test/java/dev/ionfusion/fusion/SandboxTest.java index c2a8a6f0b..bb37bc485 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/SandboxTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/SandboxTest.java @@ -12,6 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.embed.SandboxBuilder; import dev.ionfusion.runtime.embed.TopLevel; import java.io.File; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/StackTraceTest.java b/runtime/src/test/java/dev/ionfusion/fusion/StackTraceTest.java index a9e17747e..ca19c9724 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/StackTraceTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/StackTraceTest.java @@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.fail; +import dev.ionfusion.runtime.base.FusionException; import dev.ionfusion.runtime.base.SourceLocation; import java.util.Iterator; import java.util.List; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/StringTest.java b/runtime/src/test/java/dev/ionfusion/fusion/StringTest.java index 422f708ee..af9a8f1fa 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/StringTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/StringTest.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionString.unsafeStringToJavaString; import static org.junit.jupiter.api.Assertions.assertEquals; import com.amazon.ion.util.IonTextUtils; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/StructTest.java b/runtime/src/test/java/dev/ionfusion/fusion/StructTest.java index 9d139e8d4..df8a2ba1c 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/StructTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/StructTest.java @@ -14,6 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/TailCallTest.java b/runtime/src/test/java/dev/ionfusion/fusion/TailCallTest.java index e6a3927d4..1f9ce64be 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/TailCallTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/TailCallTest.java @@ -6,6 +6,7 @@ import static dev.ionfusion.fusion.FusionNumber.checkIntArgToJavaInt; import static dev.ionfusion.fusion.FusionNumber.makeInt; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.Test; public class TailCallTest diff --git a/runtime/src/test/java/dev/ionfusion/fusion/TestSetup.java b/runtime/src/test/java/dev/ionfusion/fusion/TestSetup.java index 7813bae2d..6390bfe0d 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/TestSetup.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/TestSetup.java @@ -3,6 +3,7 @@ package dev.ionfusion.fusion; +import dev.ionfusion.runtime.base.FusionException; import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/runtime/src/test/java/dev/ionfusion/fusion/util/FusionJarInfoTest.java b/runtime/src/test/java/dev/ionfusion/fusion/util/FusionJarInfoTest.java index 591440219..ba89b55ff 100644 --- a/runtime/src/test/java/dev/ionfusion/fusion/util/FusionJarInfoTest.java +++ b/runtime/src/test/java/dev/ionfusion/fusion/util/FusionJarInfoTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; -import dev.ionfusion.fusion.FusionException; +import dev.ionfusion.runtime.base.FusionException; import org.junit.jupiter.api.Test; /**