From 6696e1a6e2bb64ba633ee519b62ef745121e9bc9 Mon Sep 17 00:00:00 2001 From: joe-conigliaro Date: Sat, 25 Apr 2020 17:54:32 +1000 Subject: [PATCH] table: move set_nr_muls to method --- vlib/v/parser/parse_type.v | 4 ++-- vlib/v/table/atypes.v | 2 +- vlib/v/table/table.v | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vlib/v/parser/parse_type.v b/vlib/v/parser/parse_type.v index 2c3cd4ad19..b680e9dc7b 100644 --- a/vlib/v/parser/parse_type.v +++ b/vlib/v/parser/parse_type.v @@ -87,7 +87,7 @@ pub fn (mut p Parser) parse_fn_type(name string) table.Type { pub fn (mut p Parser) parse_type_with_mut(is_mut bool) table.Type { typ := p.parse_type() if is_mut { - return table.type_set_nr_muls(typ, 1) + return typ.set_nr_muls(1) } return typ } @@ -124,7 +124,7 @@ pub fn (mut p Parser) parse_type() table.Type { typ = typ.set_flag(.optional) } if nr_muls > 0 { - typ = table.type_set_nr_muls(typ, nr_muls) + typ = typ.set_nr_muls(nr_muls) } return typ } diff --git a/vlib/v/table/atypes.v b/vlib/v/table/atypes.v index 3dd8ca5ee2..6a74488703 100644 --- a/vlib/v/table/atypes.v +++ b/vlib/v/table/atypes.v @@ -64,7 +64,7 @@ pub fn (t Type) is_ptr() bool { // set nr_muls on `t` and return it [inline] -pub fn type_set_nr_muls(t Type, nr_muls int) Type { +pub fn (t Type) set_nr_muls(nr_muls int) Type { if nr_muls < 0 || nr_muls > 255 { panic('typ_set_nr_muls: nr_muls must be between 0 & 255') } diff --git a/vlib/v/table/table.v b/vlib/v/table/table.v index d198b89198..13911885b4 100644 --- a/vlib/v/table/table.v +++ b/vlib/v/table/table.v @@ -55,7 +55,7 @@ pub fn (f &Fn) signature() string { mut sig := '' for i, arg in f.args { // TODO: for now ignore mut/pts in sig for now - typ := type_set_nr_muls(arg.typ, 0) + typ := arg.typ.set_nr_muls(0) // if arg.is_mut { // sig += 'mut_' // }