Unexport scanner and lexer functions.

Author: nickng

asyncpi.y

@@ -68,7 +68,7 @@ values : /* empty */         { $$ = []Name{} }
 
 // Parse is the entry point to the asyncpi calculus parser.
 func Parse(r io.Reader) (Process, error) {
-	l := NewLexer(r)
+	l := newLexer(r)
 	asyncpiParse(l)
 	select {
 	case err := <-l.Errors:

lexer.go

@@ -4,25 +4,25 @@ package asyncpi
 
 import "io"
 
-// Lexer for asyncpi.
-type Lexer struct {
-	scanner *Scanner
+// lexer for asyncpi.
+type lexer struct {
+	scanner *scanner
 	Errors  chan error
 }
 
-// NewLexer returns a new yacc-compatible lexer.
-func NewLexer(r io.Reader) *Lexer {
-	return &Lexer{scanner: NewScanner(r), Errors: make(chan error, 1)}
+// newLexer returns a new yacc-compatible lexer.
+func newLexer(r io.Reader) *lexer {
+	return &lexer{scanner: newScanner(r), Errors: make(chan error, 1)}
 }
 
 // Lex is provided for yacc-compatible parser.
-func (l *Lexer) Lex(yylval *asyncpiSymType) int {
+func (l *lexer) Lex(yylval *asyncpiSymType) int {
 	var token tok
 	token, yylval.strval, _, _ = l.scanner.Scan()
 	return int(token)
 }
 
 // Error handles error.
-func (l *Lexer) Error(err string) {
+func (l *lexer) Error(err string) {
 	l.Errors <- &ParseError{Err: err, Pos: l.scanner.pos}
 }

parser.y.go

@@ -63,7 +63,7 @@ const asyncpiInitialStackSize = 16
 
 // Parse is the entry point to the asyncpi calculus parser.
 func Parse(r io.Reader) (Process, error) {
-	l := NewLexer(r)
+	l := newLexer(r)
 	asyncpiParse(l)
 	select {
 	case err := <-l.Errors:

scanner.go

@@ -6,20 +6,20 @@ import (
 	"io"
 )
 
-// Scanner is a lexical scanner.
-type Scanner struct {
+// scanner is a lexical scanner.
+type scanner struct {
 	r   *bufio.Reader
 	pos TokenPos
 }
 
-// NewScanner returns a new instance of Scanner.
-func NewScanner(r io.Reader) *Scanner {
-	return &Scanner{r: bufio.NewReader(r), pos: TokenPos{Char: 0, Lines: []int{}}}
+// newScanner returns a new instance of Scanner.
+func newScanner(r io.Reader) *scanner {
+	return &scanner{r: bufio.NewReader(r), pos: TokenPos{Char: 0, Lines: []int{}}}
 }
 
 // read reads the next rune from the buffered reader.
 // Returns the rune(0) if reached the end or error occurs.
-func (s *Scanner) read() rune {
+func (s *scanner) read() rune {
 	ch, _, err := s.r.ReadRune()
 	if err != nil {
 		return eof
@@ -34,7 +34,7 @@ func (s *Scanner) read() rune {
 }
 
 // unread places the previously read rune back on the reader.
-func (s *Scanner) unread() {
+func (s *scanner) unread() {
 	_ = s.r.UnreadRune()
 	if s.pos.Char == 0 {
 		s.pos.Char = s.pos.Lines[len(s.pos.Lines)-1]
@@ -45,7 +45,7 @@ func (s *Scanner) unread() {
 }
 
 // Scan returns the next token and parsed value.
-func (s *Scanner) Scan() (token tok, value string, startPos, endPos TokenPos) {
+func (s *scanner) Scan() (token tok, value string, startPos, endPos TokenPos) {
 	ch := s.read()
 
 	if isWhitespace(ch) {
@@ -89,7 +89,7 @@ func (s *Scanner) Scan() (token tok, value string, startPos, endPos TokenPos) {
 	return kILLEGAL, string(ch), startPos, endPos
 }
 
-func (s *Scanner) scanName() (token tok, value string, startPos, endPos TokenPos) {
+func (s *scanner) scanName() (token tok, value string, startPos, endPos TokenPos) {
 	var buf bytes.Buffer
 	startPos = s.pos
 	defer func() { endPos = s.pos }()
@@ -115,7 +115,7 @@ func (s *Scanner) scanName() (token tok, value string, startPos, endPos TokenPos
 	return kNAME, buf.String(), startPos, endPos
 }
 
-func (s *Scanner) skipWhitespace() {
+func (s *scanner) skipWhitespace() {
 	for {
 		if ch := s.read(); ch == eof {
 			break