tests and cleanup

Author: jaekwon

gnovm/pkg/gnolang/realm.go

@@ -645,7 +645,7 @@ func (rlm *Realm) processNewEscapedMarks(store Store, start int) int {
 // (ancestors) must be marked as dirty to update the
 // hash tree.
 func (rlm *Realm) markDirtyAncestors(store Store) {
-	markAncestorsOne := func(oo Object) {
+	markAncestors := func(oo Object) {
 		for {
 			if pv, ok := oo.(*PackageValue); ok {
 				if debugRealm {
@@ -682,12 +682,12 @@ func (rlm *Realm) markDirtyAncestors(store Store) {
 				break // no more owners.
 			} else if po.GetIsNewReal() {
 				// already will be marked
-				// via call to markAncestorsOne
+				// via call to markAncestors
 				// via .created.
 				break
 			} else if po.GetIsDirty() {
 				// already will be marked
-				// via call to markAncestorsOne
+				// via call to markAncestors
 				// via .updated.
 				break
 			} else if po.GetIsDeleted() {
@@ -706,14 +706,14 @@ func (rlm *Realm) markDirtyAncestors(store Store) {
 	// to .updated without affecting iteration.
 	for _, oo := range rlm.updated {
 		if !oo.GetIsDeleted() {
-			markAncestorsOne(oo)
+			markAncestors(oo)
 		}
 	}
 	// NOTE: must happen after iterating over rlm.updated
 	// for the same reason.
 	for _, oo := range rlm.created {
 		if !oo.GetIsDeleted() {
-			markAncestorsOne(oo)
+			markAncestors(oo)
 		}
 	}
 }
@@ -829,6 +829,7 @@ func (rlm *Realm) saveObject(store Store, oo Object) {
 		oo.SetIsEscaped(true)
 		// XXX anything else to do?
 	}
+
 	// set object to store.
 	// NOTE: also sets the hash to object.
 	rlm.sumDiff += store.SetObject(oo)

gnovm/tests/files/struct63f.gno

@@ -0,0 +1,45 @@
+// PKGPATH: gno.land/r/main
+package main
+
+type A struct {
+	b *B
+}
+
+type B struct {
+	c *C
+}
+
+type C struct {
+	d *D
+}
+
+type D struct {
+	e int
+}
+
+var x = A{b: &B{c: &C{d: &D{e: 1}}}}
+
+func init() {
+	println("init() START")
+	// variant of struct63.gno
+	// x.b.c = C{d: D{e: 2}}
+	x.b.c = &C{d: nil} // Is realm.go "created" C{}.
+	x.b.c.d = &D{e: 2} // *Not* realm.go "updated" because C{} is unreal...
+	// however it *will* get saved recursively due to "created".
+	// If new-real or dirty any new objects in subcomponents are separately
+	// marked "created" there, not here.
+	println("init() END")
+}
+
+func main() {
+	println("main() START")
+	println(x.b.c.d.e)
+	println("main() END")
+}
+
+// Output:
+// init() START
+// init() END
+// main() START
+// 2
+// main() END

tm2/pkg/colors/colors.go

@@ -39,7 +39,7 @@ const (
 
 // color the string s with color 'color'
 // unless s is already colored
-func treat(s string, color string) string {
+func treat(color string, s string) string {
 	if len(s) > 2 && s[:2] == "\x1b[" {
 		return s
 	}
@@ -50,7 +50,7 @@ func treatAll(color string, args ...any) string {
 	parts := make([]string, len(args))
 
 	for i, arg := range args {
-		parts[i] = treat(fmt.Sprintf("%v", arg), color)
+		parts[i] = treat(color, fmt.Sprintf("%v", arg))
 	}
 
 	return strings.Join(parts, "")
@@ -60,14 +60,26 @@ func None(args ...any) string {
 	return treatAll(ANSIReset, args...)
 }
 
+func Nonef(format string, args ...any) string {
+	return treat(ANSIReset, fmt.Sprintf(format, args...))
+}
+
 func Black(args ...any) string {
 	return treatAll(ANSIFgBlack, args...)
 }
 
+func Blackf(format string, args ...any) string {
+	return treat(ANSIFgBlack, fmt.Sprintf(format, args...))
+}
+
 func Red(args ...any) string {
 	return treatAll(ANSIFgRed, args...)
 }
 
+func Redf(format string, args ...any) string {
+	return treat(ANSIFgRed, fmt.Sprintf(format, args...))
+}
+
 func RedBg(args ...any) string {
 	return treatAll(ANSIBgRed, args...)
 }
@@ -76,30 +88,58 @@ func Green(args ...any) string {
 	return treatAll(ANSIFgGreen, args...)
 }
 
+func Greenf(format string, args ...any) string {
+	return treat(ANSIFgGreen, fmt.Sprintf(format, args...))
+}
+
 func Yellow(args ...any) string {
 	return treatAll(ANSIFgYellow, args...)
 }
 
+func Yellowf(format string, args ...any) string {
+	return treat(ANSIFgYellow, fmt.Sprintf(format, args...))
+}
+
 func Blue(args ...any) string {
 	return treatAll(ANSIFgBlue, args...)
 }
 
+func Bluef(format string, args ...any) string {
+	return treat(ANSIFgBlue, fmt.Sprintf(format, args...))
+}
+
 func Magenta(args ...any) string {
 	return treatAll(ANSIFgMagenta, args...)
 }
 
+func Magentaf(format string, args ...any) string {
+	return treat(ANSIFgMagenta, fmt.Sprintf(format, args...))
+}
+
 func Cyan(args ...any) string {
 	return treatAll(ANSIFgCyan, args...)
 }
 
+func Cyanf(format string, args ...any) string {
+	return treat(ANSIFgCyan, fmt.Sprintf(format, args...))
+}
+
 func White(args ...any) string {
 	return treatAll(ANSIFgWhite, args...)
 }
 
+func Whitef(format string, args ...any) string {
+	return treat(ANSIFgWhite, fmt.Sprintf(format, args...))
+}
+
 func Gray(args ...any) string {
 	return treatAll(ANSIFgGray, args...)
 }
 
+func Grayf(format string, args ...any) string {
+	return treat(ANSIFgGray, fmt.Sprintf(format, args...))
+}
+
 // result may be 4 ASNSII chars longer than they should be to denote the
 // elipses (...), and one for a trailing hex nibble in case the last byte is
 // non-ascii.