fix vml/sasf/satf tests to use new parser format

Author: dandelany

src/languages/satf/grammar/sasf.test.ts

@@ -1,6 +1,6 @@
 import { testTree } from '@lezer/generator/test';
 import { describe, expect, test } from 'vitest';
-import { SatfLanguage } from './satf-sasf.js';
+import { SatfSasfParser } from './satf-sasf.js';
 
 const tests = [
   [
@@ -101,6 +101,6 @@ describe.each([['parse tree structure', tests]])('grammar tests - %s', (_name: s
 
     testTree will throw if there's a mismatch between the returned actual and expected trees, it returns
     undefined when they match. */
-    expect(testTree(SatfLanguage.parser.parse(input), expected, undefined)).toBeUndefined();
+    expect(testTree(SatfSasfParser.parse(input), expected, undefined)).toBeUndefined();
   });
 });

src/languages/satf/grammar/satf.test.ts

@@ -1,6 +1,6 @@
 import { testTree } from '@lezer/generator/dist/test';
 import { describe, expect, test } from 'vitest';
-import { SatfLanguage } from './satf-sasf.js';
+import { SatfSasfParser } from './satf-sasf.js';
 
 const tests = [
   [
@@ -227,7 +227,7 @@ const tests = [
             RANGE, \\CLK_DUR:15:05:1 ...CLK_DUR:17:20:0\\
             RANGE, \\101T12:15:32.512 ...101T10:20:20.123\\
             RANGE, \\3.4, 0.9, 12.\\,
-          ),       
+          ),
           Target (
             TYPE, STRING,
             RANGE, \\ "J", "I", "E" \\,
@@ -881,6 +881,6 @@ describe.each([['parse tree structure', tests]])('grammar tests - %s', (_name: s
 
     testTree will throw if there's a mismatch between the returned actual and expected trees, it returns
     undefined when they match. */
-    expect(testTree(SatfLanguage.parser.parse(input), expected, undefined)).toBeUndefined();
+    expect(testTree(SatfSasfParser.parse(input), expected, undefined)).toBeUndefined();
   });
 });

src/languages/vml/vml-tree-utils.test.ts

@@ -1,7 +1,7 @@
 import type { SyntaxNode } from '@lezer/common';
 import { describe, expect, test } from 'vitest';
 import { filterNodes, nodeContents } from '../../utils/tree-utils.js';
-import { VmlLanguage } from './vml.js';
+import { vmlParser } from './vml.js';
 import { RULE_CALL_PARAMETERS, RULE_FUNCTION_NAME, RULE_TIME_TAGGED_STATEMENT } from './vml-constants.js';
 import { getArgumentPosition, VmlCommandInfoMapper } from './vml-tree-utils.js';
 
@@ -22,7 +22,7 @@ R00:01:00 CALL pay_spawn "seis_pwr_on_r01_1"
 END_BODY
 END_MODULE
 `;
-  const parsed = VmlLanguage.parser.parse(input);
+  const parsed = vmlParser.parse(input);
   const vmlCommandInfoMapper = new VmlCommandInfoMapper();
   const timeTaggedNodes: SyntaxNode[] = Array.from(
     filterNodes(parsed.cursor(), (node: SyntaxNode) => node.name === RULE_TIME_TAGGED_STATEMENT),
@@ -122,7 +122,7 @@ END_MODULE
     `;
 
     const moduleVariables = ['partial_product', 'file_base'];
-    const parsed = VmlLanguage.parser.parse(input);
+    const parsed = vmlParser.parse(input);
     const vmlCommandInfoMapper = new VmlCommandInfoMapper();
     const variableNames = vmlCommandInfoMapper.getVariables(input, parsed, input.indexOf('CMD_002'));
     expect(variableNames).toEqual([...moduleVariables, 'delay_time', 'mode', 'i', 'value', 'mask', 'file_name', 'str']);

src/languages/vml/vml.test.ts

@@ -2,7 +2,7 @@ import type { SyntaxNode } from '@lezer/common';
 import type { FswCommandArgumentInteger } from '@nasa-jpl/aerie-ampcs';
 import { assert, describe, expect, it } from 'vitest';
 import { filterNodes, nodeContents } from '../../utils/tree-utils.js';
