refactor package nesting of ast exception classes

This commit is contained in:
Irmen de Jong
2024-12-23 18:14:46 +01:00
parent 2727a4dcb3
commit 4c1e2f3110
23 changed files with 26 additions and 31 deletions

View File

@@ -1,8 +1,8 @@
package prog8.optimizer package prog8.optimizer
import prog8.ast.ExpressionError
import prog8.ast.FatalAstException
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.ExpressionError
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.FunctionCallExpression import prog8.ast.expressions.FunctionCallExpression
import prog8.ast.expressions.NumericLiteral import prog8.ast.expressions.NumericLiteral
import prog8.code.core.BaseDataType import prog8.code.core.BaseDataType

View File

@@ -1,8 +1,8 @@
package prog8.optimizer package prog8.optimizer
import prog8.ast.FatalAstException
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.maySwapOperandOrder import prog8.ast.maySwapOperandOrder
import prog8.ast.statements.* import prog8.ast.statements.*

View File

@@ -1,11 +1,11 @@
package prog8.optimizer package prog8.optimizer
import prog8.ast.FatalAstException
import prog8.ast.IFunctionCall import prog8.ast.IFunctionCall
import prog8.ast.IStatementContainer import prog8.ast.IStatementContainer
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.FatalAstException import prog8.ast.UndefinedSymbolError
import prog8.ast.base.UndefinedSymbolError
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker

View File

@@ -1,7 +1,6 @@
package prog8.optimizer package prog8.optimizer
import prog8.ast.* import prog8.ast.*
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.AnonymousScope import prog8.ast.statements.AnonymousScope
import prog8.ast.statements.IfElse import prog8.ast.statements.IfElse

View File

@@ -1,7 +1,7 @@
package prog8 package prog8
import kotlinx.cli.* import kotlinx.cli.*
import prog8.ast.base.AstException import prog8.ast.AstException
import prog8.code.core.CbmPrgLauncherType import prog8.code.core.CbmPrgLauncherType
import prog8.code.target.CompilationTargets import prog8.code.target.CompilationTargets
import prog8.code.target.Cx16Target import prog8.code.target.Cx16Target

View File

@@ -1,9 +1,9 @@
package prog8.compiler package prog8.compiler
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.AstException import prog8.ast.AstException
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.base.SyntaxError import prog8.ast.SyntaxError
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.VarDecl import prog8.ast.statements.VarDecl
import prog8.code.core.* import prog8.code.core.*

View File

@@ -1,9 +1,9 @@
package prog8.compiler package prog8.compiler
import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onFailure
import prog8.ast.AstException
import prog8.ast.IBuiltinFunctions import prog8.ast.IBuiltinFunctions
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.AstException
import prog8.ast.expressions.Expression import prog8.ast.expressions.Expression
import prog8.ast.expressions.NumericLiteral import prog8.ast.expressions.NumericLiteral
import prog8.ast.printProgram import prog8.ast.printProgram

View File

@@ -3,7 +3,7 @@ package prog8.compiler
import com.github.michaelbull.result.* import com.github.michaelbull.result.*
import prog8.ast.Module import prog8.ast.Module
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.SyntaxError import prog8.ast.SyntaxError
import prog8.ast.statements.Directive import prog8.ast.statements.Directive
import prog8.ast.statements.DirectiveArg import prog8.ast.statements.DirectiveArg
import prog8.code.core.IErrorReporter import prog8.code.core.IErrorReporter

View File

@@ -1,8 +1,8 @@
package prog8.compiler.astprocessing package prog8.compiler.astprocessing
import prog8.ast.* import prog8.ast.*
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.base.SyntaxError import prog8.ast.SyntaxError
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.walk.IAstVisitor import prog8.ast.walk.IAstVisitor

View File

@@ -3,8 +3,8 @@ package prog8.compiler.astprocessing
import prog8.ast.IFunctionCall import prog8.ast.IFunctionCall
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.base.SyntaxError import prog8.ast.SyntaxError
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.findParentNode import prog8.ast.findParentNode
import prog8.ast.statements.* import prog8.ast.statements.*

