Merge branch 'go'

Author: haya14busa

autoload/vimlparser.vim

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/haya14busa/go-vimlparser"
+)
+
+func main() {
+	flag.Parse()
+
+	r := os.Stdin
+
+	if p := flag.Arg(0); p != "" {
+		f, err := os.Open(p)
+		if err != nil {
+			log.Fatal(err)
+		}
+		r = f
+	}
+
+	node, err := vimlparser.Parse(r)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err := vimlparser.Compile(os.Stdout, node); err != nil {
+		log.Fatal(err)
+	}
+	fmt.Printf("\n")
+}

cmd/vimlparser/main.go

@@ -0,0 +1 @@
+*.out

go/_test/.gitignore

@@ -0,0 +1,3 @@
+// this is comment
+var x = 1
+// cannot keep inline comment

go/_test/comment.go

@@ -0,0 +1,2 @@
+" this is comment
+let x = 1 " cannot keep inline comment

go/_test/comment.vim

@@ -0,0 +1,2 @@
+var x = map[string]interface{}{}
+var y = map[string]interface{}{"a":1, "b":"string"}

go/_test/dict.go

@@ -0,0 +1,2 @@
+let x = {}
+let y = { 'a': 1, 'b': 'string'}

go/_test/dict.vim

@@ -0,0 +1,16 @@
+for _, x := range xs {
+	var y = x
+	x = 1
+}
+func Func() {
+	for _, y := range ys {
+	}
+	// for creates scope
+	var y = 1
+}
+
+for k, v := range kv {
+	var s = k
+	k = 1
+	v = 1
+}

go/_test/empty.go

@@ -0,0 +1,17 @@
+for x in xs
+  let y = x
+  let x = 1
+endfor
+
+function! Func() abort
+  for y in ys
+  endfor
+  " for creates scope
+  let y = 1
+endfunction
+
+for [k,v] in kv
+  let s = k
+  let k = 1
+  let v = 1
+endfor

go/_test/empty.vim

@@ -0,0 +1,3 @@
+func Funcname() {
+}
+

go/_test/for.go

@@ -0,0 +1,2 @@
+function! Funcname()
+endfunction

go/_test/for.vim

@@ -0,0 +1,24 @@
+if 1 {
+	var a = 1
+}
+if 2 {
+} else {
+	var b = 1
+}
+if 3 {
+	var c = 1
+} else if 4 {
+	var d = 1
+} else {
+	var e = 1
+}
+if 4 {
+	var f = 1
+} else if 5 {
+	var g = 1
+}
+if 6 {
+	if 7 {
+		var h = 1
+	}
+}

go/_test/function.go

@@ -0,0 +1,24 @@
+if 1
+  let a = 1
+endif
+if 2
+else
+  let b = 1
+endif
+if 3
+  let c = 1
+elseif 4
+  let d = 1
+else
+  let e = 1
+endif
+if 4
+  let f = 1
+elseif 5
+  let g = 1
+endif
+if 6
+  if 7
+    let h = 1
+  endif
+endif

go/_test/function.vim

@@ -0,0 +1,31 @@
+var x = 1
+func Funcname() {
+	var y = 1
+	y = 2
+	x = 1
+}
+
+func Funcname(z) {
+	z = z
+}
+
+func (self *VimLParser) hoge(a) {
+	a = a
+}
+
+var b, c = d
+b, c = d
+node.pattern, b = hoge
+node.pattern, _ = hoge
+var e = 1
+if f {
+	e = g
+	var h = 0
+	if i {
+		h = 1
+	}
+}
+var xs = 1
+if x {
+	xs[0] = 1
+}

go/_test/if.go

@@ -0,0 +1,33 @@
+let x = 1
+function! Funcname() abort
+  let y = 1
+  let y = 2
+  let x = 1
+endfunction
+
+function! Funcname(z) abort
+  let z = a:z
+endfunction
+
+function! s:VimLParser.hoge(a)
+  let a = a:a
+endfunction
+
+let [b, c] = d
+let [b, c] = d
+let [node.pattern, b] = hoge
+let [node.pattern, _] = hoge
+
+let e = 1
+if f
+  let e = g
+  let h = 0
+  if i
+    let h = 1
+  endif
+endif
+
+let xs = 1
+if x
+  let xs[0] = 1
+endif

go/_test/if.vim

@@ -0,0 +1,2 @@
+var x = []interface{}{1, 2, 3}
+var y = []interface{}{}

go/_test/let.go

@@ -0,0 +1,2 @@
+let x = [1,2,3]
+let y = []

go/_test/let.vim

@@ -0,0 +1,4 @@
+func f() {
+	return 1, 2
+}
+

go/_test/list.go

@@ -0,0 +1,3 @@
+function! s:f()
+  return [1, 2]
+endfunction

go/_test/list.vim

@@ -0,0 +1,76 @@
+func (self *VimLParser) __init__() {
+	var x = 1
+}
+
+var y = &ExArg{}
+self.hoge = 1
+self.ea.range_ = 1
+xxx.x = 1
+var z = self.ea.range_
+var xs = viml_range(10)
+Node()
+var type_ = 1
+var t = type_
+var at = type_
+var lhs = &lhs{}
+var lhs = hoge()
+for _, x := range builtin_commands {
+}
+func (self *LvalueParser) pos1() {
+	var pos = self.reader.tell()
+}
+
+func (self *LvalueParser) pos2() {
+	var pos = self.reader.tell()
+}
+
+self.ea.forceit = true
+self.ea.forceit = false
+self.ea.usefilter = true
+self.ea.usefilter = false
+node.attr.range_ = true
+node.attr.abort = true
+node.attr.dict = true
+// skip
+// end skip
+// do not skip
+node.list = self.parse_lvaluelist()
+node.depth = hoge
+node.rlist = []*VimNode{nil, nil}
+node.rlist = []*VimNode{right, nil}
+node.rlist = F()
+// end do not skip
+var p = NewVimLParser()
+var et = NewExprTokenizer(r)
+var ep = NewExprParser(r)
+var lp = NewLvalueParser(r)
+var r = NewStringReader(lines)
+var nl = nil
+var list []*VimNode
+var curly_parts []*VimNode
+var cmd *Cmd = nil
+cmd = &Cmd{name: name, flags: "USERCMD", parser: "parse_cmd_usercmd"}
+// type assertion
+var s = left.value.(string)
+var vn = isvarname(node.value.(string))
+func cache() {
+	self.reader.seek_set(x[0].(int))
+	return x[1].(*ExprToken)
+}
+
+F(self.compile(node.left).(string))
+F(self.compile(node.rest).(string))
+func F() {
+	return node.value.(string)
+}
+
+// end type assertion
+xs = append(xs, x)
+node.value = append(node.value.([]interface{}), []interface{}{key, val})
+if cnode.pattern != "" {
+}
+if node.depth != 0 {
+}
+var rlist = func() []string {;var ss []string;for _, vval := range node.rlist {;ss = append(ss, self.compile(vval).(string));};return ss;}()
+F(func() string { if node.rlist[0] == nil {return "nil"} else {return self.compile(node.rlist[0]).(string)} }())
+F(func() string { if node.rlist[1] == nil {return "nil"} else {return self.compile(node.rlist[1]).(string)} }())