adding missing cases for Identifiers.

Author: Janther

src/slang-nodes/AssignmentExpression.ts

@@ -1,5 +1,8 @@
+import {
+  NonterminalKind,
+  TerminalKind
+} from '@nomicfoundation/slang/kinds/index.js';
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
@@ -46,7 +49,7 @@ export class AssignmentExpression implements SlangNode {
     return [
       path.call(print, 'leftOperand'),
       ` ${this.operator}`,
-      typeof this.rightOperand.variant !== 'string' &&
+      this.rightOperand.variant.kind !== TerminalKind.Identifier &&
       isBinaryOperation(this.rightOperand.variant)
         ? group(indent([line, path.call(print, 'rightOperand')]))
         : [' ', path.call(print, 'rightOperand')]

src/slang-nodes/ExperimentalFeature.ts

@@ -1,7 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import {
+  NonterminalKind,
+  TerminalKind
+} from '@nomicfoundation/slang/kinds/index.js';
 import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StringLiteral } from './StringLiteral.js';
+import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
@@ -15,7 +19,7 @@ export class ExperimentalFeature implements SlangNode {
 
   loc;
 
-  variant: StringLiteral | string;
+  variant: StringLiteral | Identifier;
 
   constructor(
     ast: ast.ExperimentalFeature,
@@ -27,21 +31,19 @@ export class ExperimentalFeature implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? new Identifier(ast.variant, offsets[0])
         : new StringLiteral(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
       metadata,
-      typeof this.variant === 'string' ? [] : [this.variant]
+      this.variant.kind === TerminalKind.Identifier ? [] : [this.variant]
     );
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
   }
 
   print(path: AstPath<ExperimentalFeature>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return path.call(print, 'variant');
   }
 }

src/slang-nodes/Expression.ts

@@ -1,4 +1,7 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import {
+  NonterminalKind,
+  TerminalKind
+} from '@nomicfoundation/slang/kinds/index.js';
 import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { AssignmentExpression } from './AssignmentExpression.js';
@@ -28,6 +31,7 @@ import { HexNumberExpression } from './HexNumberExpression.js';
 import { DecimalNumberExpression } from './DecimalNumberExpression.js';
 import { StringExpression } from './StringExpression.js';
 import { ElementaryType } from './ElementaryType.js';
+import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
@@ -69,7 +73,7 @@ export class Expression implements SlangNode {
     | DecimalNumberExpression
     | StringExpression
     | ElementaryType
-    | string;
+    | Identifier;
 
   constructor(
     ast: ast.Expression,
@@ -80,7 +84,7 @@ export class Expression implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
-      this.variant = ast.variant.text;
+      this.variant = new Identifier(ast.variant, offsets[0]);
     } else {
       switch (ast.variant.cst.kind) {
         case NonterminalKind.AssignmentExpression:
@@ -276,16 +280,14 @@ export class Expression implements SlangNode {
 
     metadata = updateMetadata(
       metadata,
-      typeof this.variant === 'string' ? [] : [this.variant]
+      this.variant.kind === TerminalKind.Identifier ? [] : [this.variant]
     );
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
   }
 
   print(path: AstPath<Expression>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return path.call(print, 'variant');
   }
 }

src/slang-nodes/TupleValues.ts

@@ -1,4 +1,7 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import {
+  NonterminalKind,
+  TerminalKind
+} from '@nomicfoundation/slang/kinds/index.js';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -42,7 +45,7 @@ export class TupleValues implements SlangNode {
   print(path: AstPath<TupleValues>, print: PrintFunction): Doc {
     return this.items.length === 1 &&
       this.items[0].expression &&
-      typeof this.items[0].expression.variant !== 'string' &&
+      this.items[0].expression.variant.kind !== TerminalKind.Identifier &&
       isBinaryOperation(this.items[0].expression.variant)
       ? path.map(print, 'items')
       : printSeparatedList(path.map(print, 'items'));

src/slang-nodes/VersionExpression.ts

@@ -23,6 +23,7 @@ export class VersionExpression implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
+      // TODO: test whether this is a Identifier
       this.variant = ast.variant.text;
     } else {
       switch (ast.variant.cst.kind) {

src/slang-printers/create-binary-operation-printer.ts

@@ -1,3 +1,4 @@
+import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
 import { doc } from 'prettier';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 
@@ -18,7 +19,7 @@ function rightOperandPrint(
   // operand like - 1 on its own line
   const shouldGroup =
     !(
-      typeof node.leftOperand.variant !== 'string' &&
+      node.leftOperand.variant.kind !== TerminalKind.Identifier &&
       isBinaryOperation(node.leftOperand.variant)
     ) && !isBinaryOperation(path.getNode(2) as StrictAstNode);
 

src/slang-utils/create-hug-function.ts

@@ -1,4 +1,7 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import {
+  NonterminalKind,
+  TerminalKind
+} from '@nomicfoundation/slang/kinds/index.js';
 import { Expression } from '../slang-nodes/Expression.js';
 import { TupleExpression } from '../slang-nodes/TupleExpression.js';
 import { TupleValues } from '../slang-nodes/TupleValues.js';
@@ -17,7 +20,7 @@ export function createHugFunction(
   const operators = new Set(huggableOperators);
   return (node: Expression): Expression => {
     if (
-      typeof node.variant !== 'string' &&
+      node.variant.kind !== TerminalKind.Identifier &&
       isBinaryOperation(node.variant) &&
       operators.has(node.variant.operator)
     ) {