Skip to content

fix: Update InitialExpression Keyword and Nested Dotted Block Parsing #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hkimura-intersys merged 4 commits into from
Aug 21, 2026
Merged

fix: Update InitialExpression Keyword and Nested Dotted Block Parsing #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
972eae1
fix: allow number initialexpression
hkimura-intersys Aug 21, 2026
e5e33cb
update bindings
hkimura-intersys Aug 21, 2026
86aaaeb
fix: npm version upgrade
hkimura-intersys Aug 21, 2026
d539b30
fix: parse nested dotted do statements inside do blocks
hkimura-intersys Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 26 additions & 14 deletions bindings/python/tree_sitter_objectscript/queries/injections.scm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions bindings/python/tree_sitter_objectscript_routine/queries/injections.scm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions bindings/python/tree_sitter_objectscript_udl/queries/injections.scm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/rust-playground/Cargo.toml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/rust-routine/Cargo.toml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/common.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $(error Windows is not supported)
endif

HOMEPAGE_URL := https://github.com/intersystems/tree-sitter-objectscript
VERSION := 1.9.14
VERSION := 1.9.16

# repository
SRC_DIR := src
Expand Down
1 change: 1 addition & 0 deletions common/keywords.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ module.exports = {
seq('{', $.expression, '}'),
alias($.string_literal, $.typename),
alias($._base_variable, $.typename),
alias($.numeric_literal, $.typename),
),
),
seq(/SqlColumnNumber/i, '=', $.numeric_literal),
Expand Down
28 changes: 25 additions & 3 deletions common/scanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@ struct ObjectScript_Core_Scanner {
int32_t js_marker_buffer_reversed[MARKER_BUFFER_MAX_LEN];
int js_marker_buffer_reversed_len;
bool is_rtn_dot;
// Allows nested old-style commands to close before the same `. }` line
// is emitted as a dotted block end.
bool pending_dotted_block_end;
};

static inline bool is_label_char(int32_t c) {
Expand Down Expand Up @@ -542,6 +545,15 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
if (valid_symbols[SENTINEL]) {
return false;
}

if (scanner->pending_dotted_block_end) {
if (lexer->lookahead == '.' && valid_symbols[_TERMINATION]) {
lexer->mark_end(lexer);
lexer->result_symbol = _TERMINATION;
return true;
}
scanner->pending_dotted_block_end = false;
}
scanner-> is_rtn_dot = false;

// this parses any line that ends in ##continue for
Expand Down Expand Up @@ -1099,11 +1111,18 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
advance(lexer);
}
if (lexer->lookahead == '}') {
if (valid_symbols[_TERMINATION]) {
scanner->pending_dotted_block_end = true;
lexer->result_symbol = _TERMINATION;
return true;
}
lexer->result_symbol = _BOL_BLOCK;
scanner->pending_dotted_block_end = false;
scanner->terminated_newline = false;
return true;
}
lexer->result_symbol = _BOL;
scanner->pending_dotted_block_end = false;
scanner->terminated_newline = false;
return true;
}
Expand All @@ -1112,9 +1131,10 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
while (lexer->lookahead == ' ' || lexer->lookahead == '\t') advance(lexer);

if (lexer->lookahead == '.') {
lexer->result_symbol = _BOL;
scanner->terminated_newline = false;
return true;
lexer->result_symbol = _BOL;
scanner->pending_dotted_block_end = false;
scanner->terminated_newline = false;
return true;
}
else {
lexer->mark_end(lexer);
Expand Down Expand Up @@ -1342,6 +1362,7 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
}
lexer->mark_end(lexer);
lexer->result_symbol = BOL_EXTRA;
scanner->pending_dotted_block_end = false;
scanner->terminated_newline = false;
return true;
}
Expand All @@ -1361,4 +1382,5 @@ static void ObjectScript_Core_Scanner_init(struct ObjectScript_Core_Scanner *sca
scanner->special_pound_if_mode = false;
scanner->special_pound_if_mode_if_depth = 0;
scanner->is_rtn_dot = false;
scanner->pending_dotted_block_end = false;
}
Loading
Loading