Skip to content

chore(vendor): vendor the InterSystems ObjectScript tree-sitter grammars#590

Merged
DeusData merged 1 commit into
mainfrom
vendor/objectscript-grammar
Jun 23, 2026
Merged

chore(vendor): vendor the InterSystems ObjectScript tree-sitter grammars#590
DeusData merged 1 commit into
mainfrom
vendor/objectscript-grammar

Conversation

@DeusData

Copy link
Copy Markdown
Owner

What does this PR do?

Vendors the two MIT-licensed InterSystems ObjectScript tree-sitter grammars that #467 needs, as its own focused, auditable supply-chain commit:

  • internal/cbm/vendored/grammars/objectscript_udl/.cls
  • internal/cbm/vendored/grammars/objectscript_routine/.mac / .inc / .rtn / .int

Source: intersystems/tree-sitter-objectscript @ a7ffcdf — MIT, the language vendor's official grammars, ABI 15 (at the runtime ceiling).

Vendoring details

  • Verbatim generated parser.c + scanner.c + tree_sitter/ headers + upstream LICENSE in each directory.
  • One adjustment: each scanner.c's upstream #include "../../common/scanner.h" is repointed to a per-directory objectscript_common.h (a verbatim copy of upstream common/scanner.h) — this repo's shared vendored/common/scanner.h belongs to the cfml/fsharp grammars and differs. Recorded in MANIFEST.md for future re-vendors.
  • MANIFEST.md + THIRD_PARTY.md updated (provenance, pinned commit, license, counts). The SBOM is a release-time artifact, regenerated at build.

Why it's build-neutral on main

Nothing on main #includes these yet — the grammar shims and extraction live in #467. So this PR doesn't change the build on main; once it lands, #467 rebases on top and its shims (grammar_objectscript_{udl,routine}.c) link the parsers.

Refs #462, #467.

Vendors the two MIT-licensed grammars from intersystems/tree-sitter-objectscript
@a7ffcdf (the language vendor's official grammars, ABI 15) that PR #467 needs:

  internal/cbm/vendored/grammars/objectscript_udl/      (.cls)
  internal/cbm/vendored/grammars/objectscript_routine/  (.mac/.inc/.rtn/.int)

Each directory carries the verbatim generated parser.c + scanner.c + tree_sitter/
headers + LICENSE. The one adjustment: each scanner.c's upstream
`#include "../../common/scanner.h"` is repointed to a per-directory
`objectscript_common.h` (a verbatim copy of the upstream common/scanner.h), because
this repo's shared vendored/common/scanner.h belongs to the cfml/fsharp grammars and
differs. Updates MANIFEST.md + THIRD_PARTY.md.

These files are dormant until #467 (the grammar shims + extraction) is rebased on
top; main's build is unaffected.

Refs #462, #467.

Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
@DeusData DeusData merged commit dc5a1aa into main Jun 23, 2026
12 of 13 checks passed
@DeusData DeusData deleted the vendor/objectscript-grammar branch June 23, 2026 23:23
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