gofmt and goimports on generated Go code

4 files changed, 21 insertions, 18 deletions

diff --git a/internal/generated/Makefile b/internal/generated/Makefile
index 59e42bd..12dd500 100644
--- a/internal/generated/Makefile
+++ b/internal/generated/Makefile
@@ -4,8 +4,8 @@ generate: types tracepoints
 
 .PHONY: types
 types:
-	cat ../c/types.h | raku nqc.raku > types/types.go
+	cat ../c/types.h | raku nqc.raku | gofmt | goimports > types/types.go
 
 .PHONY: tracepoints
 tracepoints:
-	cat ../c/tracepoints/*.c | raku tracepoints.raku > tracepoints/tracepoints.go
+	cat ../c/tracepoints/*.c | raku tracepoints.raku | gofmt | goimports > tracepoints/tracepoints.go
diff --git a/internal/generated/nqc.raku b/internal/generated/nqc.raku
index ddbd086..65ff9ef 100644
--- a/internal/generated/nqc.raku
+++ b/internal/generated/nqc.raku
@@ -10,7 +10,7 @@ use v6.d;
 grammar NQC {
     rule TOP { <construct>* }
     rule construct { <constant> | <statement> | <comment> }
-    rule constant { '#define' <identifier> <number> <-[\n]>+ }
+    rule constant { '#define' <identifier> <number> }
     rule statement { <struct> ';' }
     rule struct { 'struct' <identifier> '{' <member>+ %% ';' '}' }
     rule member { <type> <identifier> <arraysize>? }
diff --git a/internal/generated/tracepoints/tracepoints.go b/internal/generated/tracepoints/tracepoints.go
index e324e26..6641385 100644
--- a/internal/generated/tracepoints/tracepoints.go
+++ b/internal/generated/tracepoints/tracepoints.go
@@ -11,4 +11,3 @@ var List = []string{
 	"enter_write",
 	"exit_write",
 }
-
diff --git a/internal/generated/types/types.go b/internal/generated/types/types.go
index 3460cb3..b3cc4d7 100644
--- a/internal/generated/types/types.go
+++ b/internal/generated/types/types.go
@@ -1,50 +1,56 @@
 // This file was generated - don't change manually!
 package types
 
+import "fmt"
+
 type OpId int
+
 const MAX_FILENAME_LENGTH = 256
+const MAX_PROGNAME_LENGTH = 16
 const OPENAT_ENTER_OP_ID OpId = 1
+const OPENAT_EXIT_OP_ID OpId = 2
 const OPEN_ENTER_OP_ID OpId = 3
+const OPEN_EXIT_OP_ID OpId = 4
 const CLOSE_ENTER_OP_ID OpId = 5
+const CLOSE_EXIT_OP_ID OpId = 6
 const WRITE_ENTER_OP_ID OpId = 7
+const WRITE_EXIT_OP_ID OpId = 8
 const WRITEV_ENTER_OP_ID OpId = 9
+const WRITEV_EXIT_OP_ID OpId = 10
 
 type NullEvent struct {
-	OpId uint32
+	OpId    uint32
 	PidTgid uint32
-	Time uint64
+	Time    uint64
 }
 
 func (n NullEvent) String() string {
 	return fmt.Sprintf("OpId:%v PidTgid:%v Time:%v", n.OpId, n.PidTgid, n.Time)
 }
 
-
 type FdEvent struct {
-	OpId uint32
+	OpId    uint32
 	PidTgid uint32
-	Time uint64
-	Fd int32
+	Time    uint64
+	Fd      int32
 }
 
 func (f FdEvent) 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
-	Time uint64
+	OpId     uint32
+	PidTgid  uint32
+	Time     uint64
 	Filename [MAX_FILENAME_LENGTH]byte
-	Comm [MAX_PROGNAME_LENGTH]byte
+	Comm     [MAX_PROGNAME_LENGTH]byte
 }
 
 func (o OpenatEnterEvent) String() string {
 	return fmt.Sprintf("OpId:%v PidTgid:%v Time:%v Filename:%v Comm:%v", o.OpId, o.PidTgid, o.Time, string(o.Filename[:]), string(o.Comm[:]))
 }
 
-
 type Flags struct {
 	UidFilter uint32
 }
@@ -52,5 +58,3 @@ type Flags struct {
 func (f Flags) String() string {
 	return fmt.Sprintf("UidFilter:%v", f.UidFilter)
 }
-
-