Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
"test:grammars:tolk": "cd ./server/src/languages/tolk/tree-sitter-tolk/ && tree-sitter test",
"test:grammars:fift": "cd ./server/src/languages/fift/tree-sitter-fift/ && tree-sitter test",
"test:grammars:tlb": "cd ./server/src/languages/tlb/tree-sitter-tlb/ && tree-sitter test",
"play:grammars:func": "cd ./server/src/languages/func/tree-sitter-func/ && tree-sitter build --wasm && tree-sitter playground",
"parse:grammars:func": "cd ./server/src/languages/func/tree-sitter-func/ && tree-sitter parse -D --open-log main.fc",
"test:e2e": "yarn test:e2e:tolk",
"test:e2e:compile": "tsc -p ./server/src/e2e/tsconfig.json",
"test:e2e:tolk": "yarn test:e2e:compile && ts-node server/src/e2e/runTolkTest.ts",
Expand Down
24 changes: 24 additions & 0 deletions server/src/languages/func/psi/Reference.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,13 @@ export class Reference {
}
}
}

if (firstChild?.type === "typed_tuple") {
// [_, int a, int b] = [1, 2];
if (!this.processVariableDeclaration(firstChild, proc, file, state)) {
return false
}
}
}
}
return true
Expand Down Expand Up @@ -358,6 +365,23 @@ export class Reference {
}
}

if (lhs.type === "typed_tuple" || lhs.type === "tensor_expression") {
const vars = lhs.childrenForFieldName("expressions")
for (const variable of vars) {
if (!variable) continue
if (!this.processVariableDeclaration(variable, proc, file, state)) return false
}
}

if (lhs.type === "local_vars_declaration") {
const innerLhs = lhs.childForFieldName("lhs")
if (innerLhs) {
if (!this.processVariableDeclaration(innerLhs, proc, file, state)) {
return false
}
}
}

return true
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/languages/func/tree-sitter-func/grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ const FUNC_GRAMMAR = {
parenthesized_expression: $ => seq("(", $._expression, ")"),
tensor_expression: $ =>
choice(seq("(", ")"), seq("(", field("expressions", commaSep2($._expression)), ")")),
typed_tuple: $ => seq("[", commaSep($._expression), "]"),
typed_tuple: $ => seq("[", field("expressions", commaSep($._expression)), "]"),

// ----------------------------------------------------------
// type system
Expand Down
64 changes: 34 additions & 30 deletions server/src/languages/func/tree-sitter-func/src/grammar.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading