1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

os: clean up file functions, use optionals

This commit is contained in:
Alexander Medvednikov
2019-07-03 21:07:42 +02:00
parent ffb4da791d
commit dec0d961f5
8 changed files with 107 additions and 64 deletions

View File

@ -31,9 +31,15 @@ mut:
}
fn new_cgen(out_name_c string) *CGen {
path:='$TmpPath/$out_name_c'
out := os.create(path) or {
println('failed to create $path')
return &CGen{}
}
gen := &CGen {
out_path: '$TmpPath/$out_name_c'
out: os.create('$TmpPath/$out_name_c')
out_path: path
out: out
}
return gen
}

View File

@ -104,7 +104,8 @@ string res = tos2("");
enc += ' cJSON_AddItemToObject(o, "$name", $enc_name(val.$name)); \n'
}
// cJSON_delete
p.cgen.fns << '$dec return opt_ok(res); \n}'
//p.cgen.fns << '$dec return opt_ok(res); \n}'
p.cgen.fns << '$dec return opt_ok(res, sizeof(res)); \n}'
p.cgen.fns << '/*enc start*/ $enc return o;}'
}

View File

@ -618,7 +618,7 @@ mut args := ''
println('linux cross compilation done. resulting binary: "$v.out_name"')
}
if !v.pref.is_debug && v.out_name_c != 'v.c' && v.out_name_c != 'v_macos.c' {
os.rm('$TmpPath/$v.out_name_c')
//os.rm('$TmpPath/$v.out_name_c')
}
}
@ -882,7 +882,8 @@ fn new_v(args[]string) *V {
if os.file_exists(vroot_path) {
mut vroot := os.read_file(vroot_path) or {
break
}
}
//mut vroot := os.read_file(vroot_path)
vroot=vroot.trim_space()
if os.dir_exists(vroot) && os.dir_exists(vroot + '/vlib/builtin') {
lang_dir = vroot

View File

@ -239,7 +239,10 @@ fn (p mut Parser) parse() {
p.check_unused_variables()
}
if false && !p.first_run() && p.fileis('main.v') {
out := os.create('/var/tmp/fmt.v')
out := os.create('/var/tmp/fmt.v') or {
panic('failed to create fmt.v')
return
}
out.writeln(p.scanner.fmt_out.str())
out.close()
}
@ -670,14 +673,14 @@ fn (p mut Parser) error(s string) {
//q := "SDF"
// Dump all vars and types for debugging
if false {
file_types := os.create('$TmpPath/types')
file_vars := os.create('$TmpPath/vars')
//file_types := os.create('$TmpPath/types')
//file_vars := os.create('$TmpPath/vars')
// ////debug("ALL T", q.J(p.table.types))
// os.write_to_file('/var/tmp/lang.types', '')//pes(p.table.types))
// //debug("ALL V", q.J(p.table.vars))
// os.write_to_file('/var/tmp/lang.vars', q.J(p.table.vars))
file_types.close()
file_vars.close()
//file_types.close()
//file_vars.close()
}
if !p.pref.is_repl {
println('pass=$p.run fn=`$p.cur_fn.name`')
@ -1082,7 +1085,8 @@ fn (p mut Parser) assign_statement(v Var, ph int, is_map bool) {
println('allowing option asss')
expr := p.cgen.cur_line.right(pos)
left := p.cgen.cur_line.left(pos)
p.cgen.cur_line = left + 'opt_ok($expr)'
//p.cgen.cur_line = left + 'opt_ok($expr)'
p.cgen.cur_line = left + 'opt_ok($expr, sizeof($expr_type))'
}
else if !p.builtin_pkg && !p.check_types_no_throw(expr_type, p.assigned_type) {
p.scanner.line_nr--
@ -3030,8 +3034,9 @@ fn (p mut Parser) return_st() {
expr_type := p.bool_expression()
// Automatically wrap an object inside an option if the function returns an option
if p.cur_fn.typ.ends_with(expr_type) && p.cur_fn.typ.starts_with('Option_') {
//p.cgen.set_placeholder(ph, 'opt_ok(& ')
p.cgen.set_placeholder(ph, 'opt_ok(& ')
p.gen(')')
p.gen(', sizeof($expr_type))')
}
p.check_types(expr_type, p.cur_fn.typ)
}

View File

@ -32,6 +32,7 @@ fn new_scanner(file_path string) *Scanner {
if !os.file_exists(file_path) {
panic('"$file_path" doesn\'t exist')
}
//text := os.read_file(file_path)
text := os.read_file(file_path) or {
panic('scanner: failed to open "$file_path"')
return &Scanner{}