Merge pull request #15 from haya14busa/go-closure

Support :func-closure
vim-jp · Sep 19, 2016 · a41844f · a41844f
2 parents 54c0748 + 7e4844b
commit a41844f
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 18 deletions.
diff --git a/ast/node.go b/ast/node.go
@@ -67,9 +67,10 @@ type Function struct {
 }
 
 type FuncAttr struct {
-	Range bool
-	Abort bool
-	Dict  bool
+	Range   bool
+	Abort   bool
+	Dict    bool
+	Closure bool
 }
 
 func (f *Function) Pos() Pos { return f.Func }

diff --git a/autoload/vimlparser.vim b/autoload/vimlparser.vim
@@ -1344,14 +1344,14 @@ function! s:VimLParser.parse_cmd_function()
     return
   endif
 
-  " :function[!] {name}([arguments]) [range] [abort] [dict]
+  " :function[!] {name}([arguments]) [range] [abort] [dict] [closure]
   let node = s:Node(s:NODE_FUNCTION)
   let node.pos = self.ea.cmdpos
   let node.body = []
   let node.ea = self.ea
   let node.left = left
   let node.rlist = []
-  let node.attr = {'range': 0, 'abort': 0, 'dict': 0}
+  let node.attr = {'range': 0, 'abort': 0, 'dict': 0, 'closure': 0}
   let node.endfunction = s:NIL
   call self.reader.getn(1)
   let tokenizer = s:ExprTokenizer.new(self.reader)
@@ -1415,6 +1415,8 @@ function! s:VimLParser.parse_cmd_function()
       let node.attr.abort = s:TRUE
     elseif key ==# 'dict'
       let node.attr.dict = s:TRUE
+    elseif key ==# 'closure'
+      let node.attr.closure = s:TRUE
     else
       throw s:Err(printf('unexpected token: %s', key), epos)
     endif

diff --git a/go/export.go b/go/export.go
@@ -187,19 +187,21 @@ func NewExportNode(n *VimNode) *ExportNode {
 }
 
 type ExportFuncAttr struct {
-	Range bool
-	Abort bool
-	Dict  bool
+	Range   bool
+	Abort   bool
+	Dict    bool
+	Closure bool
 }
 
 func NewExportFuncAttr(attr *FuncAttr) *ExportFuncAttr {
 	if attr == nil {
 		return nil
 	}
 	return &ExportFuncAttr{
-		Range: attr.range_,
-		Abort: attr.abort,
-		Dict:  attr.dict,
+		Range:   attr.range_,
+		Abort:   attr.abort,
+		Dict:    attr.dict,
+		Closure: attr.closure,
 	}
 }
 

diff --git a/go/type.go b/go/type.go
@@ -73,9 +73,10 @@ type VimNode struct {
 }
 
 type FuncAttr struct {
-	range_ bool
-	abort  bool
-	dict   bool
+	range_  bool
+	abort   bool
+	dict    bool
+	closure bool
 }
 
 type lhs struct {

diff --git a/go/vimlparser.go b/go/vimlparser.go
diff --git a/internal/exporter/node.go b/internal/exporter/node.go
@@ -47,9 +47,10 @@ func NewNode(n *internal.ExportNode) ast.Node {
 		attr := ast.FuncAttr{}
 		if n.Attr != nil {
 			attr = ast.FuncAttr{
-				Range: n.Attr.Range,
-				Abort: n.Attr.Abort,
-				Dict:  n.Attr.Dict,
+				Range:   n.Attr.Range,
+				Abort:   n.Attr.Abort,
+				Dict:    n.Attr.Dict,
+				Closure: n.Attr.Closure,
 			}
 		}
 		return &ast.Function{

diff --git a/test/test_funcattr.ok b/test/test_funcattr.ok
@@ -0,0 +1,2 @@
+(function (F))
+(function (F))
diff --git a/test/test_funcattr.vim b/test/test_funcattr.vim
@@ -0,0 +1,5 @@
+function! F() abort
+endfunction
+
+function! F() dict abort range closure
+endfunction