andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #467 from ikrima/fix-addrspace-section

Browse Source 
fix: ast.lasttoken() does not handle addrspace section
This commit is contained in:
Auguste Rame 2022-03-01 21:18:54 -05:00 committed by GitHub
commit 4e6564d7da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ast.zig
View File

@ -744,7 +744,7 @@ pub fn lastToken(tree: Ast, node: Ast.Node.Index) Ast.TokenIndex {
}, },
.fn_proto_one => { .fn_proto_one => {
const extra = tree.extraData(datas[n].lhs, Node.FnProtoOne); const extra = tree.extraData(datas[n].lhs, Node.FnProtoOne);
// linksection, callconv, align can appear in any order, so we // addrspace, linksection, callconv, align can appear in any order, so we
// find the last one here. // find the last one here.
// rhs can be zero if no return type is provided // rhs can be zero if no return type is provided
var max_node: Node.Index = 0; var max_node: Node.Index = 0;
@ -763,6 +763,14 @@ pub fn lastToken(tree: Ast, node: Ast.Node.Index) Ast.TokenIndex {
max_offset = 1; // for the rparen max_offset = 1; // for the rparen
} }
} }
if (extra.addrspace_expr != 0) {
const start = token_starts[main_tokens[extra.addrspace_expr]];
if (start > max_start) {
max_node = extra.addrspace_expr;
max_start = start;
max_offset = 1; // for the rparen
}
}
if (extra.section_expr != 0) { if (extra.section_expr != 0) {
const start = token_starts[main_tokens[extra.section_expr]]; const start = token_starts[main_tokens[extra.section_expr]];
if (start > max_start) { if (start > max_start) {
@ -797,7 +805,7 @@ pub fn lastToken(tree: Ast, node: Ast.Node.Index) Ast.TokenIndex {
}, },
.fn_proto => { .fn_proto => {
const extra = tree.extraData(datas[n].lhs, Node.FnProto); const extra = tree.extraData(datas[n].lhs, Node.FnProto);
// linksection, callconv, align can appear in any order, so we // addrspace, linksection, callconv, align can appear in any order, so we
// find the last one here. // find the last one here.
// rhs can be zero if no return type is provided // rhs can be zero if no return type is provided
var max_node: Node.Index = 0; var max_node: Node.Index = 0;
@ -816,6 +824,14 @@ pub fn lastToken(tree: Ast, node: Ast.Node.Index) Ast.TokenIndex {
max_offset = 1; // for the rparen max_offset = 1; // for the rparen
} }
} }
if (extra.addrspace_expr != 0) {
const start = token_starts[main_tokens[extra.addrspace_expr]];
if (start > max_start) {
max_node = extra.addrspace_expr;
max_start = start;
max_offset = 1; // for the rparen
}
}
if (extra.section_expr != 0) { if (extra.section_expr != 0) {
const start = token_starts[main_tokens[extra.section_expr]]; const start = token_starts[main_tokens[extra.section_expr]];
if (start > max_start) { if (start > max_start) {