jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #1848 from davesisson/master 

Fix tests for PR #1844.
This commit is contained in:
Terence Parr 2017-05-12 09:18:46 -07:00 committed by GitHub
parent c1663e7c0f e9dd953cf1
commit f2ee752a58
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/go-target.md
View File

@ -88,7 +88,7 @@ func (this *TreeShapeListener) EnterEveryRule(ctx antlr.ParserRuleContext) {
}
func main() {
input := antlr.NewFileStream(os.Args[1])
input, _ := antlr.NewFileStream(os.Args[1])
lexer := parser.NewJSONLexer(input)
stream := antlr.NewCommonTokenStream(lexer,0)
p := parser.NewJSONParser(stream)

13
runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseGoTest.java
View File

@ -674,6 +674,7 @@ public class BaseGoTest implements RuntimeTestSupport {
"import (\n"
+" \"github.com/antlr/antlr4/runtime/Go/antlr\"\n"
+" \"./parser\"\n"
+" \"fmt\"\n"
+" \"os\"\n"
+")\n"
+ "\n"
@ -696,7 +697,11 @@ public class BaseGoTest implements RuntimeTestSupport {
+ "}\n"
+ "\n"
+ "func main() {\n"
+ " input := antlr.NewFileStream(os.Args[1])\n"
+ " input, err := antlr.NewFileStream(os.Args[1])\n"
+ " if err != nil {\n"
+ " fmt.Printf(\"Failed to find file: %v\", err)\n"
+ " return\n"
+ " }\n"
+ " lexer := parser.New<lexerName>(input)\n"
+ " stream := antlr.NewCommonTokenStream(lexer,0)\n"
+ "<createParser>"
@ -734,7 +739,11 @@ public class BaseGoTest implements RuntimeTestSupport {
+ ")\n"
+ "\n"
+ "func main() {\n"
+ " input := antlr.NewFileStream(os.Args[1])\n"
+ " input, err := antlr.NewFileStream(os.Args[1])\n"
+ " if err != nil {\n"
+ " fmt.Printf(\"Failed to find file: %v\", err)\n"
+ " return\n"
+ " }\n"
+ " lexer := parser.New<lexerName>(input)\n"
+ " stream := antlr.NewCommonTokenStream(lexer,0)\n"
+ " stream.Fill()\n"

4
runtime/Go/antlr/file_stream.go
View File

@ -28,9 +28,9 @@ func NewFileStream(fileName string) (*FileStream, error) {
return nil, err
}
defer f.Close()
err = io.Copy(buf, f)
_, err = io.Copy(buf, f)
if err != nil {
return nil, er
return nil, err
}
fs := new(FileStream)