-import { VmlLanguage } from './vml.js';
+import { vmlParser } from './vml.js';
 import { vmlBlockLibraryToCommandDictionary } from './vml-block-library.js';
 import {
   GROUP_STATEMENT_SUB as GROUP_STATEMENT_SUBTYPES,
@@ -79,7 +79,7 @@ END_MODULE
 `;
     assertNoErrorNodes(input);
 
-    const tree = VmlLanguage.parser.parse(input);
+    const tree = vmlParser.parse(input);
     expect(tree.topNode.name).toBe(RULE_TEXT_FILE);
 
     const functionsNode = tree.topNode.getChild(RULE_FUNCTIONS);
@@ -327,7 +327,7 @@ END_BODY
 
 END_MODULE`;
     assertNoErrorNodes(input, true);
-    const parsed = VmlLanguage.parser.parse(input);
+    const parsed = vmlParser.parse(input);
     const functionNodes = parsed.topNode.getChild(RULE_FUNCTIONS)?.getChildren(RULE_FUNCTION);
     expect(functionNodes).toBeDefined();
     expect(functionNodes?.length).toEqual(2);
@@ -449,7 +449,7 @@ END_MODULE
 
 describe('standalone statements', () => {
   const timeTaggedConfig = { top: RULE_TEST_TIME_TAGGED_STATEMENT };
-  const timeTaggedParser = VmlLanguage.parser.configure(timeTaggedConfig);
+  const timeTaggedParser = vmlParser.configure(timeTaggedConfig);
 
   it('spacecraft command with assignment', () => {
     const input = `R00:00:01.00 END_TIME := spacecraft_time()\n`;
@@ -477,7 +477,7 @@ describe('standalone statements', () => {
 describe('partial documents', () => {
   it('module fragment', () => {
     const input = '\n\nMOD\n\n';
-    const tree = VmlLanguage.parser.parse(input);
+    const tree = vmlParser.parse(input);
     expect(tree.topNode.getChild(TOKEN_MODULE)).toBeNull();
   });
 
@@ -491,7 +491,7 @@ R00:00:00.00 ISS
 END_BODY
 END_MODULE
     `;
-    const tree = VmlLanguage.parser.parse(input);
+    const tree = vmlParser.parse(input);
     const seqNode = tree.topNode.getChild(RULE_FUNCTIONS)?.getChild(RULE_FUNCTION)?.getChild(RULE_SEQUENCE);
     expect(seqNode).toBeTruthy();
     const bodyNode = seqNode?.getChild(RULE_COMMON_FUNCTION)?.getChild(RULE_BODY);
@@ -507,7 +507,7 @@ END_BODY
 A
 END_MODULE`;
     const aPosition = input.indexOf('A\n', input.lastIndexOf(TOKEN_END_BODY));
-    const aToken = VmlLanguage.parser.parse(input).resolveInner(aPosition, 1);
+    const aToken = vmlParser.parse(input).resolveInner(aPosition, 1);
     expect(aToken.name).toBe(TOKEN_SYMBOL_CONST);
     expect(aToken.parent?.name).toBe(TOKEN_ERROR);
   });
@@ -520,14 +520,14 @@ BODY
 R0
 END_BODY
 END_MODULE`;
-    const r0Token = VmlLanguage.parser.parse(input).resolveInner(input.indexOf('R0'), 1);
+    const r0Token = vmlParser.parse(input).resolveInner(input.indexOf('R0'), 1);
     expect(r0Token.name).toBe(TOKEN_SYMBOL_CONST);
     expect(r0Token.parent?.name).toBe(TOKEN_ERROR);
   });
 });
 
 function printNodes(input: string): void {
-  for (const node of filterNodes(VmlLanguage.parser.parse(input).cursor())) {
+  for (const node of filterNodes(vmlParser.parse(input).cursor())) {
     printNode(input, node);
   }
 }
@@ -554,8 +554,7 @@ END_MODULE
 }
 
 export function assertNoErrorNodes(input: string, printPrefix?: boolean): void {
-  const parser = VmlLanguage.parser;
-  const cursor = parser.parse(input).cursor();
+  const cursor = vmlParser.parse(input).cursor();
   do {
     const { node } = cursor;
     if (printPrefix) {