Support for Slang 1.0.0

package.json

@@ -108,7 +108,7 @@
     "webpack-cli": "^6.0.1"
   },
   "dependencies": {
-    "@nomicfoundation/slang": "0.19.0",
+    "@nomicfoundation/slang": "1.0.0",
     "@solidity-parser/parser": "^0.19.0",
     "semver": "^7.7.1"
   },

src/slang-nodes/Expression.ts

@@ -9,7 +9,7 @@ import { ConditionalExpression } from './ConditionalExpression.js';
 import { OrExpression } from './OrExpression.js';
 import { AndExpression } from './AndExpression.js';
 import { EqualityExpression } from './EqualityExpression.js';
-import { ComparisonExpression } from './ComparisonExpression.js';
+import { InequalityExpression } from './InequalityExpression.js';
 import { BitwiseOrExpression } from './BitwiseOrExpression.js';
 import { BitwiseXorExpression } from './BitwiseXorExpression.js';
 import { BitwiseAndExpression } from './BitwiseAndExpression.js';
@@ -51,7 +51,7 @@ export class Expression implements SlangNode {
     | OrExpression
     | AndExpression
     | EqualityExpression
-    | ComparisonExpression
+    | InequalityExpression
     | BitwiseOrExpression
     | BitwiseXorExpression
     | BitwiseAndExpression
@@ -112,9 +112,9 @@ export class Expression implements SlangNode {
             options
           );
           break;
-        case NonterminalKind.ComparisonExpression:
-          this.variant = new ComparisonExpression(
-            ast.variant as ast.ComparisonExpression,
+        case NonterminalKind.InequalityExpression:
+          this.variant = new InequalityExpression(
+            ast.variant as ast.InequalityExpression,
             options
           );
           break;

src/slang-nodes/ComparisonExpression.ts → src/slang-nodes/InequalityExpression.ts

@@ -8,8 +8,8 @@ import type { AstPath, Doc, ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
 import type { PrintFunction, SlangNode } from '../types.d.ts';
 
-export class ComparisonExpression implements SlangNode {
-  readonly kind = NonterminalKind.ComparisonExpression;
+export class InequalityExpression implements SlangNode {
+  readonly kind = NonterminalKind.InequalityExpression;
 
   comments;
 
@@ -21,7 +21,7 @@ export class ComparisonExpression implements SlangNode {
 
   rightOperand: Expression;
 
-  constructor(ast: ast.ComparisonExpression, options: ParserOptions<AstNode>) {
+  constructor(ast: ast.InequalityExpression, options: ParserOptions<AstNode>) {
     let metadata = getNodeMetadata(ast);
 
     this.leftOperand = new Expression(ast.leftOperand, options);
@@ -35,7 +35,7 @@ export class ComparisonExpression implements SlangNode {
   }
 
   print(
-    path: AstPath<ComparisonExpression>,
+    path: AstPath<InequalityExpression>,
     print: PrintFunction,
     options: ParserOptions<AstNode>
   ): Doc {

src/slang-nodes/YulExpression.ts

@@ -2,7 +2,6 @@ import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulFunctionCallExpression } from './YulFunctionCallExpression.js';
 import { YulLiteral } from './YulLiteral.js';
-import { YulBuiltInFunction } from './YulBuiltInFunction.js';
 import { YulPath } from './YulPath.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
@@ -17,11 +16,7 @@ export class YulExpression implements SlangNode {
 
   loc;
 
-  variant:
-    | YulFunctionCallExpression
-    | YulLiteral
-    | YulBuiltInFunction
-    | YulPath;
+  variant: YulFunctionCallExpression | YulLiteral | YulPath;
 
   constructor(ast: ast.YulExpression, options: ParserOptions<AstNode>) {
     let metadata = getNodeMetadata(ast);
@@ -36,11 +31,6 @@ export class YulExpression implements SlangNode {
       case NonterminalKind.YulLiteral:
         this.variant = new YulLiteral(ast.variant as ast.YulLiteral, options);
         break;
-      case NonterminalKind.YulBuiltInFunction:
-        this.variant = new YulBuiltInFunction(
-          ast.variant as ast.YulBuiltInFunction
-        );
-        break;
       case NonterminalKind.YulPath:
         this.variant = new YulPath(ast.variant as ast.YulPath);
         break;

src/slang-nodes/types.d.ts

@@ -20,7 +20,6 @@ import type { CallOptionsExpression } from './CallOptionsExpression.ts';
 import type { CatchClause } from './CatchClause.ts';
 import type { CatchClauseError } from './CatchClauseError.ts';
 import type { CatchClauses } from './CatchClauses.ts';
-import type { ComparisonExpression } from './ComparisonExpression.ts';
 import type { ConditionalExpression } from './ConditionalExpression.ts';
 import type { ConstantDefinition } from './ConstantDefinition.ts';
 import type { ConstructorAttribute } from './ConstructorAttribute.ts';
@@ -80,6 +79,7 @@ import type { ImportDeconstructionSymbols } from './ImportDeconstructionSymbols.
 import type { ImportDirective } from './ImportDirective.ts';
 import type { IndexAccessEnd } from './IndexAccessEnd.ts';
 import type { IndexAccessExpression } from './IndexAccessExpression.ts';
+import type { InequalityExpression } from './InequalityExpression.ts';
 import type { InheritanceSpecifier } from './InheritanceSpecifier.ts';
 import type { InheritanceType } from './InheritanceType.ts';
 import type { InheritanceTypes } from './InheritanceTypes.ts';
@@ -190,7 +190,6 @@ import type { YulArguments } from './YulArguments.ts';
 import type { YulAssignmentOperator } from './YulAssignmentOperator.ts';
 import type { YulBlock } from './YulBlock.ts';
 import type { YulBreakStatement } from './YulBreakStatement.ts';
-import type { YulBuiltInFunction } from './YulBuiltInFunction.ts';
 import type { YulColonAndEqual } from './YulColonAndEqual.ts';
 import type { YulContinueStatement } from './YulContinueStatement.ts';
 import type { YulDefaultCase } from './YulDefaultCase.ts';
@@ -321,7 +320,7 @@ export type StrictAstNode =
   | OrExpression
   | AndExpression
   | EqualityExpression
-  | ComparisonExpression
+  | InequalityExpression
   | BitwiseOrExpression
   | BitwiseXorExpression
   | BitwiseAndExpression
@@ -409,7 +408,6 @@ export type StrictAstNode =
   | YulAssignmentOperator
   | YulSwitchCase
   | YulExpression
-  | YulBuiltInFunction
   | YulLiteral
   | SourceUnitMembers
   | VersionExpressionSet

src/slang-printers/print-binary-operation.ts

@@ -5,8 +5,8 @@ import { createKindCheckFunction } from '../slang-utils/create-kind-check-functi
 
 import type { AstPath, Doc } from 'prettier';
 import type { BinaryOperation, StrictAstNode } from '../slang-nodes/types.d.ts';
-import type { ComparisonExpression } from '../slang-nodes/ComparisonExpression.ts';
 import type { EqualityExpression } from '../slang-nodes/EqualityExpression.ts';
+import type { InequalityExpression } from '../slang-nodes/InequalityExpression.ts';
 
 const { group, indent } = doc.builders;
 
@@ -25,7 +25,7 @@ const isBinaryOperationWithoutComparison = createKindCheckFunction([
   node: StrictAstNode
 ) => node is Exclude<
   BinaryOperation,
-  ComparisonExpression | EqualityExpression
+  EqualityExpression | InequalityExpression
 >;
 
 const binaryGroupRulesBuilder =

src/slang-utils/is-binary-operation.ts

@@ -11,8 +11,8 @@ export const isBinaryOperation = createKindCheckFunction([
   NonterminalKind.BitwiseAndExpression,
   NonterminalKind.BitwiseOrExpression,
   NonterminalKind.BitwiseXorExpression,
-  NonterminalKind.ComparisonExpression,
   NonterminalKind.EqualityExpression,
+  NonterminalKind.InequalityExpression,
   NonterminalKind.AndExpression,
   NonterminalKind.OrExpression,
   NonterminalKind.ShiftExpression

src/types.d.ts

@@ -142,7 +142,7 @@ export type SlangAstNode =
   | ast.OrExpression
   | ast.AndExpression
   | ast.EqualityExpression
-  | ast.ComparisonExpression
+  | ast.InequalityExpression
   | ast.BitwiseOrExpression
   | ast.BitwiseXorExpression
   | ast.BitwiseAndExpression
@@ -230,7 +230,6 @@ export type SlangAstNode =
   | ast.YulAssignmentOperator
   | ast.YulSwitchCase
   | ast.YulExpression
-  | ast.YulBuiltInFunction
   | ast.YulLiteral
   | ast.SourceUnitMembers
   | ast.VersionExpressionSet

test.config.js

@@ -11,7 +11,7 @@ export default {
   optimization: { minimize: false },
   target: ['browserslist'],
 
-  externals: { 'fs/promises': 'import fs/promises' },
+  externals: { 'node:fs/promises': 'import node:fs/promises' },
 
   experiments: {
     asyncWebAssembly: true,

webpack.config.js

@@ -22,7 +22,7 @@ export default (webpackEnv) => {
     // Avoid bundling Prettier
     externals: {
       prettier: 'global prettier',
-      'fs/promises': 'import fs/promises'
+      'node:fs/promises': 'import node:fs/promises'
     },
 
     plugins: [