From 8d6affdd6860fdca50ba5bb9166f3e0af5a05468 Mon Sep 17 00:00:00 2001
From: z7zmey <z7zmey@gmail.com>
Date: Tue, 10 Apr 2018 23:59:57 +0300
Subject: [PATCH] move Parser interface to parser package

---
 main.go                       | 37 ++++++++++++++++++-----------------
 parser.go => parser/parser.go |  3 ++-
 2 files changed, 21 insertions(+), 19 deletions(-)
 rename parser.go => parser/parser.go (90%)

diff --git a/main.go b/main.go
index b02b335..7a049f8 100644
--- a/main.go
+++ b/main.go
@@ -9,6 +9,7 @@ import (
 	"sync"
 
 	"github.com/yookoala/realpath"
+	"github.com/z7zmey/php-parser/parser"
 	"github.com/z7zmey/php-parser/php5"
 	"github.com/z7zmey/php-parser/php7"
 	"github.com/z7zmey/php-parser/visitor"
@@ -18,15 +19,15 @@ var wg sync.WaitGroup
 var usePhp5 *bool
 
 func main() {
-	usePhp5 = flag.Bool("php5", false, "use PHP5 parser")
+	usePhp5 = flag.Bool("php5", false, "use PHP5 parserWorker")
 	flag.Parse()
 
 	pathCh := make(chan string)
-	resultCh := make(chan Parser)
+	resultCh := make(chan parser.Parser)
 
-	// run 4 concurrent parsers
+	// run 4 concurrent parserWorkers
 	for i := 0; i < 4; i++ {
-		go parser(pathCh, resultCh)
+		go parserWorker(pathCh, resultCh)
 	}
 
 	// run printer goroutine
@@ -57,44 +58,44 @@ func processPath(pathList []string, pathCh chan<- string) {
 	}
 }
 
-func parser(pathCh <-chan string, result chan<- Parser) {
-	var parser Parser
+func parserWorker(pathCh <-chan string, result chan<- parser.Parser) {
+	var parserWorker parser.Parser
 
 	for {
 		path := <-pathCh
 		src, _ := os.Open(path)
 
 		if *usePhp5 {
-			parser = php5.NewParser(src, path)
+			parserWorker = php5.NewParser(src, path)
 		} else {
-			parser = php7.NewParser(src, path)
+			parserWorker = php7.NewParser(src, path)
 		}
 
-		parser.Parse()
-		result <- parser
+		parserWorker.Parse()
+		result <- parserWorker
 	}
 }
 
-func printer(result <-chan Parser) {
+func printer(result <-chan parser.Parser) {
 	for {
-		parser := <-result
-		fmt.Printf("==> %s\n", parser.GetPath())
+		parserWorker := <-result
+		fmt.Printf("==> %s\n", parserWorker.GetPath())
 
-		for _, e := range parser.GetErrors() {
+		for _, e := range parserWorker.GetErrors() {
 			fmt.Println(e)
 		}
 
 		nsResolver := visitor.NewNamespaceResolver()
-		parser.GetRootNode().Walk(nsResolver)
+		parserWorker.GetRootNode().Walk(nsResolver)
 
 		dumper := visitor.Dumper{
 			Writer:     os.Stdout,
 			Indent:     "  | ",
-			Comments:   parser.GetComments(),
-			Positions:  parser.GetPositions(),
+			Comments:   parserWorker.GetComments(),
+			Positions:  parserWorker.GetPositions(),
 			NsResolver: nsResolver,
 		}
-		parser.GetRootNode().Walk(dumper)
+		parserWorker.GetRootNode().Walk(dumper)
 		wg.Done()
 	}
 }
diff --git a/parser.go b/parser/parser.go
similarity index 90%
rename from parser.go
rename to parser/parser.go
index 3f23452..e9b4e93 100644
--- a/parser.go
+++ b/parser/parser.go
@@ -1,4 +1,4 @@
-package main
+package parser
 
 import (
 	"github.com/z7zmey/php-parser/comment"
@@ -7,6 +7,7 @@ import (
 	"github.com/z7zmey/php-parser/position"
 )
 
+// Parser interface
 type Parser interface {
 	Parse() int
 	GetPath() string