WIP p/jaekwon/...

Makefile

@@ -3,7 +3,7 @@
 .PHONY: logos goscan gnoland gnokey gnofaucet logos reset gnoweb gnotxport
 all: build
 
-build: gnoland gnokey goscan logos gnoweb gnotxport
+build: gnoland gnokey gnodev goscan logos gnoweb gnotxport
 
 install: install_gnodev install_gnokey
 

cmd/gnodev/main.go

@@ -25,6 +25,12 @@ type (
 )
 
 var mainApps AppList = []AppItem{
+	{
+		App:      runApp,
+		Name:     "run",
+		Desc:     "run a Gno file",
+		Defaults: defaultRunOptions,
+	},
 	{
 		App:      buildApp,
 		Name:     "build",
@@ -55,7 +61,7 @@ var mainApps AppList = []AppItem{
 	// graph
 	// vendor -- download deps from the chain in vendor/
 	// list -- list packages
-	// run -- call render(), or maybe create a new main?
+	// render -- call render()?
 	// publish/release
 	// generate
 	// doc -- godoc

cmd/gnodev/repl.go

@@ -56,6 +56,7 @@ func runRepl(rootDir string, verbose bool) error {
 	}
 	m := gno.NewMachineWithOptions(gno.MachineOptions{
 		PkgPath: "test",
+		Output:  stdout,
 		Store:   testStore,
 	})
 

cmd/gnodev/run.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"os"
+
+	"github.com/gnolang/gno/pkgs/command"
+	"github.com/gnolang/gno/pkgs/errors"
+	gno "github.com/gnolang/gno/pkgs/gnolang"
+	"github.com/gnolang/gno/tests"
+)
+
+type runOptions struct {
+	Verbose bool   `flag:"verbose" help:"verbose"`
+	RootDir string `flag:"root-dir" help:"clone location of github.com/gnolang/gno (gnodev tries to guess it)"`
+	// Timeout time.Duration `flag:"timeout" help:"max execution time"`
+	// VM Options
+	// UseNativeLibs bool // experimental, but could be useful for advanced developer needs
+}
+
+var defaultRunOptions = runOptions{
+	Verbose: false,
+	RootDir: "",
+}
+
+func runApp(cmd *command.Command, args []string, iopts interface{}) error {
+	opts := iopts.(runOptions)
+	if len(args) == 0 {
+		cmd.ErrPrintfln("Usage: run [flags] file.gno [file2.gno...]")
+		return errors.New("invalid args")
+	}
+
+	if opts.RootDir == "" {
+		opts.RootDir = guessRootDir()
+	}
+
+	fnames := args
+
+	return runRun(opts.RootDir, opts.Verbose, fnames)
+}
+
+func runRun(rootDir string, verbose bool, fnames []string) error {
+	stdin := os.Stdin
+	stdout := os.Stdout
+	stderr := os.Stderr
+
+	// init store and machine
+	testStore := tests.TestStore(rootDir, "", stdin, stdout, stderr, tests.ImportModeStdlibsOnly)
+	if verbose {
+		testStore.SetLogStoreOps(true)
+	}
+	m := gno.NewMachineWithOptions(gno.MachineOptions{
+		PkgPath: "main",
+		Output:  stdout,
+		Store:   testStore,
+	})
+
+	// read files
+	files := make([]*gno.FileNode, len(fnames))
+	for i, fname := range fnames {
+		files[i] = gno.MustReadFile(fname)
+	}
+
+	// run files
+	m.RunFiles(files...)
+	m.RunMain()
+
+	return nil
+}

examples/gno.land/p/demo/avl/node.gno

@@ -1,5 +1,6 @@
 package avl
 
+//----------------------------------------
 // Node
 
 type Node struct {

examples/gno.land/p/demo/avl/tree.gno

@@ -43,11 +43,39 @@ func (tree *Tree) Remove(key string) (value interface{}, removed bool) {
 }
 
 // Shortcut for TraverseInRange.
-func (tree *Tree) Iterate(start, end string, cb func(*Node) bool) bool {
-	return tree.node.TraverseInRange(start, end, true, true, cb)
+func (tree *Tree) Iterate(start, end string, cb IterCbFn) bool {
+	return tree.node.TraverseInRange(start, end, true, true,
+		func(node *Node) {
+			cb(node.Key(), node.Value())
+		},
+	)
 }
 
 // Shortcut for TraverseInRange.
-func (tree *Tree) IterateReverse(start, end string, cb func(*Node) bool) bool {
-	return tree.node.TraverseInRange(start, end, false, true, cb)
+func (tree *Tree) ReverseIterate(start, end string, cb IterCbFn) bool {
+	return tree.node.TraverseInRange(start, end, false, true,
+		func(node *Node) {
+			cb(node.Key(), node.Value())
+		},
+	)
 }
+
+// Shortcut for TraverseByOffset.
+func (tree *Tree) IterateByOffset(offset int, count int, cb IterCbFn) bool {
+	return tree.node.TraverseByOffset(offset, count, true, true,
+		func(node *Node) {
+			cb(node.Key(), node.Value())
+		},
+	)
+}
+
+// Shortcut for TraverseByOffset.
+func (tree *Tree) ReverseIterateByOffset(start, end string, cb IterCbFn) bool {
+	return tree.node.TraverseByOffset(offset, count, false, true,
+		func(node *Node) {
+			cb(node.Key(), node.Value())
+		},
+	)
+}
+
+func IterCbFn func(key string, value interface{}) bool 

examples/gno.land/p/jaekwon/paginate/paginate.gno

@@ -0,0 +1,97 @@
+package paginate
+
+import "strconv"
+
+type pageFn func(page int, size int, reverse bool) string
+
+// TODO maybe put somewhere else.
+type renderer interface {
+	Render() string
+}
+
+// TODO this function belongs somewhere convenient.
+// escape a URL for markdown.
+func escMDURL(s string) string {
+	// XXX implement
+}
+
+
+var itoa = strconv.Itoa
+
+// pageFn: path function to render paginattion links. if nil, no links are
+// rendered. result must start with ':'.
+// t: the tree with elements. each value must implement Render() string.
+// page: page number starting from 1.
+// size: page size.
+// reverse: reverse order. // XXX implement
+func RenderTreeByPage(
+	t avl.Tree,
+	pageFn pageFn,
+	page int, size int, reverse bool) {
+
+	// sanity checks
+	if page < 0 {
+		panic("invalid negative page to RenderTreeByPage")
+	}
+	if size <= 0 {
+		panic("invalid nonpositive size to RenderTreeByPage")
+	}
+
+	str := ""
+	numpages := (t.Size() / size) + 1
+
+	// render pagination
+	if pageFn == nil {
+		// do not render pagination
+	} else if page > numpages {
+		// page out of bounds.
+		// [1](...) [2](...) ... [101](...) [102)(...) 
+		// where ... is result of pageFn().
+		// TODO: improve this function by renderring
+		// only the first and last few pages. XXX
+		for p := 1; p <= numPages; p++ {
+			pageurl := pageFn(p, size, reverse)
+			str += "[" + itoa(page) + "](" + 
+				escMDURL(pageurl) + ") "
+		}
+		str += "\n"
+		str += "page " + itoa(page) + " out of bounds\n"
+		return str
+	}
+	// [1](...) *2* [3](...) [4](...) ... [101](...) [102)(...) 
+	// where ... is result of pageFn().
+	// TODO: improve this function by only printing the first few,
+	// the last few, and the ones surrounding the current page.
+	// Must make this improvement to be strictly "memory correct".
+	if numpages > 0 {
+		for p := 1; p <= numPages; p++ {
+			pageurl := pageFn(p, size, reverse)
+			str += "[" + itoa(page) + "](" + 
+				escMDURL(pageurl) + ") "
+		}
+		str += "\n"
+	}
+
+	// render tree items
+	offset := (page-1) * size
+	t.IterateByOffset(offset, size,
+		func(key string, value interface{}) bool {
+			var r = value.(renderer)
+			str += r.Render()
+			str += "\n"
+			str += "\n"
+		},
+	)
+
+	// render pagination again if there are pages.
+	if numpages > 0 {
+		for p := 1; p <= numPages; p++ {
+			pageurl := pageFn(p, size, reverse)
+			str += "[" + itoa(page) + "](" + 
+				escMDURL(pageurl) + ") "
+		}
+		str += "\n"
+	}
+
+	return str
+}

examples/gno.land/p/jaekwon/tests/main.gno

@@ -0,0 +1,7 @@
+package tests
+
+/* The intent is for this file to run the main test, with data that will go on the chain upon launch */
+
+func main() {
+	// XXX
+}