From 751e1dcacf6ec5aa9af4d9c928fe4966b6ee8600 Mon Sep 17 00:00:00 2001 From: Iskander Sharipov Date: Sun, 18 Nov 2018 00:02:26 +0300 Subject: [PATCH] fix(*): remove commented-out code Only remove things that look safe to remove. Signed-off-by: Iskander Sharipov --- lua/errors.go | 1 - lua/frame.go | 4 ---- lua/lua.go | 3 --- lua/state.go | 3 --- lua/table.go | 1 - pkg/packer/state.go | 1 - pkg/pattern/classes.go | 1 - 7 files changed, 14 deletions(-) diff --git a/lua/errors.go b/lua/errors.go index 6a0f844..3d083fc 100644 --- a/lua/errors.go +++ b/lua/errors.go @@ -9,7 +9,6 @@ type errorFn func(error) func (fn errorFn) throw(state *State, err error) { if fn == nil { - // fmt.Fprintf(os.Stderr, "lua: runtime error: %v\n", err) panic(err) } else { fn(err) diff --git a/lua/frame.go b/lua/frame.go index ee449fc..02069ae 100644 --- a/lua/frame.go +++ b/lua/frame.go @@ -84,9 +84,6 @@ func (fr *Frame) absindex(index int) int { // settop sets the locals stack top to top if valid, removing or adding // elements to adjust the stack. func (fr *Frame) settop(top int) { - // if top = fr.absindex(top); top < 0 { - // panic(runtimeErr(fmt.Errorf("stack underflow!"))) - // } switch diff := fr.gettop() - top; { case diff >= 0: // new top < old top for i := 0; i < diff; i++ { @@ -273,7 +270,6 @@ func (fr *Frame) local(index int) Value { // // TODO: ensure stack func (fr *Frame) pushN(vs []Value) { - // fmt.Printf("frame #%d: push %v\n", fr.depth, vs) for _, v := range vs { fr.push(v) } diff --git a/lua/lua.go b/lua/lua.go index f8d930e..a34a9f6 100644 --- a/lua/lua.go +++ b/lua/lua.go @@ -234,7 +234,6 @@ func (state *State) Next(index int) (more bool) { } var k, v Value if k, v, more = tbl.next(state.frame().pop()); more { - // fmt.Printf("next: key=%v, value=%v (more = %t)\n", k, v, more) state.frame().push(k) state.frame().push(v) } @@ -525,8 +524,6 @@ func (state *State) Call(args, rets int) { c, ok = value.(*Closure) ) - // state.Logf("call (func @ %d) %v (# args = %d, # rets = %d)\n", funcID, value, args, rets) - if !ok { if !tryMetaCall(state, value, funcID, args, rets) { state.errorf("attempt to call a %s value @ %d (%T)\n%v\n", value.Type(), funcID, value, state.frame().locals) diff --git a/lua/state.go b/lua/state.go index ba6f117..c2b8622 100644 --- a/lua/state.go +++ b/lua/state.go @@ -139,7 +139,6 @@ func (state *State) traceback(w io.Writer) { // If the error is not a runtimeErr, recover repanics the // error up the stack. func (state *State) recover(err *error) { - // goutils.DumpStack(err, state.recover) if r := recover(); r != nil { state.Debug(false) if e, ok := r.(runtimeErr); ok { @@ -379,7 +378,6 @@ func (state *State) load(filename string, source interface{}) (*Closure, error) } func (state *State) gettable(obj, key Value, raw bool) Value { - // fmt.Printf("%v[%v] (%t)\n", obj, key, raw) if tbl, ok := obj.(*table); ok { if val := tbl.get(key); !IsNone(val) || raw || IsNone(state.metafield(tbl, "__index")) { return val @@ -401,7 +399,6 @@ func (state *State) gettable(obj, key Value, raw bool) Value { } func (state *State) settable(obj, key, val Value, raw bool) { - // fmt.Printf("%v[%v] = %v (%t)\n", obj, key, val, raw) if tbl, ok := obj.(*table); ok && (tbl.exists(key) || raw) { tbl.set(key, val) return diff --git a/lua/table.go b/lua/table.go index 9bcbd83..6faf728 100644 --- a/lua/table.go +++ b/lua/table.go @@ -98,7 +98,6 @@ func (t *table) get(k Value) Value { } if n, ok := k.(Number); ok { i := arrayIndex(n) - 1 - // fmt.Printf("table[%v] (%T) @ %d\n", k, k, i) if i >= 0 && i < len(t.list) { return t.list[i] } diff --git a/pkg/packer/state.go b/pkg/packer/state.go index 5b4c62b..a2d9c3c 100644 --- a/pkg/packer/state.go +++ b/pkg/packer/state.go @@ -88,7 +88,6 @@ func (p *state) packValue(o option, v interface{}) error { func (p *state) packString(o option, v interface{}) error { fmt.Println("pack: string") - // return p.pack(o, v) return nil } diff --git a/pkg/pattern/classes.go b/pkg/pattern/classes.go index 8ab4dc5..fe97784 100644 --- a/pkg/pattern/classes.go +++ b/pkg/pattern/classes.go @@ -41,7 +41,6 @@ func (i item) matches(r rune) (match bool) { default: panic(fmt.Errorf("unhandled character class %q", i.val)) } - // fmt.Printf("class(%s) matches (%s) = %t\n", i.val, string(r), match) if strings.ToUpper(i.val) == i.val { return !match }