mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 143 is fixed, so clean up some of exvar. 

R=r
APPROVED=r
DELTA=8  (3 added, 1 deleted, 4 changed)
OCL=27699
CL=27701
This commit is contained in:
David Symonds 2009-04-21 18:36:53 -07:00
parent 227fe8c530
commit f8931c6ceb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/exvar.go
View File

@ -130,8 +130,7 @@ func IncrementInt(name string, inc int) {
func IncrementMapInt(name string, key string, inc int) {
workSync(func(state *exVars) {
mv := state.getOrInitMapVar(name);
// TODO(dsymonds): Change this to just mv[key] when bug143 is fixed.
if v, ok := (*mv)[key]; ok {
if v, ok := mv[key]; ok {
mv[key] += inc
} else {
mv[key] = inc
@ -167,9 +166,12 @@ func GetMapInt(name string, key string) int {
var i int;
var ok bool;
workSync(func(state *exVars) {
// TODO(dsymonds): Change this to just getOrInitMapVar(name)[key] when
// bug143 is fixed.
i, ok = (*state.getOrInitMapVar(name))[key];
// This doesn't work:
// i, ok = state.getOrInitMapVar(name)[key];
// exvar.go:169: assignment count mismatch: 2 = 1
// Should it? Wrapping the method call in () doesn't help.
mv := state.getOrInitMapVar(name);
i, ok = mv[key];
});
return i
}