From 345afe0c39a3dcee33fd733a00432c055eeb2b55 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 21 Feb 2024 00:16:48 +0200 Subject: also generate String methods for Go structs --- internal/generated/nqc.raku | 18 +++++++++++++++++- internal/generated/types/types.go | 26 ++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) (limited to 'internal/generated') diff --git a/internal/generated/nqc.raku b/internal/generated/nqc.raku index 040617f..f358e2a 100644 --- a/internal/generated/nqc.raku +++ b/internal/generated/nqc.raku @@ -34,7 +34,23 @@ class NQCToGoActions { method constant($/) { make 'const ' ~ $ ~ ' = ' ~ $ ~ "\n" } method struct($/) { - make 'type ' ~ $.made ~ " struct \{\n\t" ~ $.map(*.made).join("\n\t") ~ "\n\}" + make 'type ' ~ $.made ~ " struct \{\n\t" + ~ $.map(*.made).join("\n\t") + ~ "\n\}\n\n" + ~ self!struct-go-string-method($/); + } + + # Generate String() method on the Go struct, for pretty printing. + method !struct-go-string-method($/) returns Str { + my Str $self-ref = $.lc.substr(0,1); + my Str @format = $.map({ $_..made ~ ':%v' }); + my Str @args = $.map({ "$self-ref." ~ $_..made }); + + return qq:to/END/; + func ({$self-ref} {$}) String() string \{ + \treturn fmt.Sprintf("{@format.join(' ')}", {@args.join(', ')}) + \} + END } method member($/) { make $.made ~ ' ' ~ ($ // '') ~ $.made } diff --git a/internal/generated/types/types.go b/internal/generated/types/types.go index 0e3a907..2cee711 100644 --- a/internal/generated/types/types.go +++ b/internal/generated/types/types.go @@ -2,17 +2,11 @@ package types const MAX_FILENAME_LENGTH = 256 -const MAX_PROGNAME_LENGTH = 16 const OPENAT_ENTER_OP_ID = 1 -const OPENAT_EXIT_OP_ID = 2 const OPEN_ENTER_OP_ID = 3 -const OPEN_EXIT_OP_ID = 4 const CLOSE_ENTER_OP_ID = 5 -const CLOSE_EXIT_OP_ID = 6 const WRITE_ENTER_OP_ID = 7 -const WRITE_EXIT_OP_ID = 8 const WRITEV_ENTER_OP_ID = 9 -const WRITEV_EXIT_OP_ID = 10 type NullEvent struct { OpId uint32 @@ -20,6 +14,11 @@ type NullEvent struct { Time uint64 } +func (n null_event) String() string { + return fmt.Sprintf("OpId:%v PidTgid:%v Time:%v", n.OpId, n.PidTgid, n.Time) +} + + type FdEvent struct { OpId uint32 PidTgid uint32 @@ -27,6 +26,11 @@ type FdEvent struct { Fd int32 } +func (f fd_event) String() string { + return fmt.Sprintf("OpId:%v PidTgid:%v Time:%v Fd:%v", f.OpId, f.PidTgid, f.Time, f.Fd) +} + + type OpenatEnterEvent struct { OpId uint32 PidTgid uint32 @@ -35,7 +39,17 @@ type OpenatEnterEvent struct { Comm [MAX_PROGNAME_LENGTH]byte } +func (o openat_enter_event) String() string { + return fmt.Sprintf("OpId:%v PidTgid:%v Time:%v Filename:%v Comm:%v", o.OpId, o.PidTgid, o.Time, o.Filename, o.Comm) +} + + type Flags struct { UidFilter uint32 } +func (f flags) String() string { + return fmt.Sprintf("UidFilter:%v", f.UidFilter) +} + + -- cgit v1.2.3