jaredj/glotawk - Change O7MMDJ7C6BS4MO7P6BU4EZAQTLSEPZDXZQAYRZS5RQSTTFZCGEZAC

improve parse errors: when loading, show file and line in loaded file, not toplevel file; when a (defun is unterminated, show the next token too, like (defun foo

Created by jaredj on September 17, 2025

O7MMDJ7C6BS4MO7P6BU4EZAQTLSEPZDXZQAYRZS5RQSTTFZCGEZAC

Dependencies

In channels

main

Change contents

Insertion in reader.awk at line 14 [4.4015]

[3.1597]

    delete _LOADING_FILENAME[0]
    delete _LOADING_LINE[0]

Insertion in reader.awk at line 24 [4.4015]

[5.1446]

[2.903]

function _where(      llf) {
    llf = length(_LOADING_FILENAME)
    if(llf)
        return _LOADING_FILENAME[llf] \
               ":" _LOADING_LINE[llf]
    else if(!FILENAME || FILENAME == "-")
        return ("-:" FNR)
    else
        return (FILENAME ":" FNR)
}

Replacement in reader.awk at line 39 [4.4015]
B:BD[2.994] → [2.994:1026]
```
    where[n] = FILENAME ":" FNR
```
[2.994]
[5.1588]
```
    where[n] = _where()
```

Replacement in reader.awk at line 125 [4.4015]

B:BD[4.5206] → [5.5005:5198]

B:BD[5.5198] → [2.2405:2471]

∅:D[2.2471] → [5.5236:5464]

B:BD[5.5236] → [5.5236:5464]

            if(!FILENAME || FILENAME == "-") {
                logg_err("tokz", "at char " chars_done ": "\
                         "token not matched: " input)
                chars_left = 0
                _forget_parse_state(tokens, where, inside_string)
            } else {
                logg_err("tokz", " " FILENAME ":" FNR ": " \
                         "at char " chars_done ": " \
                         "token not matched: " input)
                exit(1)
            }

[4.5206]

[4.5307]

            logg_err("tokz", _where() ": at char " chars_done ": "      \
                     "token not matched: " input)
            chars_left = 0
            _forget_parse_state(tokens, where, inside_string)

Replacement in reader.awk at line 333 [4.4015]

B:BD[4.7769] → [2.3989:4090]

function _incomplete_parse_at_end(tokens, where, inside_string,     i, l, nesting_level, unclosed) {

[4.7769]

[5.10570]

function _incomplete_parse_at_end(tokens, where, inside_string,     i, l, nesting_level, unclosed, in_list) {

Insertion in reader.awk at line 350 [4.4015]

[5.11094]

                in_list = tokens[unclosed[i]+1]
                # if it's a defsomething, what were we defining?
                if(tokens[unclosed[i]+1] ~ /^def/)
                    in_list = in_list " " tokens[unclosed[i]+2]

Replacement in reader.awk at line 355 [4.4015]

B:BD[5.11147] → [2.4290:4361]

                         "still inside list (" tokens[unclosed[i]+1] \

[5.11147]

[2.4361]

                         "still inside list (" in_list \

Replacement in io.awk at line 309 [6.9773]

B:BD[2.4860] → [2.4860:4938]

function _load(fn,       my_tokens, my_where, my_inside_string, my_to_eval) {

[2.4860]

[2.4938]

function _load(fn,       my_tokens, my_where, my_inside_string, my_to_eval, lsi) {

Insertion in io.awk at line 315 [6.9773]

[2.5042]

    lsi = length(_LOADING_FILENAME)+1
    _LOADING_FILENAME[lsi] = _STRING[fn]
    _LOADING_LINE[lsi] = 1

Insertion in io.awk at line 326 [6.9773]
[2.5486]
[2.5486]
```
            _LOADING_LINE[lsi] += 1
```

Insertion in io.awk at line 330 [6.9773]

[2.5586]

        # lsi will always be the top of this stack: if we load file A
        # which loads file B, we will finish with file B before we
        # finish with file A. so we will not create a hole in the
        # array.
        delete _LOADING_FILENAME[lsi]
        delete _LOADING_LINE[lsi]