Add quotes to all identifiers in error messages for consistency

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Shadowing built-in static functions is now forbidden: PR [#351](https://github.com/tact-lang/tact/pull/351)
 - Augmented assignment now throws compilation error for non-integer types: PR [#356](https://github.com/tact-lang/tact/pull/356)
 - Built-in function `address()` now handles parse errors correctly: PR [#357](https://github.com/tact-lang/tact/pull/357)
+- All identifiers in error messages are now quoted for consistency: PR [#363](https://github.com/tact-lang/tact/pull/363)
 
 ## [1.3.0] - 2024-05-03
 

src/abi/map.ts

@@ -36,7 +36,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                 }
                 if (args[1].name !== self.key) {
                     throwError(
-                        `set expects a ${self.key} as first argument`,
+                        `set expects a "${self.key}" as first argument`,
                         ref,
                     );
                 }
@@ -50,7 +50,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                 }
                 if (args[2].kind !== "null" && args[2].name !== self.value) {
                     throwError(
-                        `set expects a ${self.value} as second argument`,
+                        `set expects a "${self.value}" as second argument`,
                         ref,
                     );
                 }
@@ -121,7 +121,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                             }
                         } else {
                             throwError(
-                                `${t.name} can't be value of a map`,
+                                `"${t.name}" can't be value of a map`,
                                 ref,
                             );
                         }
@@ -170,7 +170,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                             }
                         } else {
                             throwError(
-                                `${t.name} can't be value of a map`,
+                                `"${t.name}" can't be value of a map`,
                                 ref,
                             );
                         }
@@ -204,7 +204,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                 }
                 if (args[1].name !== self.key) {
                     throwError(
-                        `set expects a ${self.key} as first argument`,
+                        `set expects a "${self.key}" as first argument`,
                         ref,
                     );
                 }
@@ -269,7 +269,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                             return `${ops.readerOpt(t.name, ctx)}(__tact_dict_get_${kind}_cell(${resolved[0]}, ${bits}, ${resolved[1]}))`;
                         } else {
                             throwError(
-                                `${t.name} can't be value of a map`,
+                                `"${t.name}" can't be value of a map`,
                                 ref,
                             );
                         }
@@ -314,7 +314,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                             return `${ops.readerOpt(t.name, ctx)}(__tact_dict_get_slice_cell(${resolved[0]}, 267, ${resolved[1]}))`;
                         } else {
                             throwError(
-                                `${t.name} can't be value of a map`,
+                                `"${t.name}" can't be value of a map`,
                                 ref,
                             );
                         }
@@ -348,7 +348,7 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
                 }
                 if (args[1].name !== self.key) {
                     throwError(
-                        `del expects a ${self.key} as first argument`,
+                        `del expects a "${self.key}" as first argument`,
                         ref,
                     );
                 }

src/generator/Writer.ts