View File

@@ -5,7 +5,7 @@ import com.github.michaelbull.result.Result
import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.getOrElse
import com.github.michaelbull.result.mapError import com.github.michaelbull.result.mapError
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.code.ast.* import prog8.code.ast.*

View File

@@ -2,7 +2,7 @@ package prog8.compiler.astprocessing
import prog8.ast.Module import prog8.ast.Module
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker

View File

@@ -3,7 +3,7 @@ package prog8.compiler.astprocessing
import prog8.ast.IFunctionCall import prog8.ast.IFunctionCall
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker

View File

@@ -1,6 +1,6 @@
package prog8.compiler.astprocessing package prog8.compiler.astprocessing
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.code.ast.PtExpression import prog8.code.ast.PtExpression
import prog8.code.ast.PtFunctionCall import prog8.code.ast.PtFunctionCall
import prog8.code.ast.PtTypeCast import prog8.code.ast.PtTypeCast

View File

@@ -4,7 +4,7 @@ import prog8.ast.IFunctionCall
import prog8.ast.IStatementContainer import prog8.ast.IStatementContainer
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker

View File

@@ -5,7 +5,7 @@ import io.kotest.core.spec.style.FunSpec
import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe import io.kotest.matchers.shouldNotBe
import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldContain
import prog8.ast.base.ExpressionError import prog8.ast.ExpressionError
import prog8.ast.expressions.ArrayLiteral import prog8.ast.expressions.ArrayLiteral
import prog8.ast.expressions.InferredTypes import prog8.ast.expressions.InferredTypes
import prog8.ast.expressions.NumericLiteral import prog8.ast.expressions.NumericLiteral

View File

@@ -1,6 +1,5 @@
package prog8.ast package prog8.ast
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.Expression import prog8.ast.expressions.Expression
import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.IdentifierReference
import prog8.ast.expressions.InferredTypes import prog8.ast.expressions.InferredTypes

View File

@@ -1,4 +1,4 @@
package prog8.ast.base package prog8.ast
import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.IdentifierReference
import prog8.code.core.Position import prog8.code.core.Position

View File

@@ -1,6 +1,5 @@
package prog8.ast package prog8.ast
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.IdentifierReference
import prog8.ast.expressions.StringLiteral import prog8.ast.expressions.StringLiteral
import prog8.ast.statements.* import prog8.ast.statements.*

View File

@@ -3,8 +3,8 @@ package prog8.ast.antlr
import org.antlr.v4.runtime.ParserRuleContext import org.antlr.v4.runtime.ParserRuleContext
import org.antlr.v4.runtime.Token import org.antlr.v4.runtime.Token
import org.antlr.v4.runtime.tree.TerminalNode import org.antlr.v4.runtime.tree.TerminalNode
import prog8.ast.base.FatalAstException import prog8.ast.FatalAstException
import prog8.ast.base.SyntaxError import prog8.ast.SyntaxError
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.code.core.* import prog8.code.core.*

View File

@@ -1,10 +1,10 @@
package prog8.ast.expressions package prog8.ast.expressions
import prog8.ast.ExpressionError
import prog8.ast.FatalAstException
import prog8.ast.IFunctionCall import prog8.ast.IFunctionCall
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.ExpressionError
import prog8.ast.base.FatalAstException
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker
import prog8.ast.walk.IAstVisitor import prog8.ast.walk.IAstVisitor

View File

@@ -1,7 +1,6 @@
package prog8.ast.statements package prog8.ast.statements
import prog8.ast.* import prog8.ast.*
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker
import prog8.ast.walk.IAstVisitor import prog8.ast.walk.IAstVisitor

View File

@@ -1,7 +1,6 @@
package prog8.ast.walk package prog8.ast.walk
import prog8.ast.* import prog8.ast.*
import prog8.ast.base.FatalAstException
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.code.core.AssociativeOperators import prog8.code.core.AssociativeOperators