[Emc-commit] [LinuxCNC/linuxcnc] 5b86d5: Error on nested subroutine definitions in named su...

[andypugh <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/LinuxCNC/linuxcnc
  Commit: 5b86d5a80c5a71a1757cc2b3635acbab50207f72
      https://github.com/LinuxCNC/linuxcnc/commit/5b86d5a80c5a71a1757cc2b3635acbab50207f72
  Author: Luca Toniolo <lu...@ai...>
  Date:   2026-03-30 (Mon, 30 Mar 2026)

  Changed paths:
    M docs/src/gcode/o-code.adoc
    M src/emc/rs274ngc/interp_o_word.cc
    M src/emc/rs274ngc/interp_read.cc
    A tests/interp/nested-sub-error/expected
    A tests/interp/nested-sub-error/subs/nested.ngc
    A tests/interp/nested-sub-error/test.ini
    A tests/interp/nested-sub-error/test.ngc
    A tests/interp/nested-sub-error/test.sh
    A tests/interp/nested-sub-in-file-error/expected
    A tests/interp/nested-sub-in-file-error/subs/sequential.ngc
    A tests/interp/nested-sub-in-file-error/test.ini
    A tests/interp/nested-sub-in-file-error/test.ngc
    A tests/interp/nested-sub-in-file-error/test.sh
    A tests/interp/sub-call-from-sub/expected
    A tests/interp/sub-call-from-sub/subs/caller.ngc
    A tests/interp/sub-call-from-sub/subs/helper.ngc
    A tests/interp/sub-call-from-sub/test.ini
    A tests/interp/sub-call-from-sub/test.ngc
    A tests/interp/sub-call-from-sub/test.sh

  Log Message:
  -----------
  Error on nested subroutine definitions in named sub files

The parser silently ignored sub definitions inside called subroutines,
causing wrong parameters and premature returns. Numbered subs after a
named endsub polluted the global offset map and conflicted across files.

- Add nesting checks in read and execute phases at call_level > 0
- Block forward-seek for subs at call_level > 0 when no file exists
- Let control_back_to errors propagate without generic overwrite
- Update o-code docs with nesting example and new error conditions

Ref: LinuxCNC/linuxcnc#3880


  Commit: 69b1f80d8f4163d415786e2e606191020b66710a
      https://github.com/LinuxCNC/linuxcnc/commit/69b1f80d8f4163d415786e2e606191020b66710a
  Author: andypugh <an...@bo...>
  Date:   2026-03-30 (Mon, 30 Mar 2026)

  Changed paths:
    M docs/src/gcode/o-code.adoc
    M src/emc/rs274ngc/interp_o_word.cc
    M src/emc/rs274ngc/interp_read.cc
    A tests/interp/nested-sub-error/expected
    A tests/interp/nested-sub-error/subs/nested.ngc
    A tests/interp/nested-sub-error/test.ini
    A tests/interp/nested-sub-error/test.ngc
    A tests/interp/nested-sub-error/test.sh
    A tests/interp/nested-sub-in-file-error/expected
    A tests/interp/nested-sub-in-file-error/subs/sequential.ngc
    A tests/interp/nested-sub-in-file-error/test.ini
    A tests/interp/nested-sub-in-file-error/test.ngc
    A tests/interp/nested-sub-in-file-error/test.sh
    A tests/interp/sub-call-from-sub/expected
    A tests/interp/sub-call-from-sub/subs/caller.ngc
    A tests/interp/sub-call-from-sub/subs/helper.ngc
    A tests/interp/sub-call-from-sub/test.ini
    A tests/interp/sub-call-from-sub/test.ngc
    A tests/interp/sub-call-from-sub/test.sh

  Log Message:
  -----------
  Merge pull request #3886 from grandixximo/issue-3880-fix

Detect and error on nested/invalid subroutine definitions in named subs


Compare: https://github.com/LinuxCNC/linuxcnc/compare/c9e5894e82a1...69b1f80d8f41

To unsubscribe from these emails, change your notification settings at https://github.com/LinuxCNC/linuxcnc/settings/notifications