From 2fc6bbfe10b77d0f6fc7c5322782ebf819e5333c Mon Sep 17 00:00:00 2001 From: Celestino Amoroso Date: Wed, 5 Jun 2024 05:54:12 +0200 Subject: [PATCH] removed old simple vars and funcs context implementations --- simple-func-store.go.bak | 244 --------------------------------------- simple-var-store.go.bak | 126 -------------------- 2 files changed, 370 deletions(-) delete mode 100644 simple-func-store.go.bak delete mode 100644 simple-var-store.go.bak diff --git a/simple-func-store.go.bak b/simple-func-store.go.bak deleted file mode 100644 index b8299e3..0000000 --- a/simple-func-store.go.bak +++ /dev/null @@ -1,244 +0,0 @@ -// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com). -// All rights reserved. - -// simple-func-store.go -package expr - -import ( - "fmt" - "slices" - "strings" -) - -type SimpleFuncStore struct { - SimpleVarStore - funcStore map[string]*funcInfo -} - -type paramFlags uint16 - -const ( - pfOptional paramFlags = 1 << iota - pfRepeat -) - -type funcParamInfo struct { - name string - flags paramFlags - defaultValue any -} - -func newFuncParam(name string) *funcParamInfo { - return &funcParamInfo{name: name} -} - -func newFuncParamFlag(name string, flags paramFlags) *funcParamInfo { - return &funcParamInfo{name: name, flags: flags} -} - -func newFuncParamFlagDef(name string, flags paramFlags, defValue any) *funcParamInfo { - return &funcParamInfo{name: name, flags: flags, defaultValue: defValue} -} - -func (param *funcParamInfo) Name() string { - return param.name -} - -func (param *funcParamInfo) Type() string { - return "any" -} - -func (param *funcParamInfo) IsOptional() bool { - return (param.flags & pfOptional) != 0 -} - -func (param *funcParamInfo) IsRepeat() bool { - return (param.flags & pfRepeat) != 0 -} - -func (param *funcParamInfo) DefaultValue() any { - return param.defaultValue -} - -type funcInfo struct { - name string - minArgs int - maxArgs int - functor Functor - params []ExprFuncParam - returnType string -} - -func (info *funcInfo) Params() []ExprFuncParam { - return info.params -} - -func (info *funcInfo) ReturnType() string { - return info.returnType -} - -func (info *funcInfo) ToString(opt FmtOpt) string { - var sb strings.Builder - sb.WriteByte('(') - if info.params != nil { - for i, p := range info.params { - if i > 0 { - sb.WriteString(", ") - } - sb.WriteString(p.Name()) - if p.IsOptional() { - sb.WriteByte('=') - if s, ok := p.DefaultValue().(string); ok { - sb.WriteByte('"') - sb.WriteString(s) - sb.WriteByte('"') - } else { - sb.WriteString(fmt.Sprintf("%v", p.DefaultValue())) - } - } - } - } - if info.maxArgs < 0 { - sb.WriteString(" ...") - } - sb.WriteString(") -> ") - if len(info.returnType) > 0 { - sb.WriteString(info.returnType) - } else { - sb.WriteString(typeAny) - } - return sb.String() -} - -func (info *funcInfo) Name() string { - return info.name -} - -func (info *funcInfo) MinArgs() int { - return info.minArgs -} - -func (info *funcInfo) MaxArgs() int { - return info.maxArgs -} - -func (info *funcInfo) Functor() Functor { - return info.functor -} - -func NewSimpleFuncStore() *SimpleFuncStore { - ctx := &SimpleFuncStore{ - SimpleVarStore: SimpleVarStore{varStore: make(map[string]any)}, - funcStore: make(map[string]*funcInfo), - } - //ImportBuiltinsFuncs(ctx) - return ctx -} - -func (ctx *SimpleFuncStore) Clone() ExprContext { - svs := ctx.SimpleVarStore - return &SimpleFuncStore{ - // SimpleVarStore: SimpleVarStore{varStore: CloneMap(ctx.varStore)}, - SimpleVarStore: SimpleVarStore{varStore: svs.cloneVars()}, - funcStore: CloneFilteredMap(ctx.funcStore, func(name string) bool { return name[0] != '@' }), - } -} - -func funcsCtxToBuilder(sb *strings.Builder, ctx ExprContext, indent int) { - sb.WriteString("funcs: {\n") - first := true - names := ctx.EnumFuncs(func(name string) bool { return true }) - slices.Sort(names) - for _, name := range names { - if first { - first = false - } else { - sb.WriteByte(',') - sb.WriteByte('\n') - } - value, _ := ctx.GetFuncInfo(name) - sb.WriteString(strings.Repeat("\t", indent+1)) - sb.WriteString(name) - //sb.WriteString("=") - if formatter, ok := value.(Formatter); ok { - sb.WriteString(formatter.ToString(0)) - } else { - sb.WriteString(fmt.Sprintf("%v", value)) - } - } - sb.WriteString("\n}\n") -} - -func (ctx *SimpleFuncStore) ToString(opt FmtOpt) string { - var sb strings.Builder - sb.WriteString(ctx.SimpleVarStore.ToString(opt)) - funcsCtxToBuilder(&sb, ctx, 0) - return sb.String() -} - -func (ctx *SimpleFuncStore) GetFuncInfo(name string) (info ExprFunc, exists bool) { - info, exists = ctx.funcStore[name] - return -} - -// func (ctx *SimpleFuncStore) RegisterFunc(name string, functor Functor, minArgs, maxArgs int) { -// ctx.funcStore[name] = &funcInfo{name: name, minArgs: minArgs, maxArgs: maxArgs, functor: functor} -// } - -func (ctx *SimpleFuncStore) RegisterFuncInfo(info ExprFunc) { - ctx.funcStore[info.Name()], _ = info.(*funcInfo) -} - -func (ctx *SimpleFuncStore) RegisterFunc2(name string, functor Functor, returnType string, params []ExprFuncParam) error { - var minArgs = 0 - var maxArgs = 0 - if params != nil { - for _, p := range params { - if maxArgs == -1 { - return fmt.Errorf("no more params can be specified after the ellipsis symbol: %q", p.Name()) - // } else if p.IsRepeat() { - // maxArgs = -1 - // continue - } - if p.IsOptional() { - maxArgs++ - } else if maxArgs == minArgs { - minArgs++ - maxArgs++ - } else { - return fmt.Errorf("can't specify non-optional param after optional ones: %q", p.Name()) - } - if p.IsRepeat() { - maxArgs = -1 - } - } - } - ctx.funcStore[name] = &funcInfo{ - name: name, minArgs: minArgs, maxArgs: maxArgs, functor: functor, returnType: returnType, params: params, - } - return nil -} - -func (ctx *SimpleFuncStore) EnumFuncs(acceptor func(name string) (accept bool)) (funcNames []string) { - funcNames = make([]string, 0) - for name := range ctx.funcStore { - if acceptor != nil { - if acceptor(name) { - funcNames = append(funcNames, name) - } - } else { - funcNames = append(funcNames, name) - } - } - return -} - -func (ctx *SimpleFuncStore) Call(name string, args []any) (result any, err error) { - if info, exists := ctx.funcStore[name]; exists { - functor := info.functor - result, err = functor.Invoke(ctx, name, args) - } else { - err = fmt.Errorf("unknown function %s()", name) - } - return -} diff --git a/simple-var-store.go.bak b/simple-var-store.go.bak deleted file mode 100644 index 8c72aa7..0000000 --- a/simple-var-store.go.bak +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright (c) 2024 Celestino Amoroso (celestino.amoroso@gmail.com). -// All rights reserved. - -// simple-var-store.go -package expr - -import ( - "fmt" - "strings" -) - -type SimpleVarStore struct { - varStore map[string]any -} - -func NewSimpleVarStore() *SimpleVarStore { - return &SimpleVarStore{ - varStore: make(map[string]any), - } -} - -func (ctx *SimpleVarStore) cloneVars() (vars map[string]any) { - return CloneFilteredMap(ctx.varStore, func(name string) bool { return name[0] != '@' }) -} - -func (ctx *SimpleVarStore) Clone() (clone ExprContext) { - // fmt.Println("*** Cloning context ***") - clone = &SimpleVarStore{ - varStore: ctx.cloneVars(), - } - return clone -} - -func (ctx *SimpleVarStore) GetVar(varName string) (v any, exists bool) { - v, exists = ctx.varStore[varName] - return -} - -func (ctx *SimpleVarStore) UnsafeSetVar(varName string, value any) { - // fmt.Printf("[%p] setVar(%v, %v)\n", ctx, varName, value) - ctx.varStore[varName] = value -} - -func (ctx *SimpleVarStore) SetVar(varName string, value any) { - // fmt.Printf("[%p] SetVar(%v, %v)\n", ctx, varName, value) - if allowedValue, ok := fromGenericAny(value); ok { - ctx.varStore[varName] = allowedValue - } else { - panic(fmt.Errorf("unsupported type %T of value %v", value, value)) - } -} - -func (ctx *SimpleVarStore) EnumVars(acceptor func(name string) (accept bool)) (varNames []string) { - varNames = make([]string, 0) - for name := range ctx.varStore { - if acceptor != nil { - if acceptor(name) { - varNames = append(varNames, name) - } - } else { - varNames = append(varNames, name) - } - } - return -} - -func (ctx *SimpleVarStore) GetFuncInfo(name string) (f ExprFunc, exists bool) { - return -} - -func (ctx *SimpleVarStore) Call(name string, args []any) (result any, err error) { - return -} - -// func (ctx *SimpleVarStore) RegisterFunc(name string, functor Functor, minArgs, maxArgs int) { -// } -func (ctx *SimpleVarStore) RegisterFuncInfo(info ExprFunc) { -} -func (ctx *SimpleVarStore) RegisterFunc2(name string, f Functor, returnType string, param []ExprFuncParam) error { - return nil -} - -func (ctx *SimpleVarStore) EnumFuncs(acceptor func(name string) (accept bool)) (funcNames []string) { - return -} - -func varsCtxToBuilder(sb *strings.Builder, ctx ExprContext, indent int) { - sb.WriteString("vars: {\n") - first := true - for _, name := range ctx.EnumVars(func(name string) bool { return name[0] != '_' }) { - if first { - first = false - } else { - sb.WriteByte(',') - sb.WriteByte('\n') - } - - value, _ := ctx.GetVar(name) - sb.WriteString(strings.Repeat("\t", indent+1)) - sb.WriteString(name) - sb.WriteString(": ") - if f, ok := value.(Formatter); ok { - sb.WriteString(f.ToString(0)) - } else if _, ok = value.(Functor); ok { - sb.WriteString("func(){}") - // } else if _, ok = value.(map[any]any); ok { - // sb.WriteString("dict{}") - } else { - sb.WriteString(fmt.Sprintf("%v", value)) - } - } - sb.WriteString(strings.Repeat("\t", indent)) - sb.WriteString("\n}\n") -} - -func varsCtxToString(ctx ExprContext, indent int) string { - var sb strings.Builder - varsCtxToBuilder(&sb, ctx, indent) - return sb.String() -} - -func (ctx *SimpleVarStore) ToString(opt FmtOpt) string { - var sb strings.Builder - varsCtxToBuilder(&sb, ctx, 0) - return sb.String() -}