mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: simplify global_scope processing (#10848)

Browse Source
This commit is contained in:
yuyi
2021-07-18 20:29:34 +08:00
committed by GitHub
parent eb65ad078d
commit a5c784830b
16 changed files with 35 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/tools/vast/vast.v
View File

@@ -131,13 +131,9 @@ fn json(file string) string {
root: new_object()
table: ast.new_table()
pref: pref
global_scope: &ast.Scope{
start_pos: 0
parent: 0
}
}
// parse file with comment
ast_file := parser.parse_file(file, t.table, .parse_comments, t.pref, t.global_scope)
ast_file := parser.parse_file(file, t.table, .parse_comments, t.pref)
t.root = t.ast_file(ast_file)
// generate the ast string
s := json_print(t.root)
@@ -146,9 +142,8 @@ fn json(file string) string {
// the ast tree
struct Tree {
table &ast.Table
pref &pref.Preferences
global_scope &ast.Scope
table &ast.Table
pref &pref.Preferences
mut:
root Node // the root of tree
}

8
cmd/tools/vfmt.v
View File

@@ -151,9 +151,7 @@ fn (foptions &FormatOptions) format_file(file string) {
}
table := ast.new_table()
// checker := checker.new_checker(table, prefs)
file_ast := parser.parse_file(file, table, .parse_comments, prefs, &ast.Scope{
parent: 0
})
file_ast := parser.parse_file(file, table, .parse_comments, prefs)
// checker.check(file_ast)
formatted_content := fmt.fmt(file_ast, table, prefs, foptions.is_debug)
file_name := os.file_name(file)
@@ -175,9 +173,7 @@ fn (foptions &FormatOptions) format_pipe() {
input_text := os.get_raw_lines_joined()
table := ast.new_table()
// checker := checker.new_checker(table, prefs)
file_ast := parser.parse_text(input_text, '', table, .parse_comments, prefs, &ast.Scope{
parent: 0
})
file_ast := parser.parse_text(input_text, '', table, .parse_comments, prefs)
// checker.check(file_ast)
formatted_content := fmt.fmt(file_ast, table, prefs, foptions.is_debug)
print(formatted_content)

3
cmd/tools/vtest-parser.v
View File

@@ -61,8 +61,7 @@ fn main() {
time.sleep(ms * time.millisecond)
exit(ecode_timeout)
}(context.timeout_ms)
_ := parser.parse_text(source, context.path, context.table, .skip_comments, context.pref,
context.scope)
_ := parser.parse_text(source, context.path, context.table, .skip_comments, context.pref)
context.log('> worker ${pid:5} finished parsing $context.path')
exit(0)
} else {