Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Value type #1277

Merged
merged 12 commits into from
Jan 13, 2025
Merged

refactor: Value type #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2d6593d
Refactor of Value type. It is now AstLiteral in AstExpression.
jeshecdom Dec 31, 2024
258e023
Small comments and changes in conditions of == and != in interpreter.
jeshecdom Dec 31, 2024
910d36b
Merge branch 'main' into value-type
jeshecdom Jan 1, 2025
6ef35d7
Merge branch 'main' into value-type
jeshecdom Jan 1, 2025
2ddbfde
First changes after review.
jeshecdom Jan 7, 2025
8578be7
Final changes after review.
jeshecdom Jan 9, 2025
4f8bc13
Merge branch 'main' into value-type
jeshecdom Jan 9, 2025
b8ec36f
Fixed CLI command for evaluating expressions.
jeshecdom Jan 9, 2025
9fc2e49
Fixed printed output of CLI command for evaluating expressions.
jeshecdom Jan 9, 2025
c22ae76
Run prettier command.
jeshecdom Jan 9, 2025
06b2bc8
Fixes after last review comments.
jeshecdom Jan 10, 2025
0154c66
Merge branch 'main' into value-type
anton-trunov Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/tact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void meowModule.then(
switch (result.kind) {
case "ok":
{
console.log(result.value);
console.log(main.showValue(result.value));
process.exit(0);
}
break;
Expand Down
129 changes: 73 additions & 56 deletions src/abi/global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@ import {
writeAddress,
writeCell,
writeSlice,
writeString,
} from "../generator/writers/writeConstant";
import {
writeExpression,
writeValue,
} from "../generator/writers/writeExpression";
import { TactConstEvalError, throwCompilationError } from "../errors";
import { evalConstantExpression } from "../constEval";
import { writeExpression } from "../generator/writers/writeExpression";
import { throwCompilationError } from "../errors";
import { getErrorId } from "../types/resolveErrors";
import { AbiFunction } from "./AbiFunction";
import { sha256_sync } from "@ton/crypto";
import path from "path";
import { cwd } from "process";
import { posixNormalize } from "../utils/filePath";
import {
ensureSimplifiedString,
ensureString,
interpretEscapeSequences,
} from "../interpreter";
import { isLiteral } from "../grammar/ast";

export const GlobalFunctions: Map<string, AbiFunction> = new Map([
[
Expand Down Expand Up @@ -52,10 +55,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
ref,
);
}
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);
return toNano(str).toString(10);
},
},
Expand Down Expand Up @@ -106,10 +112,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
ref,
);
}
const str = evalConstantExpression(
resolved[1]!,
ctx.ctx,
) as string;
const resolved1 = resolved[1]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved1).value;
const str = interpretEscapeSequences(
ensureString(resolved1).value,
resolved1.loc,
);
return `throw_unless(${getErrorId(str, ctx.ctx)}, ${writeExpression(resolved[0]!, ctx)})`;
},
},
Expand Down Expand Up @@ -147,10 +156,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
ref,
);
}
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);
let address: Address;
try {
address = Address.parse(str);
Expand Down Expand Up @@ -200,10 +212,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
}

// Load cell data
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);
let c: Cell;
try {
c = Cell.fromBase64(str);
Expand Down Expand Up @@ -239,7 +254,9 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
: "unknown";
const lineCol = ref.interval.getLineAndColumn();
const debugPrint1 = `File ${filePath}:${lineCol.lineNum}:${lineCol.colNum}:`;
const debugPrint2 = writeValue(ref.interval.contents, ctx);
const contentsId = writeString(ref.interval.contents, ctx);
ctx.used(contentsId);
const debugPrint2 = `${contentsId}()`;

if (arg0.kind === "map") {
const exp = writeExpression(resolved[0]!, ctx);
Expand Down Expand Up @@ -360,24 +377,12 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([

// String case
if (arg0.name === "String") {
let str: string | undefined;
const resolved0 = resolved[0]!;

// Try const-eval
try {
str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
} catch (error) {
if (
!(error instanceof TactConstEvalError) ||
error.fatal
)
throw error;
}

// If const-eval did succeed
if (str !== undefined) {
if (isLiteral(resolved0)) {
// FIXME: This one does not need fixing, because it is carried out inside a "isLiteral" check.
// Remove this comment once the optimization step is added
const str = ensureSimplifiedString(resolved0).value;
return BigInt(
"0x" + sha256_sync(str).toString("hex"),
).toString(10);
Expand Down Expand Up @@ -430,10 +435,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
}

// Load slice data
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);
let c: Cell;
try {
c = Cell.fromBase64(str);
Expand Down Expand Up @@ -482,10 +490,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
}

// Load slice data
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);
let c: Cell;
try {
c = beginCell().storeBuffer(Buffer.from(str)).endCell();
Expand Down Expand Up @@ -528,10 +539,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
}

// Load slice data
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);

if (str.length > 32) {
throwCompilationError(
Expand Down Expand Up @@ -573,10 +587,13 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
}

// Load slice data
const str = evalConstantExpression(
resolved[0]!,
ctx.ctx,
) as string;
const resolved0 = resolved[0]!;
// FIXME: When optimizer step added, change the following line to:
// const str = ensureSimplifiedString(resolved0).value;
const str = interpretEscapeSequences(
ensureString(resolved0).value,
resolved0.loc,
);

return `"${str}"c`;
},
Expand Down
Loading
Loading