Rename package ast to syntax (#968)

This commit is contained in:
Daniel Chao
2025-02-19 10:57:41 -08:00
committed by GitHub
parent baa34a6dd1
commit 227f0637fc
48 changed files with 396 additions and 396 deletions

View File

@@ -15,27 +15,27 @@
*/
package org.pkl.core.parser
import org.pkl.core.parser.ast.*
import org.pkl.core.parser.ast.Annotation
import org.pkl.core.parser.ast.Expr.*
import org.pkl.core.parser.ast.Expr.ModuleExpr
import org.pkl.core.parser.ast.ObjectMember.*
import org.pkl.core.parser.ast.Parameter.TypedIdentifier
import org.pkl.core.parser.ast.Type.*
import org.pkl.core.parser.syntax.*
import org.pkl.core.parser.syntax.Annotation
import org.pkl.core.parser.syntax.Expr.*
import org.pkl.core.parser.syntax.Expr.ModuleExpr
import org.pkl.core.parser.syntax.ObjectMember.*
import org.pkl.core.parser.syntax.Parameter.TypedIdentifier
import org.pkl.core.parser.syntax.Type.*
@Suppress("MemberVisibilityCanBePrivate")
class SexpRenderer {
private var tab = ""
private var buf = StringBuilder()
fun render(mod: org.pkl.core.parser.ast.Module): String {
fun render(mod: org.pkl.core.parser.syntax.Module): String {
renderModule(mod)
val res = buf.toString()
reset()
return res
}
fun renderModule(mod: org.pkl.core.parser.ast.Module) {
fun renderModule(mod: org.pkl.core.parser.syntax.Module) {
buf.append(tab)
buf.append("(module")
val oldTab = increaseTab()
@@ -1055,7 +1055,7 @@ class SexpRenderer {
}
companion object {
private fun sortModuleEntries(mod: org.pkl.core.parser.ast.Module): List<Node> {
private fun sortModuleEntries(mod: org.pkl.core.parser.syntax.Module): List<Node> {
val res = mutableListOf<Node>()
res += mod.classes
res += mod.typeAliases

View File

@@ -19,47 +19,47 @@ import org.antlr.v4.runtime.ParserRuleContext
import org.antlr.v4.runtime.tree.TerminalNode
import org.assertj.core.api.SoftAssertions
import org.pkl.core.parser.antlr.PklParser.*
import org.pkl.core.parser.ast.*
import org.pkl.core.parser.ast.Annotation
import org.pkl.core.parser.ast.Expr.AmendsExpr
import org.pkl.core.parser.ast.Expr.BinaryOperatorExpr
import org.pkl.core.parser.ast.Expr.FunctionLiteralExpr
import org.pkl.core.parser.ast.Expr.IfExpr
import org.pkl.core.parser.ast.Expr.ImportExpr
import org.pkl.core.parser.ast.Expr.LetExpr
import org.pkl.core.parser.ast.Expr.LogicalNotExpr
import org.pkl.core.parser.ast.Expr.MultiLineStringLiteralExpr
import org.pkl.core.parser.ast.Expr.NewExpr
import org.pkl.core.parser.ast.Expr.NonNullExpr
import org.pkl.core.parser.ast.Expr.ParenthesizedExpr
import org.pkl.core.parser.ast.Expr.QualifiedAccessExpr
import org.pkl.core.parser.ast.Expr.ReadExpr
import org.pkl.core.parser.ast.Expr.SingleLineStringLiteralExpr
import org.pkl.core.parser.ast.Expr.SubscriptExpr
import org.pkl.core.parser.ast.Expr.SuperAccessExpr
import org.pkl.core.parser.ast.Expr.SuperSubscriptExpr
import org.pkl.core.parser.ast.Expr.ThrowExpr
import org.pkl.core.parser.ast.Expr.TraceExpr
import org.pkl.core.parser.ast.Expr.TypeCastExpr
import org.pkl.core.parser.ast.Expr.TypeCheckExpr
import org.pkl.core.parser.ast.Expr.UnaryMinusExpr
import org.pkl.core.parser.ast.Expr.UnqualifiedAccessExpr
import org.pkl.core.parser.ast.ObjectMember.ForGenerator
import org.pkl.core.parser.ast.ObjectMember.MemberPredicate
import org.pkl.core.parser.ast.ObjectMember.ObjectElement
import org.pkl.core.parser.ast.ObjectMember.ObjectEntry
import org.pkl.core.parser.ast.ObjectMember.ObjectMethod
import org.pkl.core.parser.ast.ObjectMember.ObjectProperty
import org.pkl.core.parser.ast.ObjectMember.ObjectSpread
import org.pkl.core.parser.ast.ObjectMember.WhenGenerator
import org.pkl.core.parser.ast.Parameter.TypedIdentifier
import org.pkl.core.parser.ast.Type.ConstrainedType
import org.pkl.core.parser.ast.Type.DeclaredType
import org.pkl.core.parser.ast.Type.FunctionType
import org.pkl.core.parser.ast.Type.NullableType
import org.pkl.core.parser.ast.Type.ParenthesizedType
import org.pkl.core.parser.ast.Type.StringConstantType
import org.pkl.core.parser.ast.Type.UnionType
import org.pkl.core.parser.syntax.*
import org.pkl.core.parser.syntax.Annotation
import org.pkl.core.parser.syntax.Expr.AmendsExpr
import org.pkl.core.parser.syntax.Expr.BinaryOperatorExpr
import org.pkl.core.parser.syntax.Expr.FunctionLiteralExpr
import org.pkl.core.parser.syntax.Expr.IfExpr
import org.pkl.core.parser.syntax.Expr.ImportExpr
import org.pkl.core.parser.syntax.Expr.LetExpr
import org.pkl.core.parser.syntax.Expr.LogicalNotExpr
import org.pkl.core.parser.syntax.Expr.MultiLineStringLiteralExpr
import org.pkl.core.parser.syntax.Expr.NewExpr
import org.pkl.core.parser.syntax.Expr.NonNullExpr
import org.pkl.core.parser.syntax.Expr.ParenthesizedExpr
import org.pkl.core.parser.syntax.Expr.QualifiedAccessExpr
import org.pkl.core.parser.syntax.Expr.ReadExpr
import org.pkl.core.parser.syntax.Expr.SingleLineStringLiteralExpr
import org.pkl.core.parser.syntax.Expr.SubscriptExpr
import org.pkl.core.parser.syntax.Expr.SuperAccessExpr
import org.pkl.core.parser.syntax.Expr.SuperSubscriptExpr
import org.pkl.core.parser.syntax.Expr.ThrowExpr
import org.pkl.core.parser.syntax.Expr.TraceExpr
import org.pkl.core.parser.syntax.Expr.TypeCastExpr
import org.pkl.core.parser.syntax.Expr.TypeCheckExpr
import org.pkl.core.parser.syntax.Expr.UnaryMinusExpr
import org.pkl.core.parser.syntax.Expr.UnqualifiedAccessExpr
import org.pkl.core.parser.syntax.ObjectMember.ForGenerator
import org.pkl.core.parser.syntax.ObjectMember.MemberPredicate
import org.pkl.core.parser.syntax.ObjectMember.ObjectElement
import org.pkl.core.parser.syntax.ObjectMember.ObjectEntry
import org.pkl.core.parser.syntax.ObjectMember.ObjectMethod
import org.pkl.core.parser.syntax.ObjectMember.ObjectProperty
import org.pkl.core.parser.syntax.ObjectMember.ObjectSpread
import org.pkl.core.parser.syntax.ObjectMember.WhenGenerator
import org.pkl.core.parser.syntax.Parameter.TypedIdentifier
import org.pkl.core.parser.syntax.Type.ConstrainedType
import org.pkl.core.parser.syntax.Type.DeclaredType
import org.pkl.core.parser.syntax.Type.FunctionType
import org.pkl.core.parser.syntax.Type.NullableType
import org.pkl.core.parser.syntax.Type.ParenthesizedType
import org.pkl.core.parser.syntax.Type.StringConstantType
import org.pkl.core.parser.syntax.Type.UnionType
class SpanComparison(val path: String, private val softly: SoftAssertions) {