vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

checker: cleanup checker.v (#14530)

master
yuyi 2022-05-27 03:52:42 +08:00 committed by GitHub
parent bb6ef8bba8
commit b97ef09b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
vlib/v/checker/checker.v
View File

@ -13,16 +13,14 @@ import v.util.version
import v.errors import v.errors
import v.pkgconfig import v.pkgconfig
const int_min = int(0x80000000) const (
int_min = int(0x80000000)
const int_max = int(0x7FFFFFFF) int_max = int(0x7FFFFFFF)
// prevent stack overflows by restricting too deep recursion:
// prevent stack overflows by restricting too deep recursion: expr_level_cutoff_limit = 40
const expr_level_cutoff_limit = 40 stmt_level_cutoff_limit = 40
iface_level_cutoff_limit = 100
const stmt_level_cutoff_limit = 40 )
const iface_level_cutoff_limit = 100
pub const ( pub const (
valid_comptime_if_os = ['windows', 'ios', 'macos', 'mach', 'darwin', 'hpux', 'gnu', valid_comptime_if_os = ['windows', 'ios', 'macos', 'mach', 'darwin', 'hpux', 'gnu',
@ -58,28 +56,27 @@ fn all_valid_comptime_idents() []string {
pub struct Checker { pub struct Checker {
pref &pref.Preferences // Preferences shared from V struct pref &pref.Preferences // Preferences shared from V struct
pub mut: pub mut:
table &ast.Table table &ast.Table
file &ast.File = 0 file &ast.File = 0
nr_errors int nr_errors int
nr_warnings int nr_warnings int
nr_notices int nr_notices int
errors []errors.Error errors []errors.Error
warnings []errors.Warning warnings []errors.Warning
notices []errors.Notice notices []errors.Notice
error_lines []int // to avoid printing multiple errors for the same line error_lines []int // to avoid printing multiple errors for the same line
expected_type ast.Type expected_type ast.Type
expected_or_type ast.Type // fn() or { 'this type' } eg. string. expected or block type expected_or_type ast.Type // fn() or { 'this type' } eg. string. expected or block type
expected_expr_type ast.Type // if/match is_expr: expected_type expected_expr_type ast.Type // if/match is_expr: expected_type
mod string // current module name mod string // current module name
const_decl string const_decl string
const_deps []string const_deps []string
const_names []string const_names []string
global_names []string global_names []string
locked_names []string // vars that are currently locked locked_names []string // vars that are currently locked
rlocked_names []string // vars that are currently read-locked rlocked_names []string // vars that are currently read-locked
in_for_count int // if checker is currently in a for loop in_for_count int // if checker is currently in a for loop
// checked_ident string // to avoid infinite checker loops should_abort bool // when too many errors/warnings/notices are accumulated, .should_abort becomes true. It is checked in statement/expression loops, so the checker can return early, instead of wasting time.
should_abort bool // when too many errors/warnings/notices are accumulated, .should_abort becomes true. It is checked in statement/expression loops, so the checker can return early, instead of wasting time.
returns bool returns bool
scope_returns bool scope_returns bool
is_builtin_mod bool // true inside the 'builtin', 'os' or 'strconv' modules; TODO: remove the need for special casing this is_builtin_mod bool // true inside the 'builtin', 'os' or 'strconv' modules; TODO: remove the need for special casing this
@ -203,7 +200,7 @@ pub fn (mut c Checker) check(ast_file_ &ast.File) {
return return
} }
} }
//
c.stmt_level = 0 c.stmt_level = 0
for mut stmt in ast_file.stmts { for mut stmt in ast_file.stmts {
if stmt is ast.GlobalDecl { if stmt is ast.GlobalDecl {
@ -214,7 +211,7 @@ pub fn (mut c Checker) check(ast_file_ &ast.File) {
return return
} }
} }
//
c.stmt_level = 0 c.stmt_level = 0
for mut stmt in ast_file.stmts { for mut stmt in ast_file.stmts {
if stmt !is ast.ConstDecl && stmt !is ast.GlobalDecl && stmt !is ast.ExprStmt { if stmt !is ast.ConstDecl && stmt !is ast.GlobalDecl && stmt !is ast.ExprStmt {
@ -225,7 +222,7 @@ pub fn (mut c Checker) check(ast_file_ &ast.File) {
return return
} }
} }
//
c.check_scope_vars(c.file.scope) c.check_scope_vars(c.file.scope)
} }
@ -1892,7 +1889,6 @@ fn (mut c Checker) hash_stmt(mut node ast.HashStmt) {
} }
} }
} }
// println('adding flag "$flag"')
c.table.parse_cflag(flag, c.mod, c.pref.compile_defines_all) or { c.table.parse_cflag(flag, c.mod, c.pref.compile_defines_all) or {
c.error(err.msg(), node.pos) c.error(err.msg(), node.pos)
} }
@ -2107,10 +2103,7 @@ pub fn (mut c Checker) expr(node_ ast.Expr) ast.Type {
return c.chan_init(mut node) return c.chan_init(mut node)
} }
ast.CharLiteral { ast.CharLiteral {
// return int_literal, not rune, so that we can do "bytes << `A`" without a cast etc
// return ast.int_literal_type
return ast.rune_type return ast.rune_type
// return ast.byte_type
} }
ast.Comment { ast.Comment {
return ast.void_type return ast.void_type
@ -2155,10 +2148,7 @@ pub fn (mut c Checker) expr(node_ ast.Expr) ast.Type {
return c.go_expr(mut node) return c.go_expr(mut node)
} }
ast.Ident { ast.Ident {
// c.checked_ident = node.name return c.ident(mut node)
res := c.ident(mut node)
// c.checked_ident = ''
return res
} }
ast.IfExpr { ast.IfExpr {
return c.if_expr(mut node) return c.if_expr(mut node)
@ -2715,13 +2705,6 @@ pub fn (mut c Checker) ident(mut node ast.Ident) ast.Type {
typ: typ typ: typ
is_optional: is_optional is_optional: is_optional
} }
// if typ == ast.t_type {
// sym := c.table.sym(c.cur_generic_type)
// println('IDENT T unresolved $node.name typ=$sym.name')
// Got a var with type T, return current generic type
// typ = c.cur_generic_type
// }
// } else {
if !is_sum_type_cast { if !is_sum_type_cast {
obj.typ = typ obj.typ = typ
} }
@ -3288,9 +3271,6 @@ pub fn (mut c Checker) prefix_expr(mut node ast.PrefixExpr) ast.Type {
fn (mut c Checker) check_index(typ_sym &ast.TypeSymbol, index ast.Expr, index_type ast.Type, pos token.Pos, range_index bool, is_gated bool) { fn (mut c Checker) check_index(typ_sym &ast.TypeSymbol, index ast.Expr, index_type ast.Type, pos token.Pos, range_index bool, is_gated bool) {
index_type_sym := c.table.sym(index_type) index_type_sym := c.table.sym(index_type)
// println('index expr left=$typ_sym.name $node.pos.line_nr')
// if typ_sym.kind == .array && (!(ast.type_idx(index_type) in ast.number_type_idxs) &&
// index_type_sym.kind != .enum_) {
if typ_sym.kind in [.array, .array_fixed, .string] { if typ_sym.kind in [.array, .array_fixed, .string] {
if !(index_type.is_int() || index_type_sym.kind == .enum_ if !(index_type.is_int() || index_type_sym.kind == .enum_
|| (index_type_sym.kind == .alias || (index_type_sym.kind == .alias