feat: update code/documentation related to rust builds, and update highlights for classes.

README.md

@@ -19,14 +19,28 @@ The grammar currently integrates with these editors:
 
 Given the polyglot nature of ObjectScript `.cls` files, it's recommended to ensure the following tree-sitter grammars are installed and available for injection:
 
-- SQL
-- HTML
-- Python
-- JavaScript
+- SQL 
+- HTML 
+- Python 
+- JavaScript 
 - CSS
 - XML
 - Markdown
 
+All of these grammars are all available as Rust crates (and in other languages as well). 
+For example, if I want to include these grammars in my rust project, 
+I would simply add these under dependencies in my Cargo.Toml file: 
+```Cargo
+tree-sitter-html = "0.23.2"
+tree-sitter-javascript = "0.25.0"
+tree-sitter-python = "0.25.0"
+tree-sitter-css = "0.25.0"
+tree-sitter-sql = "0.0.2"
+tree-sitter-xml = "0.7.0"
+tree-sitter-md = "0.5.1"
+```
+
+
 ## Screenshots
 
 ### Zed
@@ -133,13 +147,13 @@ Since there are three parsers, you'll need to cd into the directory containing t
 
 #### Build the Parser(s)
 
-From the parser directory, generate the state machines from the grammar and compile the native parser:
+From the grammar directory, generate the state machines from the grammar and compile the native parser:
 ```bash
 tree-sitter generate
 tree-sitter build
 ```
 
-**NOTE**: Use `tree-sitter --wasm` when using the playground to test the grammar.
+**NOTE**: Use `tree-sitter build --wasm` when using the playground to test the grammar.
 
 #### Running Tests
 
@@ -204,4 +218,4 @@ Once you have those prereqs complete, run `npm install` and then `npm test`
 From the root directory run `go get github.com/tree-sitter/[email protected]` and then run `go test ./bindings/go/...`
 
 ### C
-Run `make test`
+Run `make test`

cargo_readme.md

@@ -0,0 +1,15 @@
+# tree-sitter-objectscript
+
+ObjectScript Grammars for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
+
+This crate provides ObjectScript, ObjectScript Core (routines), and ObjectScript Expr (expressions) language support for the tree-sitter parsing library.
+
+There are three grammars: 
+1. **objectscript** - this is the overall grammar. This extends the other
+two grammars, and should be used for .cls files.
+2. **objectscript_core**: Represents ObjectScript "routine" syntax.
+3. **objectscript_expr**: Represents ObjectScript expressions.
+
+See [docs.rs](https://docs.rs/tree-sitter-objectscript/latest/tree_sitter_objectscript/) 
+for information on how to access the languages and their associated query files. 
+

common/scanner.h

@@ -75,13 +75,14 @@ static inline void skip   (TSLexer *lexer) { lexer->advance(lexer, true ); }
 #define MARKER_BUFFER_MAX_LEN 30
 struct ObjectScript_Core_Scanner {
   int32_t marker_buffer[MARKER_BUFFER_MAX_LEN];
-  char marker_buffer_len;
+  int marker_buffer_len;
   bool at_bol;
 };
 
 static bool ObjectScript_Core_Scanner_lex_fenced_text(
-    void *payload, TSLexer *lexer,
-    enum ObjectScript_Core_Scanner_TokenType desired_symbol, char l_delim,
+    TSLexer *lexer,
+    enum ObjectScript_Core_Scanner_TokenType desired_symbol,
+    char l_delim,
     char r_delim) {
   int leftRightDiff = 1;
   while (!lexer->eof(lexer)) {
@@ -373,12 +374,12 @@ ObjectScript_Core_Scanner_scan(struct ObjectScript_Core_Scanner *scanner,
     }
   } else if (valid_symbols[ANGLED_BRACKET_FENCED_TEXT]) {
     bool ok = ObjectScript_Core_Scanner_lex_fenced_text(
-        scanner, lexer, ANGLED_BRACKET_FENCED_TEXT, '<', '>');
+        lexer, ANGLED_BRACKET_FENCED_TEXT, '<', '>');
     if (ok) scanner->at_bol = false;
     return ok;
   } else if (valid_symbols[PAREN_FENCED_TEXT]) {
     bool ok = ObjectScript_Core_Scanner_lex_fenced_text(
-        scanner, lexer, PAREN_FENCED_TEXT, '(', ')');
+        lexer, PAREN_FENCED_TEXT, '(', ')');
     if (ok) scanner->at_bol = false;
     return ok;
   } else if (valid_symbols[EMBEDDED_SQL_MARKER]) {