Repository navigation
fix: bug fixes for UDL keywords - #62
Merged
hkimura-intersys merged 3 commits intoOct 9, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR includes a bump to version 1.10.2, which has bug fixes for a few class keywords and scanner changes.
Grammar
GeneratedBy: split out of_class_single_class_keywordinto its own rule.It accepts a class name as before, or a new
generated_by_pathtoken forsource file paths (
/path/AutoPage.csr,C:\path\AutoPage.csr). The pathmust contain a
/or\, so it doesn't compete with class names.sql_field_reference: accepts a numeric field, e.g.{1}(expr/grammar.js).Language = cpp: accepted as an external method/trigger language.CallMethod: the body may be a method call (_method_call) as well as aroutine_tag_call(udl/grammar.js).#definemacro values (core/grammar.js):#define F(%a)(%a+1).##continueline may start in column 0, so labels and#;comments work in multi-line macros. The tree shape is unchanged
(
macro_value,macro_value_line_with_continue,macro_value_line).Scanner (
common/scanner.h)Set {*}/Set {Name}: one space followed by{now starts a commandargument, unless an argumentless loop is valid there. Before this,
sql_field_referencecouldn't be the firstSettarget.##continuelines: may start in column 0 when continuing a macro. Thescanner tells this apart from the first value line because
_STATEMENT_TERMINATIONisn't valid on a continued line.<SCRIPT>in embedded HTML: the<scriptand</script>checks inlex_fenced_textignore case. Before this,</SCRIPT>was never matched andthe rest of the class was swallowed as script text.
Tests
class-keywords.txt(udl, objectscript):GeneratedBywith a class name, aUnix path and a Windows path.
pound-define.txt(core, objectscript, objectscript_routine): value rightafter args, a label as the last continued line, a label on a middle line, and
a column-0
#;comment line.properties.txt(udl, objectscript): expected trees updated for the newSqlComputeCodeshape.