From 945ba85c98123528dec0d55ece2518fe7e66abf8 Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Fri, 6 Oct 2023 15:39:13 -0700 Subject: [PATCH] ast: move gay.pizza.pork.ast to gay.pizza.pork.ast.gen --- .../kotlin/gay/pizza/pork/ast/{ => gen}/ArgumentSpec.kt | 2 +- ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Block.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/BooleanLiteral.kt | 2 +- ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Break.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/CompilationUnit.kt | 2 +- .../main/kotlin/gay/pizza/pork/ast/{ => gen}/Continue.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/Declaration.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/Definition.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/DefinitionModifiers.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/DoubleLiteral.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/Expression.kt | 2 +- ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/ForIn.kt | 2 +- .../main/kotlin/gay/pizza/pork/ast/{ => gen}/ForInItem.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/FunctionCall.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/FunctionDefinition.kt | 2 +- ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/If.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/ImportDeclaration.kt | 2 +- .../main/kotlin/gay/pizza/pork/ast/{ => gen}/IndexedBy.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/InfixOperation.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/InfixOperator.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/IntegerLiteral.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/LetAssignment.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/LetDefinition.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/ListLiteral.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/LongLiteral.kt | 2 +- .../main/kotlin/gay/pizza/pork/ast/{ => gen}/Native.kt | 2 +- ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Node.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/NodeCoalescer.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/NodeExtensions.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/NodeParser.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/NodeParserExtensions.kt | 2 +- .../main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeType.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/NodeVisitor.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/NodeVisitorExtensions.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/NoneLiteral.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/Parentheses.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/PrefixOperation.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/PrefixOperator.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/SetAssignment.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/StringLiteral.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/SuffixOperation.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/SuffixOperator.kt | 2 +- .../main/kotlin/gay/pizza/pork/ast/{ => gen}/Symbol.kt | 2 +- .../gay/pizza/pork/ast/{ => gen}/SymbolReference.kt | 2 +- .../kotlin/gay/pizza/pork/ast/{ => gen}/VarAssignment.kt | 2 +- ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/While.kt | 2 +- .../gay/pizza/pork/buildext/GenerateStandardAstCode.kt | 4 ++-- .../gay/pizza/pork/buildext/ast/AstPorkIdeaCodegen.kt | 4 ++-- .../gay/pizza/pork/evaluator/CompilationUnitContext.kt | 2 +- .../kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt | 2 +- .../kotlin/gay/pizza/pork/evaluator/FunctionContext.kt | 2 +- .../gay/pizza/pork/evaluator/InternalNativeProvider.kt | 2 +- .../kotlin/gay/pizza/pork/evaluator/NativeProvider.kt | 2 +- ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogen.kt | 2 +- .../kotlin/gay/pizza/pork/ffi/JavaAutogenContentSource.kt | 2 +- .../main/kotlin/gay/pizza/pork/ffi/JavaNativeProvider.kt | 2 +- .../main/kotlin/gay/pizza/pork/ffi/JnaNativeProvider.kt | 2 +- frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt | 4 ++-- .../gay/pizza/pork/frontend/scope/CompilationUnitScope.kt | 4 ++-- .../kotlin/gay/pizza/pork/frontend/scope/ScopeSymbol.kt | 4 ++-- .../gay/pizza/pork/frontend/scope/VisibleScopeSymbol.kt | 2 +- .../kotlin/gay/pizza/pork/frontend/scope/WorldScope.kt | 2 +- minimal/src/main/kotlin/gay/pizza/pork/minimal/Tool.kt | 6 +++--- .../gay/pizza/pork/parser/DiscardNodeAttribution.kt | 4 ++-- .../main/kotlin/gay/pizza/pork/parser/NodeAttribution.kt | 4 ++-- parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt | 2 +- .../main/kotlin/gay/pizza/pork/parser/ParserAttributes.kt | 8 ++++---- .../src/main/kotlin/gay/pizza/pork/parser/ParserBase.kt | 6 +++--- .../main/kotlin/gay/pizza/pork/parser/ParserHelpers.kt | 6 +++--- .../kotlin/gay/pizza/pork/parser/ParserNodeAttribution.kt | 6 +++--- .../kotlin/gay/pizza/pork/parser/ParserStackAnalysis.kt | 2 +- parser/src/main/kotlin/gay/pizza/pork/parser/Printer.kt | 2 +- .../kotlin/gay/pizza/pork/idea/PorkDeclarationSymbol.kt | 6 ------ .../main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt | 2 +- .../src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt | 4 ++-- .../gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt | 4 ++-- .../kotlin/gay/pizza/pork/idea/psi/PorkElementHelpers.kt | 2 +- .../main/kotlin/gay/pizza/pork/idea/psi/PorkReference.kt | 7 ------- .../gay/pizza/pork/idea/psi/gen/FunctionCallElement.kt | 2 +- .../gay/pizza/pork/idea/psi/gen/PorkElementFactory.kt | 2 +- .../gay/pizza/pork/idea/psi/gen/SymbolReferenceElement.kt | 2 +- tool/src/main/kotlin/gay/pizza/pork/tool/AstCommand.kt | 2 +- .../main/kotlin/gay/pizza/pork/tool/AttributeCommand.kt | 4 ++-- 83 files changed, 102 insertions(+), 115 deletions(-) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/ArgumentSpec.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Block.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/BooleanLiteral.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Break.kt (93%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/CompilationUnit.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Continue.kt (93%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Declaration.kt (86%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Definition.kt (89%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/DefinitionModifiers.kt (87%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/DoubleLiteral.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Expression.kt (86%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/ForIn.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/ForInItem.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/FunctionCall.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/FunctionDefinition.kt (97%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/If.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/ImportDeclaration.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/IndexedBy.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/InfixOperation.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/InfixOperator.kt (94%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/IntegerLiteral.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/LetAssignment.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/LetDefinition.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/ListLiteral.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/LongLiteral.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Native.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Node.kt (93%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeCoalescer.kt (98%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeExtensions.kt (77%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeParser.kt (97%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeParserExtensions.kt (98%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeType.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeVisitor.kt (97%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NodeVisitorExtensions.kt (98%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/NoneLiteral.kt (93%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Parentheses.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/PrefixOperation.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/PrefixOperator.kt (90%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/SetAssignment.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/StringLiteral.kt (95%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/SuffixOperation.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/SuffixOperator.kt (89%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/Symbol.kt (94%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/SymbolReference.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/VarAssignment.kt (96%) rename ast/src/main/kotlin/gay/pizza/pork/ast/{ => gen}/While.kt (96%) diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/ArgumentSpec.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ArgumentSpec.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/ArgumentSpec.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/ArgumentSpec.kt index 61dbc69..f567510 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/ArgumentSpec.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ArgumentSpec.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Block.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Block.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Block.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Block.kt index dc1e0cf..5259125 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Block.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Block.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/BooleanLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/BooleanLiteral.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/BooleanLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/BooleanLiteral.kt index 19bcd26..b76e3e7 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/BooleanLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/BooleanLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Break.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Break.kt similarity index 93% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Break.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Break.kt index c9b97d4..7aff8e4 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Break.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Break.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/CompilationUnit.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/CompilationUnit.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/CompilationUnit.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/CompilationUnit.kt index 32f9e68..fcd0996 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/CompilationUnit.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/CompilationUnit.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Continue.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Continue.kt similarity index 93% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Continue.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Continue.kt index b9618ca..1ac3ce7 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Continue.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Continue.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Declaration.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Declaration.kt similarity index 86% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Declaration.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Declaration.kt index cadd3ef..c5396ea 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Declaration.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Declaration.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Definition.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Definition.kt similarity index 89% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Definition.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Definition.kt index 559ecef..4ba124f 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Definition.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Definition.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/DefinitionModifiers.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/DefinitionModifiers.kt similarity index 87% rename from ast/src/main/kotlin/gay/pizza/pork/ast/DefinitionModifiers.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/DefinitionModifiers.kt index f96eba4..fd87e95 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/DefinitionModifiers.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/DefinitionModifiers.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/DoubleLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/DoubleLiteral.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/DoubleLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/DoubleLiteral.kt index 754fe8e..ee366b3 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/DoubleLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/DoubleLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Expression.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Expression.kt similarity index 86% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Expression.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Expression.kt index 03828d6..0965f39 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Expression.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Expression.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/ForIn.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ForIn.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/ForIn.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/ForIn.kt index 3f71735..2262e45 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/ForIn.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ForIn.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/ForInItem.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ForInItem.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/ForInItem.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/ForInItem.kt index 1e6cfdc..331013b 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/ForInItem.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ForInItem.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/FunctionCall.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/FunctionCall.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/FunctionCall.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/FunctionCall.kt index a985e52..dfd9e2c 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/FunctionCall.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/FunctionCall.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/FunctionDefinition.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/FunctionDefinition.kt similarity index 97% rename from ast/src/main/kotlin/gay/pizza/pork/ast/FunctionDefinition.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/FunctionDefinition.kt index b6f5759..5b00f66 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/FunctionDefinition.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/FunctionDefinition.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/If.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/If.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/If.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/If.kt index fe4dd35..eadeb24 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/If.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/If.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/ImportDeclaration.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ImportDeclaration.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/ImportDeclaration.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/ImportDeclaration.kt index 225d902..afca23c 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/ImportDeclaration.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ImportDeclaration.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/IndexedBy.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/IndexedBy.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/IndexedBy.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/IndexedBy.kt index 3867fcd..efdae9d 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/IndexedBy.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/IndexedBy.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/InfixOperation.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/InfixOperation.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/InfixOperation.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/InfixOperation.kt index 4cb0a5b..d23511d 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/InfixOperation.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/InfixOperation.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/InfixOperator.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/InfixOperator.kt similarity index 94% rename from ast/src/main/kotlin/gay/pizza/pork/ast/InfixOperator.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/InfixOperator.kt index 6e388f3..cdf38bc 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/InfixOperator.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/InfixOperator.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/IntegerLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/IntegerLiteral.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/IntegerLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/IntegerLiteral.kt index 5261c3a..22ca65b 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/IntegerLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/IntegerLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/LetAssignment.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/LetAssignment.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/LetAssignment.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/LetAssignment.kt index 9d955e8..46f5b90 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/LetAssignment.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/LetAssignment.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/LetDefinition.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/LetDefinition.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/LetDefinition.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/LetDefinition.kt index 73b43a5..a09bb70 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/LetDefinition.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/LetDefinition.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/ListLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ListLiteral.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/ListLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/ListLiteral.kt index d58fc08..03f8161 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/ListLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/ListLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/LongLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/LongLiteral.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/LongLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/LongLiteral.kt index fe737e5..6365e5d 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/LongLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/LongLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Native.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Native.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Native.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Native.kt index 549402d..e674ad3 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Native.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Native.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Node.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Node.kt similarity index 93% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Node.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Node.kt index f622cfd..acaac5c 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Node.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Node.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeCoalescer.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeCoalescer.kt similarity index 98% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeCoalescer.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeCoalescer.kt index 159505e..e2b9dfa 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeCoalescer.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeCoalescer.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen class NodeCoalescer(val handler: (Node) -> Unit) : NodeVisitor { override fun visitArgumentSpec(node: ArgumentSpec): Unit = diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeExtensions.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeExtensions.kt similarity index 77% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeExtensions.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeExtensions.kt index 3b79da1..499cb38 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeExtensions.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeExtensions.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen @Suppress("UNCHECKED_CAST") fun

Node.data(): P? = diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeParser.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeParser.kt similarity index 97% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeParser.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeParser.kt index e68f5b0..e783996 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeParser.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeParser.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen interface NodeParser { fun parseArgumentSpec(): ArgumentSpec diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeParserExtensions.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeParserExtensions.kt similarity index 98% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeParserExtensions.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeParserExtensions.kt index 6bfbbe9..8effba9 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeParserExtensions.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeParserExtensions.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen fun NodeParser.parse(type: NodeType): Node = when (type) { diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeType.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeType.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeType.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeType.kt index 4df9da1..bdcffd3 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeType.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeType.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen enum class NodeType(val parent: NodeType? = null) { Node, diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeVisitor.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeVisitor.kt similarity index 97% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeVisitor.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeVisitor.kt index 3aec7e8..ff1e163 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeVisitor.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeVisitor.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen interface NodeVisitor { fun visitArgumentSpec(node: ArgumentSpec): T diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeVisitorExtensions.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeVisitorExtensions.kt similarity index 98% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NodeVisitorExtensions.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeVisitorExtensions.kt index f108247..3d2dfb0 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NodeVisitorExtensions.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NodeVisitorExtensions.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen fun NodeVisitor.visit(node: Node): T = when (node) { diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/NoneLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NoneLiteral.kt similarity index 93% rename from ast/src/main/kotlin/gay/pizza/pork/ast/NoneLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/NoneLiteral.kt index 2bba70d..77a9a1e 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/NoneLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/NoneLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Parentheses.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Parentheses.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Parentheses.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Parentheses.kt index fb2761e..804c982 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Parentheses.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Parentheses.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/PrefixOperation.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/PrefixOperation.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/PrefixOperation.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/PrefixOperation.kt index 9ff9b97..3ed4381 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/PrefixOperation.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/PrefixOperation.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/PrefixOperator.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/PrefixOperator.kt similarity index 90% rename from ast/src/main/kotlin/gay/pizza/pork/ast/PrefixOperator.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/PrefixOperator.kt index 430b8e3..bdf7040 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/PrefixOperator.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/PrefixOperator.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/SetAssignment.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SetAssignment.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/SetAssignment.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/SetAssignment.kt index 30c39c4..67a30bc 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/SetAssignment.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SetAssignment.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/StringLiteral.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/StringLiteral.kt similarity index 95% rename from ast/src/main/kotlin/gay/pizza/pork/ast/StringLiteral.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/StringLiteral.kt index 98a2dae..344a585 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/StringLiteral.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/StringLiteral.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/SuffixOperation.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SuffixOperation.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/SuffixOperation.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/SuffixOperation.kt index df9c3e8..dd4b47e 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/SuffixOperation.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SuffixOperation.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/SuffixOperator.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SuffixOperator.kt similarity index 89% rename from ast/src/main/kotlin/gay/pizza/pork/ast/SuffixOperator.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/SuffixOperator.kt index 612e32c..fed8f89 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/SuffixOperator.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SuffixOperator.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/Symbol.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Symbol.kt similarity index 94% rename from ast/src/main/kotlin/gay/pizza/pork/ast/Symbol.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/Symbol.kt index db094fa..4c943e1 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/Symbol.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/Symbol.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/SymbolReference.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SymbolReference.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/SymbolReference.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/SymbolReference.kt index a4ed18f..6ec01f2 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/SymbolReference.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/SymbolReference.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/VarAssignment.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/VarAssignment.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/VarAssignment.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/VarAssignment.kt index b705fff..7b8e3ad 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/VarAssignment.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/VarAssignment.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/ast/src/main/kotlin/gay/pizza/pork/ast/While.kt b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/While.kt similarity index 96% rename from ast/src/main/kotlin/gay/pizza/pork/ast/While.kt rename to ast/src/main/kotlin/gay/pizza/pork/ast/gen/While.kt index 81fb8fd..4dc8aba 100644 --- a/ast/src/main/kotlin/gay/pizza/pork/ast/While.kt +++ b/ast/src/main/kotlin/gay/pizza/pork/ast/gen/While.kt @@ -1,5 +1,5 @@ // GENERATED CODE FROM PORK AST CODEGEN -package gay.pizza.pork.ast +package gay.pizza.pork.ast.gen import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/buildext/src/main/kotlin/gay/pizza/pork/buildext/GenerateStandardAstCode.kt b/buildext/src/main/kotlin/gay/pizza/pork/buildext/GenerateStandardAstCode.kt index 6c4f780..cab8c87 100644 --- a/buildext/src/main/kotlin/gay/pizza/pork/buildext/GenerateStandardAstCode.kt +++ b/buildext/src/main/kotlin/gay/pizza/pork/buildext/GenerateStandardAstCode.kt @@ -19,10 +19,10 @@ open class GenerateStandardAstCode : DefaultTask() { var astDescriptionFile: File = project.file("src/main/ast/pork.yml") @get:Input - var codePackage: String = "gay.pizza.pork.ast" + var codePackage: String = "gay.pizza.pork.ast.gen" @get:OutputDirectory - var outputDirectory: File = project.file("src/main/kotlin/gay/pizza/pork/ast") + var outputDirectory: File = project.file("src/main/kotlin/gay/pizza/pork/ast/gen") @get:OutputFile var typeGraphFile: File = project.file("src/main/graph/types.dot") diff --git a/buildext/src/main/kotlin/gay/pizza/pork/buildext/ast/AstPorkIdeaCodegen.kt b/buildext/src/main/kotlin/gay/pizza/pork/buildext/ast/AstPorkIdeaCodegen.kt index 9929574..081e3be 100644 --- a/buildext/src/main/kotlin/gay/pizza/pork/buildext/ast/AstPorkIdeaCodegen.kt +++ b/buildext/src/main/kotlin/gay/pizza/pork/buildext/ast/AstPorkIdeaCodegen.kt @@ -112,7 +112,7 @@ class AstPorkIdeaCodegen(pkg: String, outputDirectory: Path, world: AstWorld) : if (type.referencedElementValue != null && type.referencedElementType != null) { kotlinClass.imports.add(0, "com.intellij.psi.PsiReference") - kotlinClass.imports.add("gay.pizza.pork.ast.NodeType") + kotlinClass.imports.add("gay.pizza.pork.ast.gen.NodeType") val getReferenceFunction = KotlinFunction( "getReference", @@ -157,7 +157,7 @@ class AstPorkIdeaCodegen(pkg: String, outputDirectory: Path, world: AstWorld) : "com.intellij.extapi.psi.ASTWrapperPsiElement", "com.intellij.lang.ASTNode", "com.intellij.psi.PsiElement", - "gay.pizza.pork.ast.NodeType", + "gay.pizza.pork.ast.gen.NodeType", "gay.pizza.pork.idea.PorkElementTypes" ) ) diff --git a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/CompilationUnitContext.kt b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/CompilationUnitContext.kt index 4f11883..0afdc6d 100644 --- a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/CompilationUnitContext.kt +++ b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/CompilationUnitContext.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.evaluator -import gay.pizza.pork.ast.* +import gay.pizza.pork.ast.gen.* import gay.pizza.pork.frontend.ImportLocator class CompilationUnitContext( diff --git a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt index bb893e2..234aeca 100644 --- a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt +++ b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/EvaluationVisitor.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.evaluator -import gay.pizza.pork.ast.* +import gay.pizza.pork.ast.gen.* import kotlin.math.abs @Suppress("JavaIoSerializableObjectMustHaveReadResolve") diff --git a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/FunctionContext.kt b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/FunctionContext.kt index 46ae929..002e158 100644 --- a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/FunctionContext.kt +++ b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/FunctionContext.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.evaluator -import gay.pizza.pork.ast.FunctionDefinition +import gay.pizza.pork.ast.gen.FunctionDefinition class FunctionContext(val compilationUnitContext: CompilationUnitContext, val node: FunctionDefinition) : CallableFunction { val name: String = "${compilationUnitContext.name} ${node.symbol.id}" diff --git a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/InternalNativeProvider.kt b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/InternalNativeProvider.kt index 4503adc..2d34e0a 100644 --- a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/InternalNativeProvider.kt +++ b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/InternalNativeProvider.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.evaluator -import gay.pizza.pork.ast.ArgumentSpec +import gay.pizza.pork.ast.gen.ArgumentSpec import gay.pizza.pork.common.unused class InternalNativeProvider(val quiet: Boolean = false) : NativeProvider { diff --git a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/NativeProvider.kt b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/NativeProvider.kt index 67000ac..165a218 100644 --- a/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/NativeProvider.kt +++ b/evaluator/src/main/kotlin/gay/pizza/pork/evaluator/NativeProvider.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.evaluator -import gay.pizza.pork.ast.ArgumentSpec +import gay.pizza.pork.ast.gen.ArgumentSpec interface NativeProvider { fun provideNativeFunction(definitions: List, arguments: List): CallableFunction diff --git a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogen.kt b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogen.kt index d7f0b49..f4a27c8 100644 --- a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogen.kt +++ b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogen.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.ffi -import gay.pizza.pork.ast.* +import gay.pizza.pork.ast.gen.* import java.lang.reflect.Method import java.lang.reflect.Modifier import java.lang.reflect.Parameter diff --git a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogenContentSource.kt b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogenContentSource.kt index 2a9d2fc..31888a4 100644 --- a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogenContentSource.kt +++ b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaAutogenContentSource.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.ffi -import gay.pizza.pork.ast.visit +import gay.pizza.pork.ast.gen.visit import gay.pizza.pork.frontend.ContentSource import gay.pizza.pork.parser.CharSource import gay.pizza.pork.parser.Printer diff --git a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaNativeProvider.kt b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaNativeProvider.kt index ba9e461..f226b69 100644 --- a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaNativeProvider.kt +++ b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JavaNativeProvider.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.ffi -import gay.pizza.pork.ast.ArgumentSpec +import gay.pizza.pork.ast.gen.ArgumentSpec import gay.pizza.pork.evaluator.CallableFunction import gay.pizza.pork.evaluator.NativeProvider import gay.pizza.pork.evaluator.None diff --git a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JnaNativeProvider.kt b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JnaNativeProvider.kt index 8413d76..7175ddb 100644 --- a/ffi/src/main/kotlin/gay/pizza/pork/ffi/JnaNativeProvider.kt +++ b/ffi/src/main/kotlin/gay/pizza/pork/ffi/JnaNativeProvider.kt @@ -2,7 +2,7 @@ package gay.pizza.pork.ffi import com.sun.jna.Function import com.sun.jna.NativeLibrary -import gay.pizza.pork.ast.ArgumentSpec +import gay.pizza.pork.ast.gen.ArgumentSpec import gay.pizza.pork.evaluator.CallableFunction import gay.pizza.pork.evaluator.NativeProvider import gay.pizza.pork.evaluator.None diff --git a/frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt b/frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt index b26ba0b..a5354ea 100644 --- a/frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt +++ b/frontend/src/main/kotlin/gay/pizza/pork/frontend/World.kt @@ -1,7 +1,7 @@ package gay.pizza.pork.frontend -import gay.pizza.pork.ast.CompilationUnit -import gay.pizza.pork.ast.ImportDeclaration +import gay.pizza.pork.ast.gen.CompilationUnit +import gay.pizza.pork.ast.gen.ImportDeclaration import gay.pizza.pork.parser.DiscardNodeAttribution import gay.pizza.pork.parser.Parser import gay.pizza.pork.parser.TokenStreamSource diff --git a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/CompilationUnitScope.kt b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/CompilationUnitScope.kt index c71eae4..4aa5f04 100644 --- a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/CompilationUnitScope.kt +++ b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/CompilationUnitScope.kt @@ -1,7 +1,7 @@ package gay.pizza.pork.frontend.scope -import gay.pizza.pork.ast.CompilationUnit -import gay.pizza.pork.ast.Symbol +import gay.pizza.pork.ast.gen.CompilationUnit +import gay.pizza.pork.ast.gen.Symbol class CompilationUnitScope(val worldScope: WorldScope, val unit: CompilationUnit) { val externalSymbols = mutableSetOf() diff --git a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/ScopeSymbol.kt b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/ScopeSymbol.kt index 6a5f462..98a6999 100644 --- a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/ScopeSymbol.kt +++ b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/ScopeSymbol.kt @@ -1,7 +1,7 @@ package gay.pizza.pork.frontend.scope -import gay.pizza.pork.ast.Definition -import gay.pizza.pork.ast.Node +import gay.pizza.pork.ast.gen.Definition +import gay.pizza.pork.ast.gen.Node class ScopeSymbol( val compilationUnit: Node, diff --git a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/VisibleScopeSymbol.kt b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/VisibleScopeSymbol.kt index b4a2fdd..a41976b 100644 --- a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/VisibleScopeSymbol.kt +++ b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/VisibleScopeSymbol.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.frontend.scope -import gay.pizza.pork.ast.CompilationUnit +import gay.pizza.pork.ast.gen.CompilationUnit class VisibleScopeSymbol(val visibleToUnit: CompilationUnit, val scopeSymbol: ScopeSymbol) { val isInternalSymbol: Boolean diff --git a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/WorldScope.kt b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/WorldScope.kt index c993a9f..a42dbec 100644 --- a/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/WorldScope.kt +++ b/frontend/src/main/kotlin/gay/pizza/pork/frontend/scope/WorldScope.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.frontend.scope -import gay.pizza.pork.ast.CompilationUnit +import gay.pizza.pork.ast.gen.CompilationUnit import gay.pizza.pork.frontend.World class WorldScope(val world: World) { diff --git a/minimal/src/main/kotlin/gay/pizza/pork/minimal/Tool.kt b/minimal/src/main/kotlin/gay/pizza/pork/minimal/Tool.kt index f761a8d..309708a 100644 --- a/minimal/src/main/kotlin/gay/pizza/pork/minimal/Tool.kt +++ b/minimal/src/main/kotlin/gay/pizza/pork/minimal/Tool.kt @@ -1,8 +1,8 @@ package gay.pizza.pork.minimal -import gay.pizza.pork.ast.CompilationUnit -import gay.pizza.pork.ast.NodeVisitor -import gay.pizza.pork.ast.visit +import gay.pizza.pork.ast.gen.CompilationUnit +import gay.pizza.pork.ast.gen.NodeVisitor +import gay.pizza.pork.ast.gen.visit import gay.pizza.pork.evaluator.* import gay.pizza.pork.ffi.JavaAutogenContentSource import gay.pizza.pork.ffi.JavaNativeProvider diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/DiscardNodeAttribution.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/DiscardNodeAttribution.kt index 95f0b5e..5cb2d43 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/DiscardNodeAttribution.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/DiscardNodeAttribution.kt @@ -1,7 +1,7 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.Node -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.Node +import gay.pizza.pork.ast.gen.NodeType object DiscardNodeAttribution : NodeAttribution { override fun push(token: Token) {} diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/NodeAttribution.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/NodeAttribution.kt index 878e936..40b411c 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/NodeAttribution.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/NodeAttribution.kt @@ -1,7 +1,7 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.Node -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.Node +import gay.pizza.pork.ast.gen.NodeType interface NodeAttribution { fun push(token: Token) diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt index 31ba638..0e7f99c 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/Parser.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.* +import gay.pizza.pork.ast.gen.* class Parser(source: TokenSource, attribution: NodeAttribution) : ParserBase(source, attribution) { diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserAttributes.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserAttributes.kt index fd490c8..bac5a56 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserAttributes.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserAttributes.kt @@ -1,9 +1,9 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.Node -import gay.pizza.pork.ast.NodeCoalescer -import gay.pizza.pork.ast.data -import gay.pizza.pork.ast.visit +import gay.pizza.pork.ast.gen.Node +import gay.pizza.pork.ast.gen.NodeCoalescer +import gay.pizza.pork.ast.gen.data +import gay.pizza.pork.ast.gen.visit data class ParserAttributes(val tokens: List) { companion object { diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserBase.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserBase.kt index 9ad3909..b51cb64 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserBase.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserBase.kt @@ -1,8 +1,8 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.Node -import gay.pizza.pork.ast.NodeParser -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.Node +import gay.pizza.pork.ast.gen.NodeParser +import gay.pizza.pork.ast.gen.NodeType abstract class ParserBase(source: TokenSource, val attribution: NodeAttribution) : NodeParser { val source: TokenSource = source.ignoringParserIgnoredTypes() diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserHelpers.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserHelpers.kt index e308741..ca28be9 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserHelpers.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserHelpers.kt @@ -1,8 +1,8 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.InfixOperator -import gay.pizza.pork.ast.PrefixOperator -import gay.pizza.pork.ast.SuffixOperator +import gay.pizza.pork.ast.gen.InfixOperator +import gay.pizza.pork.ast.gen.PrefixOperator +import gay.pizza.pork.ast.gen.SuffixOperator internal object ParserHelpers { fun convertInfixOperator(token: Token): InfixOperator = when (token.type) { diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserNodeAttribution.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserNodeAttribution.kt index 8655524..c5cc55e 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserNodeAttribution.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserNodeAttribution.kt @@ -1,8 +1,8 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.Node -import gay.pizza.pork.ast.NodeType -import gay.pizza.pork.ast.data +import gay.pizza.pork.ast.gen.Node +import gay.pizza.pork.ast.gen.NodeType +import gay.pizza.pork.ast.gen.data open class ParserNodeAttribution : NodeAttribution { private val stack = mutableListOf>() diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserStackAnalysis.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserStackAnalysis.kt index 899904e..3770f94 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/ParserStackAnalysis.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/ParserStackAnalysis.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.NodeType class ParserStackAnalysis(private val stack: Array) { constructor(throwable: Throwable) : this(throwable.stackTrace) diff --git a/parser/src/main/kotlin/gay/pizza/pork/parser/Printer.kt b/parser/src/main/kotlin/gay/pizza/pork/parser/Printer.kt index 2eb37a3..83d4e4b 100644 --- a/parser/src/main/kotlin/gay/pizza/pork/parser/Printer.kt +++ b/parser/src/main/kotlin/gay/pizza/pork/parser/Printer.kt @@ -1,6 +1,6 @@ package gay.pizza.pork.parser -import gay.pizza.pork.ast.* +import gay.pizza.pork.ast.gen.* import gay.pizza.pork.common.IndentPrinter class Printer(buffer: StringBuilder) : NodeVisitor { diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkDeclarationSymbol.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkDeclarationSymbol.kt index 758e481..b9407b4 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkDeclarationSymbol.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkDeclarationSymbol.kt @@ -2,17 +2,11 @@ package gay.pizza.pork.idea import com.intellij.model.Pointer import com.intellij.model.Symbol -import com.intellij.navigation.ItemPresentation import com.intellij.navigation.NavigatableSymbol -import com.intellij.navigation.PsiElementNavigationItem import com.intellij.openapi.project.Project import com.intellij.platform.backend.navigation.NavigationRequest -import com.intellij.platform.backend.navigation.NavigationRequests import com.intellij.platform.backend.navigation.NavigationTarget import com.intellij.platform.backend.presentation.TargetPresentation -import com.intellij.psi.PsiElement -import gay.pizza.pork.idea.psi.PorkElementHelpers -import gay.pizza.pork.idea.psi.PorkReferencable import gay.pizza.pork.idea.psi.gen.PorkElement @Suppress("UnstableApiUsage") diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt index 8341c19..98c3e9a 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkElementTypes.kt @@ -2,7 +2,7 @@ package gay.pizza.pork.idea import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.TokenSet -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.NodeType import gay.pizza.pork.parser.TokenType object PorkElementTypes { diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt index 0d14c6c..4b9f7eb 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PorkParser.kt @@ -5,8 +5,8 @@ import com.intellij.lang.PsiBuilder import com.intellij.lang.PsiParser import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.IFileElementType -import gay.pizza.pork.ast.NodeType -import gay.pizza.pork.ast.parse +import gay.pizza.pork.ast.gen.NodeType +import gay.pizza.pork.ast.gen.parse import gay.pizza.pork.parser.Parser class PorkParser : PsiParser { diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt index 75dce1a..097187d 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/PsiBuilderMarkAttribution.kt @@ -1,8 +1,8 @@ package gay.pizza.pork.idea import com.intellij.lang.PsiBuilder -import gay.pizza.pork.ast.Node -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.Node +import gay.pizza.pork.ast.gen.NodeType import gay.pizza.pork.parser.ParseError import gay.pizza.pork.parser.ParserNodeAttribution diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkElementHelpers.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkElementHelpers.kt index 895b051..8beb1d9 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkElementHelpers.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkElementHelpers.kt @@ -10,7 +10,7 @@ import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.childrenOfType import com.intellij.util.PlatformIcons -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.NodeType import gay.pizza.pork.common.unused import gay.pizza.pork.idea.PorkDeclarationSymbol import gay.pizza.pork.idea.PorkElementTypes diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkReference.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkReference.kt index 130b242..c11620c 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkReference.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/PorkReference.kt @@ -2,15 +2,8 @@ package gay.pizza.pork.idea.psi import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.psi.PsiFile -import com.intellij.psi.PsiManager import com.intellij.psi.PsiReferenceBase -import com.intellij.psi.search.FilenameIndex -import com.intellij.psi.util.PsiTreeUtil -import com.intellij.psi.util.childrenOfType -import gay.pizza.pork.idea.psi.gen.ImportDeclarationElement import gay.pizza.pork.idea.psi.gen.PorkElement -import gay.pizza.pork.idea.psi.gen.SymbolElement abstract class PorkReference(element: PorkElement, textRange: TextRange) : PsiReferenceBase(element, textRange), PorkReferencable { override val internalPorkElement: PorkElement = element diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/FunctionCallElement.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/FunctionCallElement.kt index 71022c2..b700bbc 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/FunctionCallElement.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/FunctionCallElement.kt @@ -4,7 +4,7 @@ package gay.pizza.pork.idea.psi.gen import com.intellij.lang.ASTNode import com.intellij.navigation.ItemPresentation import com.intellij.psi.PsiReference -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.NodeType import gay.pizza.pork.idea.psi.PorkElementHelpers import javax.swing.Icon diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/PorkElementFactory.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/PorkElementFactory.kt index 89a09ba..12693cf 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/PorkElementFactory.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/PorkElementFactory.kt @@ -4,7 +4,7 @@ package gay.pizza.pork.idea.psi.gen import com.intellij.extapi.psi.ASTWrapperPsiElement import com.intellij.lang.ASTNode import com.intellij.psi.PsiElement -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.NodeType import gay.pizza.pork.idea.PorkElementTypes object PorkElementFactory { diff --git a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/SymbolReferenceElement.kt b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/SymbolReferenceElement.kt index df72050..b8b5bbc 100644 --- a/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/SymbolReferenceElement.kt +++ b/support/pork-idea/src/main/kotlin/gay/pizza/pork/idea/psi/gen/SymbolReferenceElement.kt @@ -5,7 +5,7 @@ import com.intellij.lang.ASTNode import com.intellij.navigation.ItemPresentation import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference -import gay.pizza.pork.ast.NodeType +import gay.pizza.pork.ast.gen.NodeType import gay.pizza.pork.idea.psi.PorkElementHelpers import javax.swing.Icon diff --git a/tool/src/main/kotlin/gay/pizza/pork/tool/AstCommand.kt b/tool/src/main/kotlin/gay/pizza/pork/tool/AstCommand.kt index 1b547ae..b1c7f5f 100644 --- a/tool/src/main/kotlin/gay/pizza/pork/tool/AstCommand.kt +++ b/tool/src/main/kotlin/gay/pizza/pork/tool/AstCommand.kt @@ -3,7 +3,7 @@ package gay.pizza.pork.tool import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.arguments.argument import gay.pizza.dough.fs.PlatformFsProvider -import gay.pizza.pork.ast.Node +import gay.pizza.pork.ast.gen.Node import gay.pizza.pork.minimal.FileTool import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json diff --git a/tool/src/main/kotlin/gay/pizza/pork/tool/AttributeCommand.kt b/tool/src/main/kotlin/gay/pizza/pork/tool/AttributeCommand.kt index f145f75..06db208 100644 --- a/tool/src/main/kotlin/gay/pizza/pork/tool/AttributeCommand.kt +++ b/tool/src/main/kotlin/gay/pizza/pork/tool/AttributeCommand.kt @@ -3,8 +3,8 @@ package gay.pizza.pork.tool import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.arguments.argument import gay.pizza.dough.fs.PlatformFsProvider -import gay.pizza.pork.ast.NodeCoalescer -import gay.pizza.pork.ast.visit +import gay.pizza.pork.ast.gen.NodeCoalescer +import gay.pizza.pork.ast.gen.visit import gay.pizza.pork.minimal.FileTool import gay.pizza.pork.parser.ParserAttributes import gay.pizza.pork.parser.ParserNodeAttribution