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

ci: fix building vdoc, vls, etc

pull/8574/head
Delyan Angelov 2021-02-05 09:27:14 +02:00
parent 395fcc1476
commit e5c9fcb7e9
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vlib/v/builder/builder.v
View File

@ -27,7 +27,6 @@ pub mut:
parsed_files []ast.File parsed_files []ast.File
cached_msvc MsvcResult cached_msvc MsvcResult
table &table.Table table &table.Table
table2 &ast.Table
timers &util.Timers = util.new_timers(false) timers &util.Timers = util.new_timers(false)
ccoptions CcompilerOptions ccoptions CcompilerOptions
} }
@ -37,7 +36,6 @@ pub fn new_builder(pref &pref.Preferences) Builder {
compiled_dir := if os.is_dir(rdir) { rdir } else { os.dir(rdir) } compiled_dir := if os.is_dir(rdir) { rdir } else { os.dir(rdir) }
mut table := table.new_table() mut table := table.new_table()
table.is_fmt = false table.is_fmt = false
table2 := &ast.Table{}
if pref.use_color == .always { if pref.use_color == .always {
util.emanager.set_support_color(true) util.emanager.set_support_color(true)
} }
@ -55,8 +53,7 @@ pub fn new_builder(pref &pref.Preferences) Builder {
return Builder{ return Builder{
pref: pref pref: pref
table: table table: table
table2: table2 checker: checker.new_checker(table, pref)
checker: checker.new_checker(table, table2, pref)
global_scope: &ast.Scope{ global_scope: &ast.Scope{
parent: 0 parent: 0
} }

2
vlib/v/builder/c.v
View File

@ -22,7 +22,7 @@ pub fn (mut b Builder) gen_c(v_files []string) string {
b.print_warnings_and_errors() b.print_warnings_and_errors()
// TODO: move gen.cgen() to c.gen() // TODO: move gen.cgen() to c.gen()
b.timing_start('C GEN') b.timing_start('C GEN')
res := c.gen(b.parsed_files, b.table, b.table2, b.pref) res := c.gen(b.parsed_files, b.table, b.pref)
b.timing_measure('C GEN') b.timing_measure('C GEN')
// println('cgen done') // println('cgen done')
// println(res) // println(res)

6
vlib/v/checker/checker.v
View File

@ -38,7 +38,6 @@ pub struct Checker {
pref &pref.Preferences // Preferences shared from V struct pref &pref.Preferences // Preferences shared from V struct
pub mut: pub mut:
table &table.Table table &table.Table
table2 &ast.Table
file &ast.File = 0 file &ast.File = 0
nr_errors int nr_errors int
nr_warnings int nr_warnings int
@ -84,14 +83,13 @@ mut:
main_fn_decl_node ast.FnDecl main_fn_decl_node ast.FnDecl
} }
pub fn new_checker(table &table.Table, table2 &ast.Table, pref &pref.Preferences) Checker { pub fn new_checker(table &table.Table, pref &pref.Preferences) Checker {
mut timers_should_print := false mut timers_should_print := false
$if time_checking ? { $if time_checking ? {
timers_should_print = true timers_should_print = true
} }
return Checker{ return Checker{
table: table table: table
table2: table2
pref: pref pref: pref
cur_fn: 0 cur_fn: 0
timers: util.new_timers(timers_should_print) timers: util.new_timers(timers_should_print)
@ -3859,7 +3857,7 @@ fn (mut c Checker) comptime_call(mut node ast.ComptimeCall) table.Type {
...pref_ ...pref_
is_vweb: true is_vweb: true
} }
mut c2 := new_checker(c.table, c.table2, pref2) mut c2 := new_checker(c.table, pref2)
c2.check(node.vweb_tmpl) c2.check(node.vweb_tmpl)
mut i := 0 // tmp counter var for skipping first three tmpl vars mut i := 0 // tmp counter var for skipping first three tmpl vars
for k, _ in c2.file.scope.children[0].objects { for k, _ in c2.file.scope.children[0].objects {

4
vlib/v/gen/c/cgen.v
View File

@ -32,7 +32,6 @@ struct Gen {
module_built string module_built string
mut: mut:
table &table.Table table &table.Table
table2 &ast.Table
out strings.Builder out strings.Builder
cheaders strings.Builder cheaders strings.Builder
includes strings.Builder // all C #includes required by V modules includes strings.Builder // all C #includes required by V modules
@ -154,7 +153,7 @@ mut:
// main_fn_decl_node ast.FnDecl // main_fn_decl_node ast.FnDecl
} }
pub fn gen(files []ast.File, table &table.Table, table2 &ast.Table, pref &pref.Preferences) string { pub fn gen(files []ast.File, table &table.Table, pref &pref.Preferences) string {
// println('start cgen2') // println('start cgen2')
mut module_built := '' mut module_built := ''
if pref.build_mode == .build_module { if pref.build_mode == .build_module {
@ -193,7 +192,6 @@ pub fn gen(files []ast.File, table &table.Table, table2 &ast.Table, pref &pref.P
enum_typedefs: strings.new_builder(100) enum_typedefs: strings.new_builder(100)
sql_buf: strings.new_builder(100) sql_buf: strings.new_builder(100)
table: table table: table
table2: table2
pref: pref pref: pref
fn_decl: 0 fn_decl: 0
is_autofree: true is_autofree: true