gopy, gogi flags, generates class __init__ with SetTags properly for gogi mode. strings., copy() -> method calls

Author: Randall C. O'Reilly

README.md

@@ -6,20 +6,17 @@ It is based on the Go `gofmt` command source code and the go `printer` package,
 
 We have modified the `printer` code in the `pyprint` package to instead print out Python code.
 
-# TODO
-
-* add gopy flag
-
-* strings.Fields(x) -> x.split()
+The `-gopy` flag generates [GoPy](https:://github.com/go-python/gopy) specific Python code, including:
 
-* class comments -> """
+* `nil` -> `go.nil`
+* `[]string{...}` -> `go.Slice_string([...])`  etc for int, float64, float32
 
-* switch -> ifs.. -- grab switch expr and put into each if
+The `-gogi` flag generates [GoGi](https:://github.com/goki/gi) specific Python code, including:
 
-# gopy specific mode
+* struct tags generate: `self.SetTags()` call, for the `pygiv.ClassViewObj` class, which then provides an automatic GUI view with tag-based formatting of struct fields.
 
-* replace []string() -> go.Slice_string etc 
+# TODO
 
-# Check
+* switch -> ifs.. -- grab switch expr and put into each if
 
 

format.go

@@ -36,7 +36,7 @@ func format(
 		if err != nil {
 			return nil, err
 		}
-		pyfix := pyEdits(buf.Bytes(), true)
+		pyfix := pyEdits(buf.Bytes())
 		return pyfix, nil
 		// return buf.Bytes(), nil
 	}
@@ -82,7 +82,7 @@ func format(
 		return nil, err
 	}
 
-	pyfix := pyEdits(buf.Bytes(), true)
+	pyfix := pyEdits(buf.Bytes())
 
 	out := sourceAdj(pyfix, cfg.Indent)
 

gotopy.go

@@ -38,15 +38,17 @@ var (
 	simplifyAST = flag.Bool("s", false, "simplify code")
 	doDiff      = flag.Bool("d", false, "display diffs instead of rewriting files")
 	allErrors   = flag.Bool("e", false, "report all errors (not just the first 10 on different lines)")
+	gopyMode    = flag.Bool("gopy", false, "support GoPy-specific Python code generation")
+	gogiMode    = flag.Bool("gogi", false, "support GoGi-specific Python code generation (implies gopy)")
 
 	// debugging
 	cpuprofile = flag.String("cpuprofile", "", "write cpu profile to this file")
 )
 
 // Keep these in sync with go/format/format.go.
 const (
-	tabWidth    = 8
-	printerMode = pyprint.UseSpaces | pyprint.TabIndent | printerNormalizeNumbers
+	tabWidth       = 8
+	printerModeDef = pyprint.UseSpaces | pyprint.TabIndent | printerNormalizeNumbers
 
 	// printerNormalizeNumbers means to canonicalize number literal prefixes
 	// and exponents while printing. See https://golang.org/doc/go1.13#gofmt.
@@ -56,10 +58,11 @@ const (
 )
 
 var (
-	fileSet    = token.NewFileSet() // per process FileSet
-	exitCode   = 0
-	rewrite    func(*ast.File) *ast.File
-	parserMode parser.Mode
+	fileSet     = token.NewFileSet() // per process FileSet
+	exitCode    = 0
+	rewrite     func(*ast.File) *ast.File
+	parserMode  parser.Mode
+	printerMode = printerModeDef
 )
 
 func report(err error) {
@@ -224,6 +227,14 @@ func gofmtMain() {
 		return
 	}
 
+	if *gopyMode {
+		printerMode |= pyprint.GoPy
+	}
+
+	if *gogiMode {
+		printerMode |= pyprint.GoGi | pyprint.GoPy
+	}
+
 	for i := 0; i < flag.NArg(); i++ {
 		path := flag.Arg(i)
 		switch dir, err := os.Stat(path); {

pyedits.go

@@ -6,7 +6,10 @@ package main
 
 import (
 	"bytes"
+	"fmt"
 	"strings"
+
+	"github.com/goki/gotopy/pyprint"
 )
 
 // moveLines moves the st,ed region to 'to' line
@@ -26,11 +29,10 @@ func moveLines(lines *[][]byte, to, st, ed int) {
 // * moves python segments around, e.g., methods
 // into their proper classes
 // * fixes printf, slice other common code
-func pyEdits(src []byte, gopy bool) []byte {
+func pyEdits(src []byte) []byte {
 	type sted struct {
 		st, ed int
 	}
-
 	classes := map[string]sted{}
 
 	nl := []byte("\n")
@@ -41,10 +43,14 @@ func pyEdits(src []byte, gopy bool) []byte {
 	fmtSprintf := []byte("fmt.Sprintf(")
 	prints := []byte("print")
 	eqappend := []byte("= append(")
+	elseif := []byte("else if")
+	elif := []byte("elif")
 	itoa := []byte("strconv.Itoa")
 	float64p := []byte("float64(")
 	float32p := []byte("float32(")
 	floatp := []byte("float(")
+	stringp := []byte("string(")
+	strp := []byte("str(")
 	slicestr := []byte("[]string(")
 	sliceint := []byte("[]int(")
 	slicefloat64 := []byte("[]float64(")
@@ -53,6 +59,8 @@ func pyEdits(src []byte, gopy bool) []byte {
 	gosliceint := []byte("go.Slice_int([")
 	goslicefloat64 := []byte("go.Slice_float64([")
 	goslicefloat32 := []byte("go.Slice_float32([")
+	stringsdot := []byte("strings.")
+	copyp := []byte("copy(")
 
 	endclass := "EndClass: "
 	method := "Method: "
@@ -66,6 +74,9 @@ func pyEdits(src []byte, gopy bool) []byte {
 	lastComSt := -1
 	lastComEd := -1
 
+	gopy := (printerMode&pyprint.GoPy != 0)
+	// gogi := (printerMode&pyprint.GoGi != 0)
+
 	li := 0
 	for {
 		if li >= len(lines) {
@@ -86,6 +97,7 @@ func pyEdits(src []byte, gopy bool) []byte {
 
 		ln = bytes.Replace(ln, float64p, floatp, -1)
 		ln = bytes.Replace(ln, float32p, floatp, -1)
+		ln = bytes.Replace(ln, stringp, strp, -1)
 		lines[li] = ln
 
 		switch {
@@ -154,25 +166,66 @@ func pyEdits(src []byte, gopy bool) []byte {
 			nln = append(nln, []byte(".append(")...)
 			nln = append(nln, ln[idx+len(eqappend)+comi+1:]...)
 			lines[li] = nln
-		case bytes.Contains(ln, slicestr):
+		case bytes.Contains(ln, stringsdot):
+			idx := bytes.Index(ln, stringsdot)
+			pi := idx + len(stringsdot) + bytes.Index(ln[idx+len(stringsdot):], []byte("("))
+			comi := bytes.Index(ln[pi:], []byte(","))
+			nln := make([]byte, idx)
+			copy(nln, ln[:idx])
+			if comi < 0 {
+				comi = bytes.Index(ln[pi:], []byte(")"))
+				nln = append(nln, ln[pi+1:pi+comi]...)
+				nln = append(nln, '.')
+				meth := bytes.ToLower(ln[idx+len(stringsdot) : pi+1])
+				fmt.Println(string(meth))
+				if bytes.Equal(meth, []byte("fields(")) {
+					meth = []byte("split(")
+				}
+				nln = append(nln, meth...)
+				nln = append(nln, ln[pi+comi:]...)
+			} else {
+				nln = append(nln, ln[pi+1:pi+comi]...)
+				nln = append(nln, '.')
+				meth := bytes.ToLower(ln[idx+len(stringsdot) : pi+1])
+				nln = append(nln, meth...)
+				nln = append(nln, ln[pi+comi+1:]...)
+			}
+			lines[li] = nln
+		case bytes.Contains(ln, copyp):
+			idx := bytes.Index(ln, copyp)
+			pi := idx + len(copyp) + bytes.Index(ln[idx+len(stringsdot):], []byte("("))
+			comi := bytes.Index(ln[pi:], []byte(","))
+			nln := make([]byte, idx)
+			copy(nln, ln[:idx])
+			nln = append(nln, ln[pi+1:pi+comi]...)
+			nln = append(nln, '.')
+			nln = append(nln, copyp...)
+			nln = append(nln, ln[pi+comi+1:]...)
+			lines[li] = nln
+		case bytes.Contains(ln, itoa):
+			ln = bytes.Replace(ln, itoa, []byte(`str`), -1)
+			lines[li] = ln
+		case bytes.Contains(ln, elseif):
+			ln = bytes.Replace(ln, elseif, elif, -1)
+			lines[li] = ln
+
+		// gopy cases
+		case gopy && bytes.Contains(ln, slicestr):
 			ln = bytes.Replace(ln, slicestr, goslicestr, -1)
 			ln = bytes.Replace(ln, []byte(")"), []byte("])"), 1)
 			lines[li] = ln
-		case bytes.Contains(ln, sliceint):
+		case gopy && bytes.Contains(ln, sliceint):
 			ln = bytes.Replace(ln, sliceint, gosliceint, -1)
 			ln = bytes.Replace(ln, []byte(")"), []byte("])"), 1)
 			lines[li] = ln
-		case bytes.Contains(ln, slicefloat64):
+		case gopy && bytes.Contains(ln, slicefloat64):
 			ln = bytes.Replace(ln, slicefloat64, goslicefloat64, -1)
 			ln = bytes.Replace(ln, []byte(")"), []byte("])"), 1)
 			lines[li] = ln
-		case bytes.Contains(ln, slicefloat32):
+		case gopy && bytes.Contains(ln, slicefloat32):
 			ln = bytes.Replace(ln, slicefloat32, goslicefloat32, -1)
 			ln = bytes.Replace(ln, []byte(")"), []byte("])"), 1)
 			lines[li] = ln
-		case bytes.Contains(ln, itoa):
-			ln = bytes.Replace(ln, itoa, []byte(`str`), -1)
-			lines[li] = ln
 		}
 		li++
 	}

pyprint/nodes.go

@@ -443,6 +443,17 @@ func (p *printer) setLineComment(text string) {
 	p.setComment(&ast.CommentGroup{List: []*ast.Comment{{Slash: token.NoPos, Text: text}}})
 }
 
+func (p *printer) printFieldInit(fi ast.Expr) {
+	switch fi.(type) {
+	case *ast.Ident, *ast.SelectorExpr:
+		p.expr(fi)
+		p.print(token.LPAREN, token.RPAREN)
+	default:
+		p.expr(fi)
+		// 	fmt.Printf("%T\n", fi)
+	}
+}
+
 func (p *printer) fieldList(fields *ast.FieldList, isStruct, isIncomplete bool) {
 	lbrace := fields.Opening
 	list := fields.List
@@ -496,6 +507,9 @@ func (p *printer) fieldList(fields *ast.FieldList, isStruct, isIncomplete bool)
 
 	if isStruct {
 		p.print("def __init__(self):", newline, indent)
+		if p.Mode&GoGi != 0 {
+			p.print("super(Sim, self).__init__()", newline)
+		}
 		sep := vtab
 		if len(list) == 1 {
 			sep = blank
@@ -512,8 +526,12 @@ func (p *printer) fieldList(fields *ast.FieldList, isStruct, isIncomplete bool)
 			if len(f.Names) > 0 {
 				// named fields
 				p.identList(f.Names, false)
-				p.print(sep)
-				p.expr(f.Type)
+				p.print(sep, token.ASSIGN, sep)
+				if se, ok := f.Type.(*ast.StarExpr); ok {
+					p.printFieldInit(se.X)
+				} else {
+					p.printFieldInit(f.Type)
+				}
 				extraTabs = 1
 			} else {
 				// anonymous field
@@ -525,8 +543,16 @@ func (p *printer) fieldList(fields *ast.FieldList, isStruct, isIncomplete bool)
 					p.print(sep)
 				}
 				p.print(sep)
-				p.print("# ")
-				p.expr(f.Tag)
+				if p.Mode&GoGi != 0 {
+					p.print(newline, `self.SetTags("`+f.Names[0].Name+`", '`)
+					tg := f.Tag.Value
+					tg = strings.Replace(tg, "'", `\'`, -1)
+					p.print(tg[1 : len(tg)-1]) // cut out ` `
+					p.print(`')`)
+				} else {
+					p.print("# ")
+					p.expr(f.Tag)
+				}
 				extraTabs = 0
 			}
 			if f.Comment != nil {
@@ -986,10 +1012,11 @@ func (p *printer) expr1(expr ast.Expr, prec1, depth int) {
 		p.fieldList(x.Methods, false, x.Incomplete)
 
 	case *ast.MapType:
-		p.print(token.MAP, token.LBRACK)
-		p.expr(x.Key)
-		p.print(token.RBRACK)
-		p.expr(x.Value)
+		p.print(token.LBRACE, token.RBRACE)
+		// p.print(token.MAP, token.LBRACK)
+		// p.expr(x.Key)
+		// p.print(token.RBRACK)
+		// p.expr(x.Value)
 
 	case *ast.ChanType:
 		switch x.Dir {
@@ -1658,6 +1685,9 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {
 		p.flush(p.pos, token.TYPE) // get rid of any comments
 		p.print("class", blank)
 		p.expr(s.Name)
+		if p.Mode&GoGi != 0 {
+			p.print("(pygiv.ClassViewObj):", newline)
+		}
 		// if n == 1 {
 		// 	p.print(blank)
 		// } else {
@@ -1666,8 +1696,10 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {
 		if s.Assign.IsValid() {
 			p.print(token.ASSIGN, blank)
 		}
-		p.pyFuncComments(s.Doc) // neither s.Doc nor s.Comment work here
+		doc := p.comments[p.cindex-1]
+		p.pyFuncComments(doc) // neither s.Doc nor s.Comment work here
 		p.expr(s.Type)
+		p.print(newline)
 		p.print("<<<<EndClass: ")
 		p.expr(s.Name)
 		p.print(">>>>", newline)
@@ -1859,19 +1891,24 @@ func (p *printer) pyFuncComments(com *ast.CommentGroup) {
 	if com == nil || len(com.List) == 0 {
 		return
 	}
+	p.print("\t")
 	p.print(`"""`, newline)
 	for _, c := range com.List {
+		p.print("\t")
 		if len(c.Text) < 3 {
 			p.print(c.Text)
 		} else {
 			if c.Text[1] == '/' {
 				p.print(c.Text[3:])
+			} else if c.Text[0] == '#' {
+				p.print(c.Text[2:])
 			} else {
 				p.print(c.Text)
 			}
 		}
 		p.print(newline)
 	}
+	p.print("\t")
 	p.print(`"""`, newline)
 }
 
@@ -1904,9 +1941,8 @@ func (p *printer) funcDecl(d *ast.FuncDecl) {
 	}
 	p.signature(d.Type.Params, d.Type.Results)
 	p.print(token.RPAREN)
-	p.print(token.COLON, newline, indent)
+	p.print(token.COLON, newline)
 	p.pyFuncComments(d.Doc)
-	p.print(unindent)
 	p.funcBody(p.distanceFrom(d.Pos(), startCol), vtab, d.Body)
 	if d.Recv != nil {
 		p.print(unindent)

pyprint/printer.go

@@ -1019,7 +1019,9 @@ func (p *printer) print(args ...interface{}) {
 		case "false":
 			data = "False"
 		case "nil":
-			data = "go.nil" // todo: gopy mode
+			if p.Config.Mode&GoPy != 0 {
+				data = "go.nil"
+			}
 		}
 
 		p.writeString(next, data, isLit)
@@ -1293,6 +1295,8 @@ const (
 	TabIndent                  // use tabs for indentation independent of UseSpaces
 	UseSpaces                  // use spaces instead of tabs for alignment
 	SourcePos                  // emit //line directives to preserve original source positions
+	GoPy                       // support GoPy-specific Python code generation
+	GoGi                       // support GoGi-specific Python code generation
 )
 
 // The mode below is not included in printer's public API because