Merge pull request #1204 from ritchiecarroll/master

golang: Fixed issue parsing structures with functionType parameters
antlr · Aug 8, 2018 · 5a5a72c · 5a5a72c
2 parents 046427d + 479c303
commit 5a5a72c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/golang/Golang.g4 b/golang/Golang.g4
@@ -164,7 +164,7 @@ grammar Golang;
 
 //SourceFile       = PackageClause ";" { ImportDecl ";" } { TopLevelDecl ";" } .
 sourceFile
-    : packageClause eos ( importDecl eos )* ( topLevelDecl eos)*
+    : packageClause eos ( importDecl eos )* ( topLevelDecl eos )*
     ;
 
 //PackageClause  = "package" PackageName .
@@ -553,7 +553,8 @@ functionType
     ;
 
 signature
-    : parameters result?
+    : {noTerminatorAfterParams(1)}? parameters result
+    | parameters
     ;
 
 result

diff --git a/golang/examples/struct_with_func_type.go b/golang/examples/struct_with_func_type.go
@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+type Person struct {
+    work func()
+    name string
+    age int32
+}
+
+func main() {
+    person := Person{work: nil, name: "Michał", age: 29}
+    fmt.Println(person)  // {<nil> Michał 29}
+}