diff options
| author | Marc Vertes <mvertes@free.fr> | 2025-03-03 10:49:27 +0100 |
|---|---|---|
| committer | Marc Vertes <mvertes@free.fr> | 2025-03-03 10:49:27 +0100 |
| commit | ab69cd9ba61092650abdff6484b12021182385ce (patch) | |
| tree | 4805a0365fc481df57c8f0b5d45f7f993b9a0ef9 /parser/symbol.go | |
| parent | dabd9e5eb81bbc9aeaeb32fb3e3ce83eef258a77 (diff) | |
fix: improve structparscan-struct
Use 'unsafe' to modify private struct fields, allowing to keep
unmodified field names: before they were prefixed with a capital.
Parse package statement. Provide a also a default package name for
REPL and tests. The support of packages is still incomplete.
Diffstat (limited to 'parser/symbol.go')
| -rw-r--r-- | parser/symbol.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/parser/symbol.go b/parser/symbol.go index 499e121..a491073 100644 --- a/parser/symbol.go +++ b/parser/symbol.go @@ -26,7 +26,7 @@ type symbol struct { kind symKind index int // address of symbol in frame pkgPath string // - Type *vm.Type // + typ *vm.Type // value vm.Value // cval constant.Value // local bool // if true address is relative to local frame, otherwise global @@ -34,8 +34,8 @@ type symbol struct { } func symtype(s *symbol) *vm.Type { - if s.Type != nil { - return s.Type + if s.typ != nil { + return s.typ } return vm.TypeOf(s.value) } @@ -47,7 +47,7 @@ func (p *Parser) AddSym(i int, name string, v vm.Value) { func (p *Parser) addSym(i int, name string, v vm.Value, k symKind, t *vm.Type, local bool) { name = strings.TrimPrefix(name, "/") - p.symbols[name] = &symbol{kind: k, index: i, local: local, value: v, Type: t} + p.symbols[name] = &symbol{kind: k, index: i, local: local, value: v, typ: t} } // getSym searches for an existing symbol starting from the deepest scope. @@ -70,16 +70,16 @@ func (p *Parser) getSym(name, scope string) (sym *symbol, sc string, ok bool) { func initUniverse() map[string]*symbol { return map[string]*symbol{ - "any": {kind: symType, index: unsetAddr, Type: vm.TypeOf((*any)(nil)).Elem()}, - "bool": {kind: symType, index: unsetAddr, Type: vm.TypeOf((*bool)(nil)).Elem()}, - "error": {kind: symType, index: unsetAddr, Type: vm.TypeOf((*error)(nil)).Elem()}, - "int": {kind: symType, index: unsetAddr, Type: vm.TypeOf((*int)(nil)).Elem()}, - "string": {kind: symType, index: unsetAddr, Type: vm.TypeOf((*string)(nil)).Elem()}, + "any": {kind: symType, index: unsetAddr, typ: vm.TypeOf((*any)(nil)).Elem()}, + "bool": {kind: symType, index: unsetAddr, typ: vm.TypeOf((*bool)(nil)).Elem()}, + "error": {kind: symType, index: unsetAddr, typ: vm.TypeOf((*error)(nil)).Elem()}, + "int": {kind: symType, index: unsetAddr, typ: vm.TypeOf((*int)(nil)).Elem()}, + "string": {kind: symType, index: unsetAddr, typ: vm.TypeOf((*string)(nil)).Elem()}, "nil": {index: unsetAddr}, "iota": {kind: symConst, index: unsetAddr}, - "true": {index: unsetAddr, value: vm.ValueOf(true), Type: vm.TypeOf(true)}, - "false": {index: unsetAddr, value: vm.ValueOf(false), Type: vm.TypeOf(false)}, + "true": {index: unsetAddr, value: vm.ValueOf(true), typ: vm.TypeOf(true)}, + "false": {index: unsetAddr, value: vm.ValueOf(false), typ: vm.TypeOf(false)}, "println": {index: unsetAddr, value: vm.ValueOf(func(v ...any) { fmt.Println(v...) })}, } |