@@ -132,10 +132,10 @@ export class WriterContext {
         //
 
         if (this.#functions.has(name)) {
-            throw new Error(`Function ${name} already defined`); // Should not happen
+            throw new Error(`Function "${name}" already defined`); // Should not happen
         }
         if (this.#functionsRendering.has(name)) {
-            throw new Error(`Function ${name} already rendering`); // Should not happen
+            throw new Error(`Function "${name}" already rendering`); // Should not happen
         }
 
         //
@@ -189,10 +189,10 @@ export class WriterContext {
         const comment = this.#pendingComment;
         const context = this.#pendingContext;
         if (!signature && name !== "$main") {
-            throw new Error(`Function ${name} signature not set`);
+            throw new Error(`Function "${name}" signature not set`);
         }
         if (!code) {
-            throw new Error(`Function ${name} body not set`);
+            throw new Error(`Function "${name}" body not set`);
         }
         this.#pendingDepends = null;
         this.#pendingWriter = null;
@@ -319,7 +319,7 @@ export class WriterContext {
 
     markRendered(key: string) {
         if (this.#rendered.has(key)) {
-            throw new Error(`Key ${key} already rendered`);
+            throw new Error(`Key "${key}" already rendered`);
         }
         this.#rendered.add(key);
     }

src/generator/createABI.ts

@@ -12,7 +12,7 @@ export function createABI(ctx: CompilerContext, name: string): ContractABI {
     // Contract
     const contract = allTypes.find((v) => v.name === name)!;
     if (!contract) {
-        throw Error(`Contract ${name} not found`);
+        throw Error(`Contract "${name}" not found`);
     }
     if (contract.kind !== "contract") {
         throw Error("Not a contract");

src/generator/writeProgram.ts

@@ -303,7 +303,7 @@ function writeAll(
     const contracts = allTypes.filter((v) => v.kind === "contract");
     const c = contracts.find((v) => v.name === name);
     if (!c) {
-        throw Error(`Contract ${name} not found`);
+        throw Error(`Contract "${name}" not found`);
     }
 
     // Stdlib

src/generator/writers/writeExpression.ts

@@ -486,7 +486,7 @@ export function writeExpression(f: ASTExpression, ctx: WriterContext): string {
             ((src.kind !== "ref" || src.optional) && src.kind !== "ref_bounced")
         ) {
             throwError(
-                `Cannot access field of non-struct type: ${printTypeRef(src)}`,
+                `Cannot access field of non-struct type: "${printTypeRef(src)}"`,
                 f.ref,
             );
         }
@@ -609,7 +609,7 @@ export function writeExpression(f: ASTExpression, ctx: WriterContext): string {
         const src = getExpType(ctx.ctx, f.src);
         if (src === null) {
             throwError(
-                `Cannot call function of non - direct type: ${printTypeRef(src)} `,
+                `Cannot call function of non - direct type: "${printTypeRef(src)}"`,
                 f.ref,
             );
         }
@@ -618,7 +618,7 @@ export function writeExpression(f: ASTExpression, ctx: WriterContext): string {
         if (src.kind === "ref") {
             if (src.optional) {
                 throwError(
-                    `Cannot call function of non - direct type: ${printTypeRef(src)} `,
+                    `Cannot call function of non - direct type: "${printTypeRef(src)}"`,
                     f.ref,
                 );
             }
@@ -704,7 +704,7 @@ export function writeExpression(f: ASTExpression, ctx: WriterContext): string {
         }
 
         throwError(
-            `Cannot call function of non - direct type: ${printTypeRef(src)} `,
+            `Cannot call function of non - direct type: "${printTypeRef(src)}"`,
             f.ref,
         );
     }

src/generator/writers/writeFunction.ts

@@ -503,7 +503,7 @@ export function writeGetter(f: FunctionDescription, ctx: WriterContext) {
     // Render tensors
     const self = f.self ? getType(ctx.ctx, f.self) : null;
     if (!self) {
-        throw new Error(`No self type for getter ${f.name}`); // Impossible
+        throw new Error(`No self type for getter "${f.name}"`); // Impossible
     }
     ctx.append(
         `_ %${f.name}(${f.args.map((v) => resolveFuncTupledType(v.type, ctx) + " " + id("$" + v.name)).join(", ")}) method_id(${getMethodId(f.name)}) {`,

src/grammar/checkConstAttributes.ts

@@ -8,7 +8,7 @@ export function checkConstAttributes(
     const k = new Set<string>();
     for (const a of attributes) {
         if (k.has(a.type)) {
-            throwError(`Duplicate function attribute ${a.type}`, a.ref);
+            throwError(`Duplicate function attribute "${a.type}"`, a.ref);
         }
         k.add(a.type);
     }

src/grammar/checkFunctionAttributes.ts

@@ -8,7 +8,7 @@ export function checkFunctionAttributes(
     const k = new Set<string>();
     for (const a of attrs) {
         if (k.has(a.type)) {
-            throwError(`Duplicate function attribute ${a.type}`, a.ref);
+            throwError(`Duplicate function attribute "${a.type}"`, a.ref);
         }
         k.add(a.type);
     }

src/imports/resolveImports.ts

@@ -42,7 +42,7 @@ export function resolveImports(args: {
                 stdlib: args.stdlib,
             });
             if (!resolved.ok) {
-                throw new Error(`Could not resolve import ${i} in ${path}`);
+                throw new Error(`Could not resolve import "${i}" in ${path}`);
             }
 
             // Check if already imported

src/test/feature-implicit-init.spec.ts

@@ -68,7 +68,7 @@ describe("feature-send", () => {
             projectNames: ["implicit-init-2"],
         });
         expect((consoleLogger.error as jest.Mock).mock.lastCall[0]).toContain(
-            "Field test_field is not set",
+            'Field "test_field" is not set',
         );
         expect(result).toBe(false);
     });

src/types/__snapshots__/resolveDescriptors.spec.ts.snap

@@ -59,7 +59,7 @@ Line 8, col 17:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-6 1`] = `
-"<unknown>:11:3: Field b already exists
+"<unknown>:11:3: Field "b" already exists
 Line 11, col 3:
   10 |   b: Int;
 > 11 |   b: Int;
@@ -69,7 +69,7 @@ Line 11, col 3:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-7 1`] = `
-"<unknown>:11:3: Field b already exists
+"<unknown>:11:3: Field "b" already exists
 Line 11, col 3:
   10 |   b: Int;
 > 11 |   b: Int;
@@ -119,7 +119,7 @@ Line 12, col 23:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-12 1`] = `
-"<unknown>:12:1: Type Main already exists
+"<unknown>:12:1: Type "Main" already exists
 Line 12, col 1:
   11 | 
 > 12 | struct Main {
@@ -129,7 +129,7 @@ Line 12, col 1:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-13 1`] = `
-"<unknown>:12:1: Type Main already exists
+"<unknown>:12:1: Type "Main" already exists
 Line 12, col 1:
   11 | 
 > 12 | struct Main {
@@ -139,7 +139,7 @@ Line 12, col 1:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-14 1`] = `
-"<unknown>:12:1: Type Main already exists
+"<unknown>:12:1: Type "Main" already exists
 Line 12, col 1:
   11 | 
 > 12 | contract Main {
@@ -149,7 +149,7 @@ Line 12, col 1:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-15 1`] = `
-"<unknown>:12:1: Struct Main must have at least one field
+"<unknown>:12:1: Struct "Main" must have at least one field
 Line 12, col 1:
   11 | 
 > 12 | struct Main {
@@ -159,7 +159,7 @@ Line 12, col 1:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-16 1`] = `
-"<unknown>:16:1: Struct Main must have at least one field
+"<unknown>:16:1: Struct "Main" must have at least one field
 Line 16, col 1:
   15 | 
 > 16 | struct Main {
@@ -169,7 +169,7 @@ Line 16, col 1:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-17 1`] = `
-"<unknown>:8:1: Function hello already exists in type Main
+"<unknown>:8:1: Function "hello" already exists in type "Main"
 Line 8, col 1:
   7 | 
 > 8 | contract Main {
@@ -199,7 +199,7 @@ Line 13, col 5:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-20 1`] = `
-"<unknown>:12:1: Function hello already exists in type Main
+"<unknown>:12:1: Function "hello" already exists in type "Main"
 Line 12, col 1:
   11 | 
 > 12 | extends fun hello(self: Main): Bool {
@@ -219,7 +219,7 @@ Line 17, col 3:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-22 1`] = `
-"<unknown>:24:3: Bounce receive function for A already exists
+"<unknown>:24:3: Bounce receive function for "A" already exists
 Line 24, col 3:
   23 |   
 > 24 |   bounced(msg: bounced<A>) {
@@ -259,7 +259,7 @@ Line 8, col 21:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-26 1`] = `
-"<unknown>:1:1: Static function ton already exists
+"<unknown>:1:1: Static function "ton" already exists
 Line 1, col 1:
 > 1 | fun ton() {
       ^~~~~~~~~~~
@@ -268,7 +268,7 @@ Line 1, col 1:
 `;
 
 exports[`resolveDescriptors should fail descriptors for case-27 1`] = `
-"<unknown>:1:1: Static function dumpStack already exists
+"<unknown>:1:1: Static function "dumpStack" already exists
 Line 1, col 1:
 > 1 | fun dumpStack() {
       ^~~~~~~~~~~~~~~~~