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.

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

parser: fix case of falsely registering imports as used, remove unused imports #21156

Merged
merged 7 commits into from
Apr 1, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/pendulum-simulation/modules/sim/anim/worker.v
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module anim

import benchmark
import sim
import sim.img

fn pixels_worker(mut app App) {
Expand Down
1 change: 0 additions & 1 deletion examples/sokol/fonts.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sokol
import sokol.sapp
import sokol.gfx
import sokol.sgl
Expand Down
1 change: 0 additions & 1 deletion examples/sokol/freetype_raven.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sokol
import sokol.sapp
import sokol.gfx
import sokol.sgl
Expand Down
3 changes: 1 addition & 2 deletions vlib/gg/draw.c.v
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
module gg

import gx
import sokol
import sokol.sgl
import math
import sokol.sgl

// draw_pixel draws one pixel on the screen.
//
Expand Down
1 change: 0 additions & 1 deletion vlib/gg/gg.c.v
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module gg
import os
import os.font
import gx
import sokol
import sokol.sapp
import sokol.sgl
import sokol.gfx
Expand Down
1 change: 0 additions & 1 deletion vlib/math/big/division_array_ops.v
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module big

import math
import math.bits

// suppose operand_a bigger than operand_b and both not null.
Expand Down
1 change: 0 additions & 1 deletion vlib/v/builder/cbuilder/parallel_cc.v
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module cbuilder

import os
import time
import sync
import v.util
import v.builder
import sync.pool
Expand Down
1 change: 0 additions & 1 deletion vlib/v/builder/compile.v
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module builder
import os
import v.pref
import v.util
import v.checker

pub type FnBackend = fn (mut b Builder)

Expand Down
1 change: 0 additions & 1 deletion vlib/v/builder/msvc_windows.v
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module builder

import os
import time
import v.pref
import v.util
import v.cflag

Expand Down
1 change: 0 additions & 1 deletion vlib/v/checker/assign.v
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
module checker

import v.ast
import v.pref

// TODO: 600 line function
fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) {
Expand Down
1 change: 0 additions & 1 deletion vlib/v/checker/fn.v
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module checker

import v.ast
import v.pref
import v.util
import v.token

Expand Down
1 change: 0 additions & 1 deletion vlib/v/checker/if.v
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
module checker

import v.ast
import v.pref
import v.token

fn (mut c Checker) check_compatible_types(left_type ast.Type, right ast.TypeNode) ComptimeBranchSkipState {
Expand Down
1 change: 0 additions & 1 deletion vlib/v/checker/infix.v
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module checker

import v.ast
import v.pref
import v.token

fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
Expand Down
1 change: 0 additions & 1 deletion vlib/v/checker/return.v
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
module checker

import v.ast
import v.pref

// error_type_name returns a proper type name reference for error messages
// ? => Option type
Expand Down
168 changes: 84 additions & 84 deletions vlib/v/checker/tests/mul_op_wrong_type_err.out
Original file line number Diff line number Diff line change
@@ -1,98 +1,98 @@
vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: mismatched types `Aaa` and `int literal`
3 | struct Aaa{}
4 | fn main() {
5 | println(Aaa{} * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:4:13: error: mismatched types `Aaa` and `int literal`
2 | struct Aaa{}
3 | fn main() {
4 | println(Aaa{} * 10)
| ~~~~~~~~~~
6 | println(10 * Aaa{})
7 | println([1,2,3] * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: infix expr: cannot use `int literal` (right expression) as `Aaa`
3 | struct Aaa{}
4 | fn main() {
5 | println(Aaa{} * 10)
5 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:4:13: error: infix expr: cannot use `int literal` (right expression) as `Aaa`
2 | struct Aaa{}
3 | fn main() {
4 | println(Aaa{} * 10)
| ~~~~~~~~~~
6 | println(10 * Aaa{})
7 | println([1,2,3] * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:13: error: mismatched types `int literal` and `Aaa`
4 | fn main() {
5 | println(Aaa{} * 10)
6 | println(10 * Aaa{})
5 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: mismatched types `int literal` and `Aaa`
3 | fn main() {
4 | println(Aaa{} * 10)
5 | println(10 * Aaa{})
| ~~~~~~~~~~
7 | println([1,2,3] * 10)
8 | println(10 * [1,2,3])
vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:13: error: infix expr: cannot use `Aaa` (right expression) as `int literal`
4 | fn main() {
5 | println(Aaa{} * 10)
6 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
7 | println(10 * [1,2,3])
vlib/v/checker/tests/mul_op_wrong_type_err.vv:5:13: error: infix expr: cannot use `Aaa` (right expression) as `int literal`
3 | fn main() {
4 | println(Aaa{} * 10)
5 | println(10 * Aaa{})
| ~~~~~~~~~~
7 | println([1,2,3] * 10)
8 | println(10 * [1,2,3])
vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: mismatched types `[]int` and `int literal`
5 | println(Aaa{} * 10)
6 | println(10 * Aaa{})
7 | println([1,2,3] * 10)
6 | println([1,2,3] * 10)
7 | println(10 * [1,2,3])
vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:13: error: mismatched types `[]int` and `int literal`
4 | println(Aaa{} * 10)
5 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
| ~~~~~~~~~~~~
8 | println(10 * [1,2,3])
9 | a := map[string]int
vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: infix expr: cannot use `int literal` (right expression) as `[]int`
5 | println(Aaa{} * 10)
6 | println(10 * Aaa{})
7 | println([1,2,3] * 10)
7 | println(10 * [1,2,3])
8 | a := map[string]int
vlib/v/checker/tests/mul_op_wrong_type_err.vv:6:13: error: infix expr: cannot use `int literal` (right expression) as `[]int`
4 | println(Aaa{} * 10)
5 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
| ~~~~~~~~~~~~
8 | println(10 * [1,2,3])
9 | a := map[string]int
vlib/v/checker/tests/mul_op_wrong_type_err.vv:8:13: error: mismatched types `int literal` and `[]int`
6 | println(10 * Aaa{})
7 | println([1,2,3] * 10)
8 | println(10 * [1,2,3])
7 | println(10 * [1,2,3])
8 | a := map[string]int
vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: mismatched types `int literal` and `[]int`
5 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
7 | println(10 * [1,2,3])
| ~~~~~~~~~~~~
9 | a := map[string]int
10 | println(a * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:8:13: error: infix expr: cannot use `[]int` (right expression) as `int literal`
6 | println(10 * Aaa{})
7 | println([1,2,3] * 10)
8 | println(10 * [1,2,3])
8 | a := map[string]int
9 | println(a * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:7:13: error: infix expr: cannot use `[]int` (right expression) as `int literal`
5 | println(10 * Aaa{})
6 | println([1,2,3] * 10)
7 | println(10 * [1,2,3])
| ~~~~~~~~~~~~
9 | a := map[string]int
10 | println(a * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: mismatched types `map[string]int` and `int literal`
8 | println(10 * [1,2,3])
9 | a := map[string]int
10 | println(a * 10)
8 | a := map[string]int
9 | println(a * 10)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:9:13: error: mismatched types `map[string]int` and `int literal`
7 | println(10 * [1,2,3])
8 | a := map[string]int
9 | println(a * 10)
| ~~~~~~
11 | println(10 * a)
12 | c1 := cmplx.complex(1,-2)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: infix expr: cannot use `int literal` (right expression) as `map[string]int`
8 | println(10 * [1,2,3])
9 | a := map[string]int
10 | println(a * 10)
10 | println(10 * a)
11 | c1 := cmplx.complex(1,-2)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:9:13: error: infix expr: cannot use `int literal` (right expression) as `map[string]int`
7 | println(10 * [1,2,3])
8 | a := map[string]int
9 | println(a * 10)
| ~~~~~~
11 | println(10 * a)
12 | c1 := cmplx.complex(1,-2)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:11:13: error: mismatched types `int literal` and `map[string]int`
9 | a := map[string]int
10 | println(a * 10)
11 | println(10 * a)
10 | println(10 * a)
11 | c1 := cmplx.complex(1,-2)
vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: mismatched types `int literal` and `map[string]int`
8 | a := map[string]int
9 | println(a * 10)
10 | println(10 * a)
| ~~~~~~
12 | c1 := cmplx.complex(1,-2)
13 | c2 := c1 * 2.0
vlib/v/checker/tests/mul_op_wrong_type_err.vv:11:13: error: infix expr: cannot use `map[string]int` (right expression) as `int literal`
9 | a := map[string]int
10 | println(a * 10)
11 | println(10 * a)
11 | c1 := cmplx.complex(1,-2)
12 | c2 := c1 * 2.0
vlib/v/checker/tests/mul_op_wrong_type_err.vv:10:13: error: infix expr: cannot use `map[string]int` (right expression) as `int literal`
8 | a := map[string]int
9 | println(a * 10)
10 | println(10 * a)
| ~~~~~~
12 | c1 := cmplx.complex(1,-2)
13 | c2 := c1 * 2.0
vlib/v/checker/tests/mul_op_wrong_type_err.vv:13:8: error: infix expr: cannot use `float literal` (right expression) as `math.complex.Complex`
11 | println(10 * a)
12 | c1 := cmplx.complex(1,-2)
13 | c2 := c1 * 2.0
11 | c1 := cmplx.complex(1,-2)
12 | c2 := c1 * 2.0
vlib/v/checker/tests/mul_op_wrong_type_err.vv:12:8: error: infix expr: cannot use `float literal` (right expression) as `math.complex.Complex`
10 | println(10 * a)
11 | c1 := cmplx.complex(1,-2)
12 | c2 := c1 * 2.0
| ~~~~~~~~
14 | println(c2)
15 | c3 := 2.0 * c1
vlib/v/checker/tests/mul_op_wrong_type_err.vv:15:8: error: infix expr: cannot use `math.complex.Complex` (right expression) as `float literal`
13 | c2 := c1 * 2.0
14 | println(c2)
15 | c3 := 2.0 * c1
13 | println(c2)
14 | c3 := 2.0 * c1
vlib/v/checker/tests/mul_op_wrong_type_err.vv:14:8: error: infix expr: cannot use `math.complex.Complex` (right expression) as `float literal`
12 | c2 := c1 * 2.0
13 | println(c2)
14 | c3 := 2.0 * c1
| ~~~~~~~~
16 | println(c3)
17 | }
15 | println(c3)
16 | }
1 change: 0 additions & 1 deletion vlib/v/checker/tests/mul_op_wrong_type_err.vv
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import math
import math.complex as cmplx
struct Aaa{}
fn main() {
Expand Down
12 changes: 12 additions & 0 deletions vlib/v/checker/tests/unused_import_err.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
vlib/v/checker/tests/unused_import_err.vv:1:8: warning: module 'te (term)' is imported but never used
1 | import term as te
| ~~~~
2 | import te.ui
vlib/v/checker/tests/unused_import_err.vv:2:8: warning: module 'ui (te.ui)' is imported but never used
1 | import term as te
2 | import te.ui
| ~~~~~
vlib/v/checker/tests/unused_import_err.vv:2:1: builder error: cannot import module "te.ui" (not found)
1 | import term as te
2 | import te.ui
| ~~~~~~~~~~~~
2 changes: 2 additions & 0 deletions vlib/v/checker/tests/unused_import_err.vv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import term as te
import te.ui
1 change: 0 additions & 1 deletion vlib/v/gen/js/comptime.v
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module js

import v.ast
import v.pref

fn (mut g JsGen) comptime_if(node ast.IfExpr) {
if !node.is_expr && !node.has_else && node.branches.len == 1 {
Expand Down
1 change: 0 additions & 1 deletion vlib/v/parser/comptime.v
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module parser

import os
import v.ast
import v.pref
import v.token

const supported_comptime_calls = ['html', 'tmpl', 'env', 'embed_file', 'pkgconfig', 'compile_error',
Expand Down
2 changes: 1 addition & 1 deletion vlib/v/parser/parser.v
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ fn (mut p Parser) check_js_name() string {
fn (mut p Parser) check_name() string {
pos := p.tok.pos()
name := p.tok.lit
if p.peek_tok.kind == .dot && name in p.imports {
if p.tok.kind != .name && p.peek_tok.kind == .dot && name in p.imports {
p.register_used_import(name)
}
match p.tok.kind {
Expand Down
1 change: 0 additions & 1 deletion vlib/x/sessions/tests/session_app_test.v
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import net.http
import os
import time
import x.sessions
import x.vweb
Expand Down