Skip to content

go: simplify #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LionNatsu wants to merge 3 commits into from
Closed

go: simplify #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b33c397
go: simplify nested literals
LionNatsu Feb 2, 2017
d6699cd
go: prune assignment of range for
LionNatsu Feb 2, 2017
45a1952
go: omit the high index
LionNatsu Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,12 @@ func (ls *LState) stackTrace(level int) string {
}
}
buf = append(buf, fmt.Sprintf("\t%v: %v", "[G]", "?"))
buf = buf[intMax(0, intMin(level, len(buf))):len(buf)]
buf = buf[intMax(0, intMin(level, len(buf))):]
if len(buf) > 20 {
newbuf := make([]string, 0, 20)
newbuf = append(newbuf, buf[0:7]...)
newbuf = append(newbuf, "\t...")
newbuf = append(newbuf, buf[len(buf)-7:len(buf)]...)
newbuf = append(newbuf, buf[len(buf)-7:]...)
buf = newbuf
}
return fmt.Sprintf("%s\n%s", header, strings.Join(buf, "\n"))
Expand Down
20 changes: 10 additions & 10 deletions linit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ type luaLib struct {
}

var luaLibs = []luaLib{
luaLib{LoadLibName, OpenPackage},
luaLib{BaseLibName, OpenBase},
luaLib{TabLibName, OpenTable},
luaLib{IoLibName, OpenIo},
luaLib{OsLibName, OpenOs},
luaLib{StringLibName, OpenString},
luaLib{MathLibName, OpenMath},
luaLib{DebugLibName, OpenDebug},
luaLib{ChannelLibName, OpenChannel},
luaLib{CoroutineLibName, OpenCoroutine},
{LoadLibName, OpenPackage},
{BaseLibName, OpenBase},
{TabLibName, OpenTable},
{IoLibName, OpenIo},
{OsLibName, OpenOs},
{StringLibName, OpenString},
{MathLibName, OpenMath},
{DebugLibName, OpenDebug},
{ChannelLibName, OpenChannel},
{CoroutineLibName, OpenCoroutine},
}

// OpenLibs loads the built-in libraries. It is equivalent to running OpenLoad,
Expand Down
84 changes: 42 additions & 42 deletions opcode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,48 +126,48 @@ type opProp struct {
}

