[PR #957] [MERGED] fix calculation of spans in parser #827

New Issue

adam · 2025-12-30T01:27:03+01:00

adam commented

2025-12-30 01:27:03 +01:00

📋 Pull Request Information

Original PR: https://github.com/apple/pkl/pull/957
Author: @stackoverflow
Created: 2/14/2025
Status: ✅ Merged
Merged: 2/15/2025
Merged by: @stackoverflow

Base: main ← Head: fix-spans

📝 Commits (2)

3357ae2 fix calculation of spans in parser
88e4c5e fix suppressions in parser ast

📊 Changes

30 files changed (+996 additions, -183 deletions)

View changed files

📝 pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java (+9 -8)
📝 pkl-core/src/main/java/org/pkl/core/parser/BaseParserVisitor.java (+12 -0)
📝 pkl-core/src/main/java/org/pkl/core/parser/Parser.java (+59 -31)
📝 pkl-core/src/main/java/org/pkl/core/parser/ParserVisitor.java (+6 -0)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ArgumentList.java (+1 -1)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/Class.java (+35 -11)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ClassMethod.java (+2 -1)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ClassProperty.java (+4 -2)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/Expr.java (+75 -34)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ImportClause.java (+3 -2)
➕ pkl-core/src/main/java/org/pkl/core/parser/ast/Keyword.java (+31 -0)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/Modifier.java (+1 -2)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/Module.java (+7 -2)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ModuleDecl.java (+25 -10)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectBody.java (+5 -3)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectMember.java (+68 -22)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/Parameter.java (+2 -1)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/ParameterList.java (+1 -1)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/QualifiedIdentifier.java (+3 -3)
📝 pkl-core/src/main/java/org/pkl/core/parser/ast/StringConstantPart.java (+3 -1)

...and 10 more files

📄 Description

Fix many span calculations that were wrong. Also adds a test that compares spans between the old ANTLR parser and the current one.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/apple/pkl/pull/957 **Author:** [@stackoverflow](https://github.com/stackoverflow) **Created:** 2/14/2025 **Status:** ✅ Merged **Merged:** 2/15/2025 **Merged by:** [@stackoverflow](https://github.com/stackoverflow) **Base:** `main` ← **Head:** `fix-spans` --- ### 📝 Commits (2) - [`3357ae2`](https://github.com/apple/pkl/commit/3357ae22149e13b2a9cb2bf54c2154ff70275045) fix calculation of spans in parser - [`88e4c5e`](https://github.com/apple/pkl/commit/88e4c5e9805527246b6713e1519ce75627df38e0) fix suppressions in parser ast ### 📊 Changes **30 files changed** (+996 additions, -183 deletions) <details> <summary>View changed files</summary> 📝 `pkl-core/src/main/java/org/pkl/core/ast/builder/AstBuilder.java` (+9 -8) 📝 `pkl-core/src/main/java/org/pkl/core/parser/BaseParserVisitor.java` (+12 -0) 📝 `pkl-core/src/main/java/org/pkl/core/parser/Parser.java` (+59 -31) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ParserVisitor.java` (+6 -0) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ArgumentList.java` (+1 -1) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/Class.java` (+35 -11) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ClassMethod.java` (+2 -1) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ClassProperty.java` (+4 -2) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/Expr.java` (+75 -34) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ImportClause.java` (+3 -2) ➕ `pkl-core/src/main/java/org/pkl/core/parser/ast/Keyword.java` (+31 -0) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/Modifier.java` (+1 -2) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/Module.java` (+7 -2) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ModuleDecl.java` (+25 -10) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectBody.java` (+5 -3) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ObjectMember.java` (+68 -22) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/Parameter.java` (+2 -1) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/ParameterList.java` (+1 -1) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/QualifiedIdentifier.java` (+3 -3) 📝 `pkl-core/src/main/java/org/pkl/core/parser/ast/StringConstantPart.java` (+3 -1) _...and 10 more files_ </details> ### 📄 Description Fix many span calculations that were wrong. Also adds a test that compares spans between the old ANTLR parser and the current one. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

adam added the pull-request label 2025-12-30 01:27:03 +01:00

adam closed this issue

2025-12-30 01:27:03 +01:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/pkl#827