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.

Sign up for GitHub

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

Jump to bottom

ast, checker, fmt: fix compiler internal formatting failed #18356

Merged
merged 1 commit into from
Jun 6, 2023
Merged

ast, checker, fmt: fix compiler internal formatting failed #18356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions vlib/v/ast/cflags.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
module ast

import v.cflag
import v.checker.constants

// check if cflag is in table
pub fn (t &Table) has_cflag(flag cflag.CFlag) bool {
Expand All @@ -27,7 +26,7 @@ pub fn (mut t Table) parse_cflag(cflg string, mod string, ctimedefines []string)
}
mut fos := ''
mut allowed_os_overrides := []string{}
allowed_os_overrides << constants.valid_comptime_not_user_defined
allowed_os_overrides << valid_comptime_not_user_defined
allowed_os_overrides << ctimedefines
for os_override in allowed_os_overrides {
if !flag.starts_with(os_override) {
Expand Down
12 changes: 6 additions & 6 deletions vlib/v/checker/constants/constants.v → vlib/v/ast/comptime_valid_idents.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module constants
module ast

pub const (
valid_comptime_if_os = ['windows', 'ios', 'macos', 'mach', 'darwin', 'hpux', 'gnu',
Expand All @@ -16,10 +16,10 @@ pub const (

fn all_valid_comptime_idents() []string {
mut res := []string{}
res << constants.valid_comptime_if_os
res << constants.valid_comptime_if_compilers
res << constants.valid_comptime_if_platforms
res << constants.valid_comptime_if_cpu_features
res << constants.valid_comptime_if_other
res << ast.valid_comptime_if_os
res << ast.valid_comptime_if_compilers
res << ast.valid_comptime_if_platforms
res << ast.valid_comptime_if_cpu_features
res << ast.valid_comptime_if_other
return res
}
3 changes: 1 addition & 2 deletions vlib/v/checker/checker.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import v.util
import v.util.version
import v.errors
import v.pkgconfig
import v.checker.constants

const (
int_min = int(0x80000000)
Expand Down Expand Up @@ -1822,7 +1821,7 @@ fn (mut c Checker) stmt(node_ ast.Stmt) {
for i, ident in node.defer_vars {
mut id := ident
if mut id.info is ast.IdentVar {
if id.comptime && id.name in constants.valid_comptime_not_user_defined {
if id.comptime && id.name in ast.valid_comptime_not_user_defined {
node.defer_vars[i] = ast.Ident{
scope: 0
name: ''
Expand Down
19 changes: 9 additions & 10 deletions vlib/v/checker/comptime.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import v.pref
import v.token
import v.util
import v.pkgconfig
import v.checker.constants

[inline]
fn (mut c Checker) get_comptime_var_type(node ast.Expr) ast.Type {
Expand Down Expand Up @@ -101,8 +100,8 @@ fn (mut c Checker) comptime_call(mut node ast.ComptimeCall) ast.Type {
node.embed_file.apath = escaped_path
}
// c.file.embedded_files << node.embed_file
if node.embed_file.compression_type !in constants.valid_comptime_compression_types {
supported := constants.valid_comptime_compression_types.map('.${it}').join(', ')
if node.embed_file.compression_type !in ast.valid_comptime_compression_types {
supported := ast.valid_comptime_compression_types.map('.${it}').join(', ')
c.error('not supported compression type: .${node.embed_file.compression_type}. supported: ${supported}',
node.pos)
}
Expand Down Expand Up @@ -526,7 +525,7 @@ fn (mut c Checker) evaluate_once_comptime_if_attribute(mut node ast.Attr) bool {
}
if node.ct_expr is ast.Ident {
if node.ct_opt {
if node.ct_expr.name in constants.valid_comptime_not_user_defined {
if node.ct_expr.name in ast.valid_comptime_not_user_defined {
c.error('option `[if expression ?]` tags, can be used only for user defined identifiers',
node.pos)
node.ct_skip = true
Expand All @@ -536,7 +535,7 @@ fn (mut c Checker) evaluate_once_comptime_if_attribute(mut node ast.Attr) bool {
node.ct_evaled = true
return node.ct_skip
} else {
if node.ct_expr.name !in constants.valid_comptime_not_user_defined {
if node.ct_expr.name !in ast.valid_comptime_not_user_defined {
c.note('`[if ${node.ct_expr.name}]` is deprecated. Use `[if ${node.ct_expr.name} ?]` instead',
node.pos)
node.ct_skip = node.ct_expr.name !in c.pref.compile_defines
Expand Down Expand Up @@ -729,20 +728,20 @@ fn (mut c Checker) comptime_if_branch(cond ast.Expr, pos token.Pos) ComptimeBran
}
ast.Ident {
cname := cond.name
if cname in constants.valid_comptime_if_os {
if cname in ast.valid_comptime_if_os {
mut is_os_target_equal := true
if !c.pref.output_cross_c {
target_os := c.pref.os.str().to_lower()
is_os_target_equal = cname == target_os
}
return if is_os_target_equal { .eval } else { .skip }
} else if cname in constants.valid_comptime_if_compilers {
} else if cname in ast.valid_comptime_if_compilers {
return if pref.cc_from_string(cname) == c.pref.ccompiler_type {
.eval
} else {
.skip
}
} else if cname in constants.valid_comptime_if_platforms {
} else if cname in ast.valid_comptime_if_platforms {
if cname == 'aarch64' {
c.note('use `arm64` instead of `aarch64`', pos)
}
Expand All @@ -756,9 +755,9 @@ fn (mut c Checker) comptime_if_branch(cond ast.Expr, pos token.Pos) ComptimeBran
'rv32' { return if c.pref.arch == .rv32 { .eval } else { .skip } }
else { return .unknown }
}
} else if cname in constants.valid_comptime_if_cpu_features {
} else if cname in ast.valid_comptime_if_cpu_features {
return .unknown
} else if cname in constants.valid_comptime_if_other {
} else if cname in ast.valid_comptime_if_other {
match cname {
'apk' {
return if c.pref.is_apk { .eval } else { .skip }
Expand Down
3 changes: 1 addition & 2 deletions vlib/v/fmt/fmt.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import strings
import v.ast
import v.util
import v.pref
import v.checker.constants

const (
bs = '\\'
Expand Down Expand Up @@ -2009,7 +2008,7 @@ pub fn (mut f Fmt) enum_val(node ast.EnumVal) {

pub fn (mut f Fmt) ident(node ast.Ident) {
if node.info is ast.IdentVar {
if node.comptime && node.name in constants.valid_comptime_not_user_defined {
if node.comptime && node.name in ast.valid_comptime_not_user_defined {
f.write(node.name)
return
}
Expand Down