var opProps = []opProp{
opProp{"MOVE", false, true, opArgModeR, opArgModeN, opTypeABC},
opProp{"MOVEN", false, true, opArgModeR, opArgModeN, opTypeABC},
opProp{"LOADK", false, true, opArgModeK, opArgModeN, opTypeABx},
opProp{"LOADBOOL", false, true, opArgModeU, opArgModeU, opTypeABC},
opProp{"LOADNIL", false, true, opArgModeR, opArgModeN, opTypeABC},
opProp{"GETUPVAL", false, true, opArgModeU, opArgModeN, opTypeABC},
opProp{"GETGLOBAL", false, true, opArgModeK, opArgModeN, opTypeABx},
opProp{"GETTABLE", false, true, opArgModeR, opArgModeK, opTypeABC},
opProp{"GETTABLEKS", false, true, opArgModeR, opArgModeK, opTypeABC},
opProp{"SETGLOBAL", false, false, opArgModeK, opArgModeN, opTypeABx},
opProp{"SETUPVAL", false, false, opArgModeU, opArgModeN, opTypeABC},
opProp{"SETTABLE", false, false, opArgModeK, opArgModeK, opTypeABC},
opProp{"SETTABLEKS", false, false, opArgModeK, opArgModeK, opTypeABC},
opProp{"NEWTABLE", false, true, opArgModeU, opArgModeU, opTypeABC},
opProp{"SELF", false, true, opArgModeR, opArgModeK, opTypeABC},
opProp{"ADD", false, true, opArgModeK, opArgModeK, opTypeABC},
opProp{"SUB", false, true, opArgModeK, opArgModeK, opTypeABC},
opProp{"MUL", false, true, opArgModeK, opArgModeK, opTypeABC},
opProp{"DIV", false, true, opArgModeK, opArgModeK, opTypeABC},
opProp{"MOD", false, true, opArgModeK, opArgModeK, opTypeABC},
opProp{"POW", false, true, opArgModeK, opArgModeK, opTypeABC},
opProp{"UNM", false, true, opArgModeR, opArgModeN, opTypeABC},
opProp{"NOT", false, true, opArgModeR, opArgModeN, opTypeABC},
opProp{"LEN", false, true, opArgModeR, opArgModeN, opTypeABC},
opProp{"CONCAT", false, true, opArgModeR, opArgModeR, opTypeABC},
opProp{"JMP", false, false, opArgModeR, opArgModeN, opTypeASbx},
opProp{"EQ", true, false, opArgModeK, opArgModeK, opTypeABC},
opProp{"LT", true, false, opArgModeK, opArgModeK, opTypeABC},
opProp{"LE", true, false, opArgModeK, opArgModeK, opTypeABC},
opProp{"TEST", true, true, opArgModeR, opArgModeU, opTypeABC},
opProp{"TESTSET", true, true, opArgModeR, opArgModeU, opTypeABC},
opProp{"CALL", false, true, opArgModeU, opArgModeU, opTypeABC},
opProp{"TAILCALL", false, true, opArgModeU, opArgModeU, opTypeABC},
opProp{"RETURN", false, false, opArgModeU, opArgModeN, opTypeABC},
opProp{"FORLOOP", false, true, opArgModeR, opArgModeN, opTypeASbx},
opProp{"FORPREP", false, true, opArgModeR, opArgModeN, opTypeASbx},
opProp{"TFORLOOP", true, false, opArgModeN, opArgModeU, opTypeABC},
opProp{"SETLIST", false, false, opArgModeU, opArgModeU, opTypeABC},
opProp{"CLOSE", false, false, opArgModeN, opArgModeN, opTypeABC},
opProp{"CLOSURE", false, true, opArgModeU, opArgModeN, opTypeABx},
opProp{"VARARG", false, true, opArgModeU, opArgModeN, opTypeABC},
opProp{"NOP", false, false, opArgModeR, opArgModeN, opTypeASbx},
{"MOVE", false, true, opArgModeR, opArgModeN, opTypeABC},
{"MOVEN", false, true, opArgModeR, opArgModeN, opTypeABC},
{"LOADK", false, true, opArgModeK, opArgModeN, opTypeABx},
{"LOADBOOL", false, true, opArgModeU, opArgModeU, opTypeABC},
{"LOADNIL", false, true, opArgModeR, opArgModeN, opTypeABC},
{"GETUPVAL", false, true, opArgModeU, opArgModeN, opTypeABC},
{"GETGLOBAL", false, true, opArgModeK, opArgModeN, opTypeABx},
{"GETTABLE", false, true, opArgModeR, opArgModeK, opTypeABC},
{"GETTABLEKS", false, true, opArgModeR, opArgModeK, opTypeABC},
{"SETGLOBAL", false, false, opArgModeK, opArgModeN, opTypeABx},
{"SETUPVAL", false, false, opArgModeU, opArgModeN, opTypeABC},
{"SETTABLE", false, false, opArgModeK, opArgModeK, opTypeABC},
{"SETTABLEKS", false, false, opArgModeK, opArgModeK, opTypeABC},
{"NEWTABLE", false, true, opArgModeU, opArgModeU, opTypeABC},
{"SELF", false, true, opArgModeR, opArgModeK, opTypeABC},
{"ADD", false, true, opArgModeK, opArgModeK, opTypeABC},
{"SUB", false, true, opArgModeK, opArgModeK, opTypeABC},
{"MUL", false, true, opArgModeK, opArgModeK, opTypeABC},
{"DIV", false, true, opArgModeK, opArgModeK, opTypeABC},
{"MOD", false, true, opArgModeK, opArgModeK, opTypeABC},
{"POW", false, true, opArgModeK, opArgModeK, opTypeABC},
{"UNM", false, true, opArgModeR, opArgModeN, opTypeABC},
{"NOT", false, true, opArgModeR, opArgModeN, opTypeABC},
{"LEN", false, true, opArgModeR, opArgModeN, opTypeABC},
{"CONCAT", false, true, opArgModeR, opArgModeR, opTypeABC},
{"JMP", false, false, opArgModeR, opArgModeN, opTypeASbx},
{"EQ", true, false, opArgModeK, opArgModeK, opTypeABC},
{"LT", true, false, opArgModeK, opArgModeK, opTypeABC},
{"LE", true, false, opArgModeK, opArgModeK, opTypeABC},
{"TEST", true, true, opArgModeR, opArgModeU, opTypeABC},
{"TESTSET", true, true, opArgModeR, opArgModeU, opTypeABC},
{"CALL", false, true, opArgModeU, opArgModeU, opTypeABC},
{"TAILCALL", false, true, opArgModeU, opArgModeU, opTypeABC},
{"RETURN", false, false, opArgModeU, opArgModeN, opTypeABC},
{"FORLOOP", false, true, opArgModeR, opArgModeN, opTypeASbx},
{"FORPREP", false, true, opArgModeR, opArgModeN, opTypeASbx},
{"TFORLOOP", true, false, opArgModeN, opArgModeU, opTypeABC},
{"SETLIST", false, false, opArgModeU, opArgModeU, opTypeABC},
{"CLOSE", false, false, opArgModeN, opArgModeN, opTypeABC},
{"CLOSURE", false, true, opArgModeU, opArgModeN, opTypeABx},
{"VARARG", false, true, opArgModeU, opArgModeN, opTypeABC},
{"NOP", false, false, opArgModeR, opArgModeN, opTypeASbx},
}

