diff --git a/vlib/v/checker/tests/comptime_env/env_parser_errors_1.run.out b/vlib/v/checker/tests/comptime_env/env_parser_errors_1.run.out index b66beac804..098d716ef6 100644 --- a/vlib/v/checker/tests/comptime_env/env_parser_errors_1.run.out +++ b/vlib/v/checker/tests/comptime_env/env_parser_errors_1.run.out @@ -1,3 +1,3 @@ -vlib/v/checker/tests/comptime_env/env_parser_errors_1.vv:1:3: error: supply an env variable name like HOME, PATH or USER +vlib/v/checker/tests/comptime_env/env_parser_errors_1.vv:1:1: error: supply an env variable name like HOME, PATH or USER 1 | #flag -I $env('')/xyz - | ~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~ diff --git a/vlib/v/checker/tests/comptime_env/env_parser_errors_2.run.out b/vlib/v/checker/tests/comptime_env/env_parser_errors_2.run.out index 4c8cd7cac3..0cc6a11a6b 100644 --- a/vlib/v/checker/tests/comptime_env/env_parser_errors_2.run.out +++ b/vlib/v/checker/tests/comptime_env/env_parser_errors_2.run.out @@ -1,3 +1,3 @@ -vlib/v/checker/tests/comptime_env/env_parser_errors_2.vv:1:3: error: cannot use string interpolation in compile time $env() expression +vlib/v/checker/tests/comptime_env/env_parser_errors_2.vv:1:1: error: cannot use string interpolation in compile time $env() expression 1 | #flag -I $env('$ABC')/xyz - | ~~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/vlib/v/checker/tests/comptime_env/env_parser_errors_3.run.out b/vlib/v/checker/tests/comptime_env/env_parser_errors_3.run.out index df1f0cd5f3..eab023135a 100644 --- a/vlib/v/checker/tests/comptime_env/env_parser_errors_3.run.out +++ b/vlib/v/checker/tests/comptime_env/env_parser_errors_3.run.out @@ -1,3 +1,3 @@ -vlib/v/checker/tests/comptime_env/env_parser_errors_3.vv:1:3: error: no "$env('...')" could be found in "-I $env()/xyz". +vlib/v/checker/tests/comptime_env/env_parser_errors_3.vv:1:1: error: no "$env('...')" could be found in "-I $env()/xyz". 1 | #flag -I $env()/xyz - | ~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~ diff --git a/vlib/v/checker/tests/comptime_env/using_comptime_env.run.out b/vlib/v/checker/tests/comptime_env/using_comptime_env.run.out index a6e9193719..962652a44b 100644 --- a/vlib/v/checker/tests/comptime_env/using_comptime_env.run.out +++ b/vlib/v/checker/tests/comptime_env/using_comptime_env.run.out @@ -1,11 +1,11 @@ -vlib/v/checker/tests/comptime_env/using_comptime_env.vv:1:3: error: the environment variable "VAR" does not exist. +vlib/v/checker/tests/comptime_env/using_comptime_env.vv:1:1: error: the environment variable "VAR" does not exist. 1 | #flag -I $env('VAR')/xyz - | ~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~ 2 | #include "$env('VAR')/stdio.h" 3 | -vlib/v/checker/tests/comptime_env/using_comptime_env.vv:2:3: error: the environment variable "VAR" does not exist. +vlib/v/checker/tests/comptime_env/using_comptime_env.vv:2:1: error: the environment variable "VAR" does not exist. 1 | #flag -I $env('VAR')/xyz 2 | #include "$env('VAR')/stdio.h" - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 3 | 4 | fn main() { diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v index d47e18ba91..e568969222 100644 --- a/vlib/v/scanner/scanner.v +++ b/vlib/v/scanner/scanner.v @@ -894,7 +894,7 @@ fn (mut s Scanner) text_scan() token.Token { return s.new_token(.comment, comment, comment.len + 2) } hash := s.text[start..s.pos].trim_space() - return s.new_token(.hash, hash, hash.len) + return s.new_token(.hash, hash, hash.len + 2) } `>` { if nextc == `=` {