table: rename Arg to Param (#6337)
parent
ea2b2ebc07
commit
eb95a4333a
|
@ -242,7 +242,7 @@ pub struct FnDecl {
|
||||||
pub:
|
pub:
|
||||||
name string
|
name string
|
||||||
mod string
|
mod string
|
||||||
args []table.Arg // parameters
|
args []table.Param
|
||||||
is_deprecated bool
|
is_deprecated bool
|
||||||
is_pub bool
|
is_pub bool
|
||||||
is_variadic bool
|
is_variadic bool
|
||||||
|
|
|
@ -199,7 +199,7 @@ fn (mut g Gen) write_defer_stmts_when_needed() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// fn decl args
|
// fn decl args
|
||||||
fn (mut g Gen) fn_args(args []table.Arg, is_variadic bool) ([]string, []string) {
|
fn (mut g Gen) fn_args(args []table.Param, is_variadic bool) ([]string, []string) {
|
||||||
mut fargs := []string{}
|
mut fargs := []string{}
|
||||||
mut fargtypes := []string{}
|
mut fargtypes := []string{}
|
||||||
no_names := args.len > 0 && args[0].name == 'arg_1'
|
no_names := args.len > 0 && args[0].name == 'arg_1'
|
||||||
|
|
|
@ -296,7 +296,7 @@ pub fn (mut g JsGen) typ(t table.Type) string {
|
||||||
return styp
|
return styp
|
||||||
}
|
}
|
||||||
|
|
||||||
fn (mut g JsGen) fn_typ(args []table.Arg, return_type table.Type) string {
|
fn (mut g JsGen) fn_typ(args []table.Param, return_type table.Type) string {
|
||||||
mut res := '('
|
mut res := '('
|
||||||
for i, arg in args {
|
for i, arg in args {
|
||||||
res += '$arg.name: ${g.typ(arg.typ)}'
|
res += '$arg.name: ${g.typ(arg.typ)}'
|
||||||
|
@ -897,7 +897,7 @@ fn (mut g JsGen) gen_method_decl(it ast.FnDecl) {
|
||||||
g.fn_decl = voidptr(0)
|
g.fn_decl = voidptr(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn (mut g JsGen) fn_args(args []table.Arg, is_variadic bool) {
|
fn (mut g JsGen) fn_args(args []table.Param, is_variadic bool) {
|
||||||
// no_names := args.len > 0 && args[0].name == 'arg_1'
|
// no_names := args.len > 0 && args[0].name == 'arg_1'
|
||||||
for i, arg in args {
|
for i, arg in args {
|
||||||
name := g.js_name(arg.name)
|
name := g.js_name(arg.name)
|
||||||
|
|
|
@ -158,7 +158,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
|
||||||
mut receiver_pos := token.Position{}
|
mut receiver_pos := token.Position{}
|
||||||
mut rec_type := table.void_type
|
mut rec_type := table.void_type
|
||||||
mut rec_mut := false
|
mut rec_mut := false
|
||||||
mut args := []table.Arg{}
|
mut args := []table.Param{}
|
||||||
if p.tok.kind == .lpar {
|
if p.tok.kind == .lpar {
|
||||||
p.next() // (
|
p.next() // (
|
||||||
is_method = true
|
is_method = true
|
||||||
|
@ -197,7 +197,7 @@ fn (mut p Parser) fn_decl() ast.FnDecl {
|
||||||
rec_type = rec_type.set_flag(.atomic_f)
|
rec_type = rec_type.set_flag(.atomic_f)
|
||||||
}
|
}
|
||||||
sym := p.table.get_type_symbol(rec_type)
|
sym := p.table.get_type_symbol(rec_type)
|
||||||
args << table.Arg{
|
args << table.Param{
|
||||||
pos: rec_start_pos
|
pos: rec_start_pos
|
||||||
name: rec_name
|
name: rec_name
|
||||||
is_mut: rec_mut
|
is_mut: rec_mut
|
||||||
|
@ -397,9 +397,9 @@ fn (mut p Parser) anon_fn() ast.AnonFn {
|
||||||
}
|
}
|
||||||
|
|
||||||
// part of fn declaration
|
// part of fn declaration
|
||||||
fn (mut p Parser) fn_args() ([]table.Arg, bool, bool) {
|
fn (mut p Parser) fn_args() ([]table.Param, bool, bool) {
|
||||||
p.check(.lpar)
|
p.check(.lpar)
|
||||||
mut args := []table.Arg{}
|
mut args := []table.Param{}
|
||||||
mut is_variadic := false
|
mut is_variadic := false
|
||||||
// `int, int, string` (no names, just types)
|
// `int, int, string` (no names, just types)
|
||||||
argname := if p.tok.kind == .name && p.tok.lit.len > 0 && p.tok.lit[0].is_capital() { p.prepend_mod(p.tok.lit) } else { p.tok.lit }
|
argname := if p.tok.kind == .name && p.tok.lit.len > 0 && p.tok.lit[0].is_capital() { p.prepend_mod(p.tok.lit) } else { p.tok.lit }
|
||||||
|
@ -458,7 +458,7 @@ fn (mut p Parser) fn_args() ([]table.Arg, bool, bool) {
|
||||||
p.next()
|
p.next()
|
||||||
}
|
}
|
||||||
sym := p.table.get_type_symbol(arg_type)
|
sym := p.table.get_type_symbol(arg_type)
|
||||||
args << table.Arg{
|
args << table.Param{
|
||||||
pos: pos
|
pos: pos
|
||||||
name: arg_name
|
name: arg_name
|
||||||
is_mut: is_mut
|
is_mut: is_mut
|
||||||
|
@ -520,7 +520,7 @@ fn (mut p Parser) fn_args() ([]table.Arg, bool, bool) {
|
||||||
}
|
}
|
||||||
for i, arg_name in arg_names {
|
for i, arg_name in arg_names {
|
||||||
sym := p.table.get_type_symbol(typ)
|
sym := p.table.get_type_symbol(typ)
|
||||||
args << table.Arg{
|
args << table.Param{
|
||||||
pos: arg_pos[i]
|
pos: arg_pos[i]
|
||||||
name: arg_name
|
name: arg_name
|
||||||
is_mut: is_mut
|
is_mut: is_mut
|
||||||
|
|
|
@ -387,9 +387,9 @@ fn (mut p Parser) interface_decl() ast.InterfaceDecl {
|
||||||
p.error('interface methods cannot contain uppercase letters, use snake_case instead')
|
p.error('interface methods cannot contain uppercase letters, use snake_case instead')
|
||||||
}
|
}
|
||||||
// field_names << name
|
// field_names << name
|
||||||
args2, _, _ := p.fn_args() // TODO merge table.Arg and ast.Arg to avoid this
|
args2, _, _ := p.fn_args() // TODO merge table.Param and ast.Arg to avoid this
|
||||||
sym := p.table.get_type_symbol(typ)
|
sym := p.table.get_type_symbol(typ)
|
||||||
mut args := [table.Arg{
|
mut args := [table.Param{
|
||||||
name: 'x'
|
name: 'x'
|
||||||
typ: typ
|
typ: typ
|
||||||
type_source_name: sym.source_name
|
type_source_name: sym.source_name
|
||||||
|
|
|
@ -22,7 +22,7 @@ pub mut:
|
||||||
|
|
||||||
pub struct Fn {
|
pub struct Fn {
|
||||||
pub:
|
pub:
|
||||||
args []Arg // parameters
|
args []Param
|
||||||
return_type Type
|
return_type Type
|
||||||
return_type_source_name string
|
return_type_source_name string
|
||||||
is_variadic bool
|
is_variadic bool
|
||||||
|
@ -39,8 +39,7 @@ pub mut:
|
||||||
name string
|
name string
|
||||||
}
|
}
|
||||||
|
|
||||||
// parameter
|
pub struct Param {
|
||||||
pub struct Arg {
|
|
||||||
pub:
|
pub:
|
||||||
pos token.Position
|
pos token.Position
|
||||||
name string
|
name string
|
||||||
|
|
Loading…
Reference in New Issue