func opGetOpCode(inst uint32) int {
Expand Down
2 changes: 1 addition & 1 deletion pm/pm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ func compilePattern(p pattern, ps ...*iptr) []inst {
toplevel := false
if len(ps) == 0 {
toplevel = true
ptr = &iptr{[]inst{inst{opSave, nil, 0, -1}}, 2}
ptr = &iptr{[]inst{{opSave, nil, 0, -1}}, 2}
} else {
ptr = ps[0]
}
Expand Down
4 changes: 2 additions & 2 deletions state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,12 +460,12 @@ func (ls *LState) stackTrace(level int) string {
}
}
buf = append(buf, fmt.Sprintf("\t%v: %v", "[G]", "?"))
buf = buf[intMax(0, intMin(level, len(buf))):len(buf)]
buf = buf[intMax(0, intMin(level, len(buf))):]
if len(buf) > 20 {
newbuf := make([]string, 0, 20)
newbuf = append(newbuf, buf[0:7]...)
newbuf = append(newbuf, "\t...")
newbuf = append(newbuf, buf[len(buf)-7:len(buf)]...)
newbuf = append(newbuf, buf[len(buf)-7:]...)
buf = newbuf
}
return fmt.Sprintf("%s\n%s", header, strings.Join(buf, "\n"))
Expand Down
2 changes: 1 addition & 1 deletion stringlib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func strGsubDoReplace(str string, info []replaceInfo) string {
b2 := []byte("")
index2 := offset + replace.Indicies[1]
if index2 <= len(buf) {
b2 = append(b2, buf[index2:len(buf)]...)
b2 = append(b2, buf[index2:]...)
}
buf = append(b1, replace.String...)
buf = append(buf, b2...)
Expand Down
4 changes: 2 additions & 2 deletions table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,14 +337,14 @@ func (tb *LTable) Next(key LValue) (LValue, LValue) {
tb.k2i = make(map[LValue]int)
i := 0
if tb.dict != nil {
for k, _ := range tb.dict {
for k := range tb.dict {
tb.keys[i] = k
tb.k2i[k] = i
i++
}
}
if tb.strdict != nil {
for k, _ := range tb.strdict {
for k := range tb.strdict {
tb.keys[i] = LString(k)
tb.k2i[LString(k)] = i
i++
Expand Down