Skip to content

Fix/var end position - #13

Open
partouf wants to merge 2 commits into
jimmckeeth:mainfrom
GDKsoftware:fix/var-end-position
Open

Fix/var end position#13
partouf wants to merge 2 commits into
jimmckeeth:mainfrom
GDKsoftware:fix/var-end-position

Conversation

@partouf

@partouf partouf commented Aug 31, 2026

Copy link
Copy Markdown

No description provided.

Patrick Quist and others added 2 commits August 31, 2026 17:30
A constant declaration produced a node with no end position at all, so a
consumer working in line ranges could not tell how far the declaration
reached. That silently truncates any constant whose value spans lines:

  const
    Banner = 'first part ' +
             'second part';

reported only the first line, and a tool slicing that range dropped the
continuation.

ntConstant was built with FStack.Push, so it was a plain TSyntaxNode with
nowhere to record an end. Two changes are needed, because the node the
caller finally sees is not the node that was parsed:

  ConstantDeclaration now pushes a compound node and records its end, the
  same way TypeDeclaration already does. This gives the intermediate
  ConstList an accurate extent.

  ConstSection rebuilds each constant from that ConstList, so it also has
  to push a compound node and inherit the end from it. The start still
  comes from the name, which is what a caller looking for the constant
  expects; only the end is new.

TCompoundSyntaxNode.AssignEndPositionFrom is the counterpart to the
existing AssignPositionFrom, for exactly this rebuild case.

Single-line constants keep ending on their own line - the new test asserts
both directions, since an end that ran on to the next declaration would be
no more useful than one that stopped short.

Verified against the existing suite: 42 passing, with the one pre-existing
Serialization.BinaryRoundTrip failure unchanged (line_seq holds a pointer
value that does not survive a round trip, unrelated to this change).

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Same gap as the previous commit, same shape of fix. A variable declaration
produced a node positioned at its name with no end at all, so a declaration
whose type or initialiser spans lines reported only its first line:

  var
    Grid: array[0..1] of
      Integer;

VarDeclaration pushed ntVariables with FStack.Push, so the VarList that
RearrangeVarSection rebuilds each variable from had no extent to pass on.
Both now push compound nodes, and the rebuilt ntVariable inherits the end
via AssignEndPositionFrom - the second caller for the helper added in the
previous commit, which is the pattern it exists for.

The compound ntVariables nodes are the throwaway VarSect children that
VarSection frees, so the output footprint matches the constant change
exactly: VARIABLE gains begin/end, and the VARIABLES section node that
reaches the tree is untouched.

Names sharing one line (`A, B: Integer;`) each get the declaration's extent,
which is the whole declaration they share.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant