From aa90625819193f7bbd46c6f078725e4608d65bd6 Mon Sep 17 00:00:00 2001 From: pancake Date: Tue, 24 Nov 2020 12:54:26 +0100 Subject: [PATCH] js: initial support for optional return unwrapping (#6926) --- vlib/builtin/js/builtin.v | 45 +++++++++++++++++++++++++++++++++++++++ vlib/v/gen/js/js.v | 10 ++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/vlib/builtin/js/builtin.v b/vlib/builtin/js/builtin.v index a4ca33f78d..a86d32ff5f 100644 --- a/vlib/builtin/js/builtin.v +++ b/vlib/builtin/js/builtin.v @@ -37,7 +37,52 @@ pub fn exit(c int) { JS.process.exit(c) } +pub fn unwrap(opt any) any { + o := &Option(opt) + if o.not_ok { + panic(o.error) + return o.error + } + return opt +} + pub fn panic(s string) { eprintln('V panic: $s') exit(1) } + + +struct Option { + not_ok bool + is_none bool + error string + ecode int + data any +} + +pub fn (o Option) str() string { + if !o.not_ok { + return 'Option{ ok }' + } + if o.is_none { + return 'Option{ none }' + } + return 'Option{ error: "${o.error}" }' +} + +pub fn error(s string) Option { + return Option{ + not_ok: true + is_none: false + error: s + } +} + +pub fn error_with_code(s string, code int) Option { + return Option{ + not_ok: true + is_none: false + error: s + ecode: code + } +} diff --git a/vlib/v/gen/js/js.v b/vlib/v/gen/js/js.v index c5db32feb0..54c8d799c3 100644 --- a/vlib/v/gen/js/js.v +++ b/vlib/v/gen/js/js.v @@ -1175,6 +1175,10 @@ fn (mut g JsGen) gen_call_expr(it ast.CallExpr) { } else { name = g.js_name(it.name) } + call_return_is_optional := it.return_type.has_flag(.optional) + if call_return_is_optional { + g.write('builtin.unwrap(') + } g.expr(it.left) if it.is_method { // foo.bar.baz() sym := g.table.get_type_symbol(it.receiver_type) @@ -1224,7 +1228,11 @@ fn (mut g JsGen) gen_call_expr(it ast.CallExpr) { g.write(', ') } } - g.write(')') + if call_return_is_optional { + g.write('))') + } else { + g.write(')') + } } fn (mut g JsGen) gen_ident(node ast.Ident) {