From 3a529d263a0927be8f23ec44ab1ea4e27d4b8552 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 30 Aug 2025 11:48:55 +0200 Subject: [PATCH] Removed fs dependency from the types package --- src/compiler/parseFieldTypes.go | 6 ++++-- src/types/Struct.go | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compiler/parseFieldTypes.go b/src/compiler/parseFieldTypes.go index 80b96e1..d4ee0d4 100644 --- a/src/compiler/parseFieldTypes.go +++ b/src/compiler/parseFieldTypes.go @@ -5,6 +5,7 @@ import ( "git.urbach.dev/cli/q/src/core" "git.urbach.dev/cli/q/src/errors" + "git.urbach.dev/cli/q/src/fs" "git.urbach.dev/cli/q/src/types" ) @@ -14,10 +15,11 @@ func parseFieldTypes(structs iter.Seq[*types.Struct], env *core.Environment) err offset := 0 for i, field := range structure.Fields { - field.Type = core.ParseType(field.Tokens[1:], structure.File.Bytes, env) + file := structure.File.(*fs.File) + field.Type = core.ParseType(field.Tokens[1:], file.Bytes, env) if field.Type == nil { - return errors.New(&UnknownType{Name: field.Tokens[1:].String(structure.File.Bytes)}, structure.File, field.Tokens[1].Position) + return errors.New(&UnknownType{Name: field.Tokens[1:].String(file.Bytes)}, file, field.Tokens[1].Position) } field.Index = uint8(i) diff --git a/src/types/Struct.go b/src/types/Struct.go index 1a6bc13..a816f2d 100644 --- a/src/types/Struct.go +++ b/src/types/Struct.go @@ -1,10 +1,8 @@ package types -import "git.urbach.dev/cli/q/src/fs" - // Struct is a structure in memory whose regions are addressable with named fields. type Struct struct { - File *fs.File + File any Package string UniqueName string name string @@ -12,7 +10,7 @@ type Struct struct { } // NewStruct creates a new struct. -func NewStruct(file *fs.File, pkg string, name string) *Struct { +func NewStruct(file any, pkg string, name string) *Struct { return &Struct{ File: file, Package: pkg, -- 2.51.2