code review 5574059: go/scanner: Use explicit scanner.Mode type.

go/scanner: Use explicit scanner.Mode type.

[gri, 2012-01-25 00:42:43]

Hello r@golang.org, bradfitz@golang.org (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2012-01-25 00:46:41]

LGTM
 On Jan 24, 2012 4:42 PM, <gri@golang.org> wrote:

> Reviewers: r, bradfitz,
>
> Message:
> Hello r@golang.org, bradfitz@golang.org (cc:
> golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> go/scanner: Use explicit scanner.Mode type.
>
> Please review this at
http://codereview.appspot.com/**5574059/<http://codereview.appspot.com/5574059/>
>
> Affected files:
>  M src/pkg/go/parser/parser.go
>  M src/pkg/go/scanner/scanner.go
>  M src/pkg/go/scanner/scanner_**test.go
>
>
> Index: src/pkg/go/parser/parser.go
> ==============================**==============================**=======
> --- a/src/pkg/go/parser/parser.go
> +++ b/src/pkg/go/parser/parser.go
> @@ -54,7 +54,7 @@
>
>  func (p *parser) init(fset *token.FileSet, filename string, src []byte,
> mode Mode) {
>        p.file = fset.AddFile(filename, fset.Base(), len(src))
> -       var m uint
> +       var m scanner.Mode
>        if mode&ParseComments != 0 {
>                m = scanner.ScanComments
>        }
> Index: src/pkg/go/scanner/scanner.go
> ==============================**==============================**=======
> --- a/src/pkg/go/scanner/scanner.**go
> +++ b/src/pkg/go/scanner/scanner.**go
> @@ -40,7 +40,7 @@
>        dir  string       // directory portion of file.Name()
>        src  []byte       // source
>        err  ErrorHandler // error reporting; or nil
> -       mode uint         // scanning mode
> +       mode Mode         // scanning mode
>
>        // scanning state
>        ch         rune // current character
> @@ -86,12 +86,14 @@
>        }
>  }
>
> -// The mode parameter to the Init function is a set of flags (or 0).
> +// A mode value is set of flags (or 0).
>  // They control scanner behavior.
>  //
> +type Mode uint
> +
>  const (
> -       ScanComments    = 1 << iota // return comments as COMMENT tokens
> -       dontInsertSemis             // do not automatically insert
> semicolons - for testing only
> +       ScanComments    Mode = 1 << iota // return comments as COMMENT
> tokens
> +       dontInsertSemis                  // do not automatically insert
> semicolons - for testing only
>  )
>
>  // Init prepares the scanner S to tokenize the text src by setting the
> @@ -109,7 +111,7 @@
>  // Note that Init may call err if there is an error in the first character
>  // of the file.
>  //
> -func (S *Scanner) Init(file *token.File, src []byte, err ErrorHandler,
> mode uint) {
> +func (S *Scanner) Init(file *token.File, src []byte, err ErrorHandler,
> mode Mode) {
>        // Explicitly initialize all fields since a scanner may be reused.
>        if file.Size() != len(src) {
>                panic("file size does not match src len")
> Index: src/pkg/go/scanner/scanner_**test.go
> ==============================**==============================**=======
> --- a/src/pkg/go/scanner/scanner_**test.go
> +++ b/src/pkg/go/scanner/scanner_**test.go
> @@ -281,7 +281,7 @@
>        }
>  }
>
> -func checkSemi(t *testing.T, line string, mode uint) {
> +func checkSemi(t *testing.T, line string, mode Mode) {
>        var S Scanner
>        file := fset.AddFile("TestSemis", fset.Base(), len(line))
>        S.Init(file, []byte(line), nil, mode)
>
>
>

[gri, 2012-01-25 00:49:05]

*** Submitted as cd529ae19b47 ***

go/scanner: Use explicit scanner.Mode type.

R=r, bradfitz
CC=golang-dev
http://codereview.appspot.com/5574059