\n\n"
+
+ page := pager.NewPager(e.itemsSorted, pageSize).MustGetPageByPath(path)
+
+ for i := len(page.Items) - 1; i >= 0; i-- {
+ item := page.Items[i]
+
+ out += "
\n\n"
+ id, _ := seqid.FromString(item.Key)
+ out += ufmt.Sprintf("### Submission #%d\n\n", int(id))
+ out += item.Value.(*Item).Render(dashboard)
+ out += "
"
+ }
+
+ out += "
//
-// ### Latest Contributions
+// ### [Hall of Fame](/r/demo/hof)
+//
//
-// [View latest contributions](https://github.com/gnolang/gno/pulls)
//
//
//
diff --git a/examples/gno.land/r/leon/home/gno.mod b/examples/gno.land/r/leon/home/gno.mod
index 48cf64a9d0a..4649cf4abe6 100644
--- a/examples/gno.land/r/leon/home/gno.mod
+++ b/examples/gno.land/r/leon/home/gno.mod
@@ -4,5 +4,6 @@ require (
gno.land/p/demo/ufmt v0.0.0-latest
gno.land/r/demo/art/gnoface v0.0.0-latest
gno.land/r/demo/art/millipede v0.0.0-latest
+ gno.land/r/demo/hof v0.0.0-latest
gno.land/r/leon/config v0.0.0-latest
)
diff --git a/examples/gno.land/r/leon/home/home.gno b/examples/gno.land/r/leon/home/home.gno
index ba688792a4c..aea8b43e9cd 100644
--- a/examples/gno.land/r/leon/home/home.gno
+++ b/examples/gno.land/r/leon/home/home.gno
@@ -8,6 +8,7 @@ import (
"gno.land/r/demo/art/gnoface"
"gno.land/r/demo/art/millipede"
+ "gno.land/r/demo/hof"
"gno.land/r/leon/config"
)
@@ -31,6 +32,8 @@ My contributions to gno.land can mainly be found
TODO import r/gh
`,
}
+
+ hof.Register()
}
func UpdatePFP(url, caption string) {
diff --git a/examples/gno.land/r/manfred/home/gno.mod b/examples/gno.land/r/manfred/home/gno.mod
index 6e7aac70cc7..9885cac19c2 100644
--- a/examples/gno.land/r/manfred/home/gno.mod
+++ b/examples/gno.land/r/manfred/home/gno.mod
@@ -1,3 +1,6 @@
module gno.land/r/manfred/home
-require gno.land/r/manfred/config v0.0.0-latest
+require (
+ gno.land/r/demo/hof v0.0.0-latest
+ gno.land/r/manfred/config v0.0.0-latest
+)
diff --git a/examples/gno.land/r/manfred/home/home.gno b/examples/gno.land/r/manfred/home/home.gno
index 720796a2201..4766f54e51f 100644
--- a/examples/gno.land/r/manfred/home/home.gno
+++ b/examples/gno.land/r/manfred/home/home.gno
@@ -1,6 +1,9 @@
package home
-import "gno.land/r/manfred/config"
+import (
+ "gno.land/r/demo/hof"
+ "gno.land/r/manfred/config"
+)
var (
todos []string
@@ -12,6 +15,7 @@ func init() {
todos = append(todos, "fill this todo list...")
status = "Online" // Initial status set to "Online"
memeImgURL = "https://i.imgflip.com/7ze8dc.jpg"
+ hof.Register()
}
func Render(path string) string {
diff --git a/examples/gno.land/r/morgan/home/gno.mod b/examples/gno.land/r/morgan/home/gno.mod
index 573a7e139e7..35e2fbb2119 100644
--- a/examples/gno.land/r/morgan/home/gno.mod
+++ b/examples/gno.land/r/morgan/home/gno.mod
@@ -1 +1,3 @@
module gno.land/r/morgan/home
+
+require gno.land/r/demo/hof v0.0.0-latest
diff --git a/examples/gno.land/r/morgan/home/home.gno b/examples/gno.land/r/morgan/home/home.gno
index 33d7e0b2df7..571f14ed5ec 100644
--- a/examples/gno.land/r/morgan/home/home.gno
+++ b/examples/gno.land/r/morgan/home/home.gno
@@ -1,10 +1,14 @@
package home
+import "gno.land/r/demo/hof"
+
const staticHome = `# morgan's (gn)home
- [📝 sign my guestbook](/r/morgan/guestbook)
`
+func init() { hof.Register() }
+
func Render(path string) string {
return staticHome
}
diff --git a/gnovm/pkg/gnolang/nodes.go b/gnovm/pkg/gnolang/nodes.go
index c282b619fdc..45062f8e14c 100644
--- a/gnovm/pkg/gnolang/nodes.go
+++ b/gnovm/pkg/gnolang/nodes.go
@@ -149,16 +149,17 @@ func (loc Location) IsZero() bool {
type GnoAttribute string
const (
- ATTR_PREPROCESSED GnoAttribute = "ATTR_PREPROCESSED"
- ATTR_PREDEFINED GnoAttribute = "ATTR_PREDEFINED"
- ATTR_TYPE_VALUE GnoAttribute = "ATTR_TYPE_VALUE"
- ATTR_TYPEOF_VALUE GnoAttribute = "ATTR_TYPEOF_VALUE"
- ATTR_IOTA GnoAttribute = "ATTR_IOTA"
- ATTR_LOCATIONED GnoAttribute = "ATTR_LOCATIONE" // XXX DELETE
- ATTR_GOTOLOOP_STMT GnoAttribute = "ATTR_GOTOLOOP_STMT" // XXX delete?
- ATTR_LOOP_DEFINES GnoAttribute = "ATTR_LOOP_DEFINES" // []Name defined within loops.
- ATTR_LOOP_USES GnoAttribute = "ATTR_LOOP_USES" // []Name loop defines actually used.
- ATTR_SHIFT_RHS GnoAttribute = "ATTR_SHIFT_RHS"
+ ATTR_PREPROCESSED GnoAttribute = "ATTR_PREPROCESSED"
+ ATTR_PREDEFINED GnoAttribute = "ATTR_PREDEFINED"
+ ATTR_TYPE_VALUE GnoAttribute = "ATTR_TYPE_VALUE"
+ ATTR_TYPEOF_VALUE GnoAttribute = "ATTR_TYPEOF_VALUE"
+ ATTR_IOTA GnoAttribute = "ATTR_IOTA"
+ ATTR_LOCATIONED GnoAttribute = "ATTR_LOCATIONE" // XXX DELETE
+ ATTR_GOTOLOOP_STMT GnoAttribute = "ATTR_GOTOLOOP_STMT" // XXX delete?
+ ATTR_LOOP_DEFINES GnoAttribute = "ATTR_LOOP_DEFINES" // []Name defined within loops.
+ ATTR_LOOP_USES GnoAttribute = "ATTR_LOOP_USES" // []Name loop defines actually used.
+ ATTR_SHIFT_RHS GnoAttribute = "ATTR_SHIFT_RHS"
+ ATTR_LAST_BLOCK_STMT GnoAttribute = "ATTR_LAST_BLOCK_STMT"
)
type Attributes struct {
diff --git a/gnovm/pkg/gnolang/op_exec.go b/gnovm/pkg/gnolang/op_exec.go
index a61349b0806..900b5f8e9bb 100644
--- a/gnovm/pkg/gnolang/op_exec.go
+++ b/gnovm/pkg/gnolang/op_exec.go
@@ -676,25 +676,15 @@ EXEC_SWITCH:
bs.Active = bs.Body[cs.BodyIndex] // prefill
case FALLTHROUGH:
ss, ok := m.LastFrame().Source.(*SwitchStmt)
+ // this is handled in the preprocessor
+ // should never happen
if !ok {
- // fallthrough is only allowed in a switch statement
panic("fallthrough statement out of place")
}
- if ss.IsTypeSwitch {
- // fallthrough is not allowed in type switches
- panic("cannot fallthrough in type switch")
- }
+
b := m.LastBlock()
- if b.bodyStmt.NextBodyIndex != len(b.bodyStmt.Body) {
- // fallthrough is not the final statement
- panic("fallthrough statement out of place")
- }
// compute next switch clause from BodyIndex (assigned in preprocess)
nextClause := cs.BodyIndex + 1
- if nextClause >= len(ss.Clauses) {
- // no more clause after the one executed, this is not allowed
- panic("cannot fallthrough final case in switch")
- }
// expand block size
cl := ss.Clauses[nextClause]
if nn := cl.GetNumNames(); int(nn) > len(b.Values) {
diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
index 59de1fd37ce..b7c22e0b9f6 100644
--- a/gnovm/pkg/gnolang/preprocess.go
+++ b/gnovm/pkg/gnolang/preprocess.go
@@ -298,6 +298,11 @@ func initStaticBlocks(store Store, ctx BlockNode, bn BlockNode) {
last.Predefine(false, n.VarName)
}
case *SwitchClauseStmt:
+ blen := len(n.Body)
+ if blen > 0 {
+ n.Body[blen-1].SetAttribute(ATTR_LAST_BLOCK_STMT, true)
+ }
+
// parent switch statement.
ss := ns[len(ns)-1].(*SwitchStmt)
// anything declared in ss are copied,
@@ -2089,9 +2094,7 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
switch n.Op {
case BREAK:
if n.Label == "" {
- if !findBreakableNode(ns) {
- panic("cannot break with no parent loop or switch")
- }
+ findBreakableNode(last, store)
} else {
// Make sure that the label exists, either for a switch or a
// BranchStmt.
@@ -2101,9 +2104,7 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
}
case CONTINUE:
if n.Label == "" {
- if !findContinuableNode(ns) {
- panic("cannot continue with no parent loop")
- }
+ findContinuableNode(last, store)
} else {
if isSwitchLabel(ns, n.Label) {
panic(fmt.Sprintf("invalid continue label %q\n", n.Label))
@@ -2115,17 +2116,36 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
n.Depth = depth
n.BodyIndex = index
case FALLTHROUGH:
- if swchC, ok := last.(*SwitchClauseStmt); ok {
- // last is a switch clause, find its index in the switch and assign
- // it to the fallthrough node BodyIndex. This will be used at
- // runtime to determine the next switch clause to run.
- swch := lastSwitch(ns)
- for i := range swch.Clauses {
- if &swch.Clauses[i] == swchC {
- // switch clause found
- n.BodyIndex = i
- break
- }
+ swchC, ok := last.(*SwitchClauseStmt)
+ if !ok {
+ // fallthrough is only allowed in a switch statement
+ panic("fallthrough statement out of place")
+ }
+
+ if n.GetAttribute(ATTR_LAST_BLOCK_STMT) != true {
+ // no more clause after the one executed, this is not allowed
+ panic("fallthrough statement out of place")
+ }
+
+ // last is a switch clause, find its index in the switch and assign
+ // it to the fallthrough node BodyIndex. This will be used at
+ // runtime to determine the next switch clause to run.
+ swch := lastSwitch(ns)
+
+ if swch.IsTypeSwitch {
+ // fallthrough is not allowed in type switches
+ panic("cannot fallthrough in type switch")
+ }
+
+ for i := range swch.Clauses {
+ if i == len(swch.Clauses)-1 {
+ panic("cannot fallthrough final case in switch")
+ }
+
+ if &swch.Clauses[i] == swchC {
+ // switch clause found
+ n.BodyIndex = i
+ break
}
}
default:
@@ -3295,24 +3315,36 @@ func funcOf(last BlockNode) (BlockNode, *FuncTypeExpr) {
}
}
-func findBreakableNode(ns []Node) bool {
- for _, n := range ns {
- switch n.(type) {
- case *ForStmt, *RangeStmt, *SwitchClauseStmt:
- return true
+func findBreakableNode(last BlockNode, store Store) {
+ for last != nil {
+ switch last.(type) {
+ case *FuncLitExpr, *FuncDecl:
+ panic("break statement out of place")
+ case *ForStmt:
+ return
+ case *RangeStmt:
+ return
+ case *SwitchClauseStmt:
+ return
}
+
+ last = last.GetParentNode(store)
}
- return false
}
-func findContinuableNode(ns []Node) bool {
- for _, n := range ns {
- switch n.(type) {
- case *ForStmt, *RangeStmt:
- return true
+func findContinuableNode(last BlockNode, store Store) {
+ for last != nil {
+ switch last.(type) {
+ case *FuncLitExpr, *FuncDecl:
+ panic("continue statement out of place")
+ case *ForStmt:
+ return
+ case *RangeStmt:
+ return
}
+
+ last = last.GetParentNode(store)
}
- return false
}
func findBranchLabel(last BlockNode, label Name) (
diff --git a/gnovm/tests/files/break0.gno b/gnovm/tests/files/break0.gno
index 17d68dc1dbf..891084c56f9 100644
--- a/gnovm/tests/files/break0.gno
+++ b/gnovm/tests/files/break0.gno
@@ -5,4 +5,4 @@ func main() {
}
// Error:
-// main/files/break0.gno:4:2: cannot break with no parent loop or switch
+// main/files/break0.gno:4:2: break statement out of place
diff --git a/gnovm/tests/files/cont3.gno b/gnovm/tests/files/cont3.gno
index 8a305d4ceb2..39112697860 100644
--- a/gnovm/tests/files/cont3.gno
+++ b/gnovm/tests/files/cont3.gno
@@ -5,4 +5,4 @@ func main() {
}
// Error:
-// main/files/cont3.gno:4:2: cannot continue with no parent loop
+// main/files/cont3.gno:4:2: continue statement out of place
diff --git a/gnovm/tests/files/for21.gno b/gnovm/tests/files/for21.gno
new file mode 100644
index 00000000000..74b7d724121
--- /dev/null
+++ b/gnovm/tests/files/for21.gno
@@ -0,0 +1,17 @@
+package main
+
+func main() {
+ for i := 0; i < 10; i++ {
+ if i == 1 {
+ _ = func() int {
+ continue
+ return 11
+ }()
+ }
+ println(i)
+ }
+ println("wat???")
+}
+
+// Error:
+// main/files/for21.gno:7:17: continue statement out of place
diff --git a/gnovm/tests/files/for22.gno b/gnovm/tests/files/for22.gno
new file mode 100644
index 00000000000..dd86ce97cb7
--- /dev/null
+++ b/gnovm/tests/files/for22.gno
@@ -0,0 +1,17 @@
+package main
+
+func main() {
+ for i := 0; i < 10; i++ {
+ if i == 1 {
+ _ = func() int {
+ fallthrough
+ return 11
+ }()
+ }
+ println(i)
+ }
+ println("wat???")
+}
+
+// Error:
+// main/files/for22.gno:7:17: fallthrough statement out of place
\ No newline at end of file
diff --git a/gnovm/tests/files/for23.gno b/gnovm/tests/files/for23.gno
new file mode 100644
index 00000000000..cb0f4c104fa
--- /dev/null
+++ b/gnovm/tests/files/for23.gno
@@ -0,0 +1,17 @@
+package main
+
+func main() {
+ for i := 0; i < 10; i++ {
+ if i == 1 {
+ _ = func() int {
+ break
+ return 11
+ }()
+ }
+ println(i)
+ }
+ println("wat???")
+}
+
+// Error:
+// main/files/for23.gno:7:17: break statement out of place
\ No newline at end of file
diff --git a/gnovm/tests/files/for24.gno b/gnovm/tests/files/for24.gno
new file mode 100644
index 00000000000..c3d49bb86a7
--- /dev/null
+++ b/gnovm/tests/files/for24.gno
@@ -0,0 +1,19 @@
+package main
+
+func main() {
+ for i := 0; i < 10; i++ {
+ if i == 1 {
+ _ = func() int {
+ if true {
+ break
+ }
+ return 11
+ }()
+ }
+ println(i)
+ }
+ println("wat???")
+}
+
+// Error:
+// main/files/for24.gno:8:21: break statement out of place
\ No newline at end of file
diff --git a/gnovm/tests/files/switch8.gno b/gnovm/tests/files/switch8.gno
index c43c72582c0..f5952354270 100644
--- a/gnovm/tests/files/switch8.gno
+++ b/gnovm/tests/files/switch8.gno
@@ -7,4 +7,4 @@ func main() {
}
// Error:
-// fallthrough statement out of place
+// main/files/switch8.gno:5:2: fallthrough statement out of place
diff --git a/gnovm/tests/files/switch8b.gno b/gnovm/tests/files/switch8b.gno
index cdf35caf784..079b1b48efe 100644
--- a/gnovm/tests/files/switch8b.gno
+++ b/gnovm/tests/files/switch8b.gno
@@ -12,4 +12,4 @@ func main() {
}
// Error:
-// cannot fallthrough final case in switch
+// main/files/switch8b.gno:10:3: cannot fallthrough final case in switch
diff --git a/gnovm/tests/files/switch8c.gno b/gnovm/tests/files/switch8c.gno
index 6897b8a88fd..27c8e3ad9d5 100644
--- a/gnovm/tests/files/switch8c.gno
+++ b/gnovm/tests/files/switch8c.gno
@@ -12,4 +12,4 @@ func main() {
}
// Error:
-// fallthrough statement out of place
+// main/files/switch8c.gno:7:3: fallthrough statement out of place
diff --git a/gnovm/tests/files/switch9.gno b/gnovm/tests/files/switch9.gno
index 5f596de013a..5b05316b0b9 100644
--- a/gnovm/tests/files/switch9.gno
+++ b/gnovm/tests/files/switch9.gno
@@ -13,4 +13,4 @@ func main() {
}
// Error:
-// cannot fallthrough in type switch
+// main/files/switch9.gno:9:3: cannot fallthrough in type switch