diff options
Diffstat (limited to 'vendor/golang.org/x/text/message/message.go')
| -rw-r--r-- | vendor/golang.org/x/text/message/message.go | 176 |
1 files changed, 81 insertions, 95 deletions
diff --git a/vendor/golang.org/x/text/message/message.go b/vendor/golang.org/x/text/message/message.go index 32ff3ef90..8b3bad1b6 100644 --- a/vendor/golang.org/x/text/message/message.go +++ b/vendor/golang.org/x/text/message/message.go @@ -10,90 +10,121 @@ package message // import "golang.org/x/text/message" import ( - "fmt" "io" - "strings" + "os" - "golang.org/x/text/internal/format" "golang.org/x/text/language" + "golang.org/x/text/message/catalog" ) +// TODO: allow more than one goroutine per printer. This will allow porting from +// fmt much less error prone. + // A Printer implements language-specific formatted I/O analogous to the fmt // package. Only one goroutine may use a Printer at the same time. type Printer struct { - tag language.Tag - - cat *Catalog + // Wrap the fields in a hidden type to hide some of the implemented methods. + printer printer // NOTE: limiting one goroutine per Printer allows for many optimizations // and simplifications. We can consider removing this restriction down the // road if it the benefits do not seem to outweigh the disadvantages. } +type options struct { + cat *catalog.Catalog + // TODO: + // - allow %s to print integers in written form (tables are likely too large + // to enable this by default). + // - list behavior + // +} + +// An Option defines an option of a Printer. +type Option func(o *options) + +// Catalog defines the catalog to be used. +func Catalog(c *catalog.Catalog) Option { + return func(o *options) { o.cat = c } +} + // NewPrinter returns a Printer that formats messages tailored to language t. -func NewPrinter(t language.Tag) *Printer { - return DefaultCatalog.Printer(t) +func NewPrinter(t language.Tag, opts ...Option) *Printer { + options := &options{ + cat: defaultCatalog, + } + for _, o := range opts { + o(options) + } + p := &Printer{printer{ + tag: t, + }} + p.printer.catContext = options.cat.Context(t, &p.printer) + return p } // Sprint is like fmt.Sprint, but using language-specific formatting. func (p *Printer) Sprint(a ...interface{}) string { - return fmt.Sprint(p.bindArgs(a)...) + p.printer.reset() + p.printer.doPrint(a) + return p.printer.String() } // Fprint is like fmt.Fprint, but using language-specific formatting. func (p *Printer) Fprint(w io.Writer, a ...interface{}) (n int, err error) { - return fmt.Fprint(w, p.bindArgs(a)...) + p.printer.reset() + p.printer.doPrint(a) + n64, err := io.Copy(w, &p.printer.Buffer) + return int(n64), err } // Print is like fmt.Print, but using language-specific formatting. func (p *Printer) Print(a ...interface{}) (n int, err error) { - return fmt.Print(p.bindArgs(a)...) + return p.Fprint(os.Stdout, a...) } // Sprintln is like fmt.Sprintln, but using language-specific formatting. func (p *Printer) Sprintln(a ...interface{}) string { - return fmt.Sprintln(p.bindArgs(a)...) + p.printer.reset() + p.printer.doPrintln(a) + return p.printer.String() } // Fprintln is like fmt.Fprintln, but using language-specific formatting. func (p *Printer) Fprintln(w io.Writer, a ...interface{}) (n int, err error) { - return fmt.Fprintln(w, p.bindArgs(a)...) + p.printer.reset() + p.printer.doPrintln(a) + n64, err := io.Copy(w, &p.printer.Buffer) + return int(n64), err } // Println is like fmt.Println, but using language-specific formatting. func (p *Printer) Println(a ...interface{}) (n int, err error) { - return fmt.Println(p.bindArgs(a)...) + return p.Fprintln(os.Stdout, a...) } // Sprintf is like fmt.Sprintf, but using language-specific formatting. func (p *Printer) Sprintf(key Reference, a ...interface{}) string { - msg, hasSub := p.lookup(key) - if !hasSub { - return fmt.Sprintf(msg) // work around limitation of fmt - } - return fmt.Sprintf(msg, p.bindArgs(a)...) + lookupAndFormat(p, key, a) + return p.printer.String() } // Fprintf is like fmt.Fprintf, but using language-specific formatting. func (p *Printer) Fprintf(w io.Writer, key Reference, a ...interface{}) (n int, err error) { - msg, hasSub := p.lookup(key) - if !hasSub { - return fmt.Fprintf(w, msg) // work around limitation of fmt - } - return fmt.Fprintf(w, msg, p.bindArgs(a)...) + lookupAndFormat(p, key, a) + return w.Write(p.printer.Bytes()) } // Printf is like fmt.Printf, but using language-specific formatting. func (p *Printer) Printf(key Reference, a ...interface{}) (n int, err error) { - msg, hasSub := p.lookup(key) - if !hasSub { - return fmt.Printf(msg) // work around limitation of fmt - } - return fmt.Printf(msg, p.bindArgs(a)...) + lookupAndFormat(p, key, a) + return os.Stdout.Write(p.printer.Bytes()) } -func (p *Printer) lookup(r Reference) (msg string, hasSub bool) { - var id string +func lookupAndFormat(p *Printer, r Reference, a []interface{}) { + p.printer.reset() + p.printer.args = a + var id, msg string switch v := r.(type) { case string: id, msg = v, v @@ -102,33 +133,31 @@ func (p *Printer) lookup(r Reference) (msg string, hasSub bool) { default: panic("key argument is not a Reference") } - if s, ok := p.cat.get(p.tag, id); ok { - msg = s - } - // fmt does not allow all arguments to be dropped in a format string. It - // only allows arguments to be dropped if at least one of the substitutions - // uses the positional marker (e.g. %[1]s). This hack works around this. - // TODO: This is only an approximation of the parsing of substitution - // patterns. Make more precise once we know if we can get by with fmt's - // formatting, which may not be the case. - for i := 0; i < len(msg)-1; i++ { - if msg[i] == '%' { - for i++; i < len(msg); i++ { - if strings.IndexByte("[]#+- *01234567890.", msg[i]) < 0 { - break - } - } - if i < len(msg) && msg[i] != '%' { - hasSub = true - break - } + + if p.printer.catContext.Execute(id) == catalog.ErrNotFound { + if p.printer.catContext.Execute(msg) == catalog.ErrNotFound { + p.printer.Render(msg) + return } } - return msg, hasSub +} + +// Arg implements catmsg.Renderer. +func (p *printer) Arg(i int) interface{} { // TODO, also return "ok" bool + if uint(i) < uint(len(p.args)) { + return p.args[i] + } + return nil +} + +// Render implements catmsg.Renderer. +func (p *printer) Render(msg string) { + p.doPrintf(msg) } // A Reference is a string or a message reference. type Reference interface { + // TODO: also allow []string } // Key creates a message Reference for a message where the given id is used for @@ -140,46 +169,3 @@ func Key(id string, fallback string) Reference { type key struct { id, fallback string } - -// bindArgs wraps arguments with implementation of fmt.Formatter, if needed. -func (p *Printer) bindArgs(a []interface{}) []interface{} { - out := make([]interface{}, len(a)) - for i, x := range a { - switch v := x.(type) { - case fmt.Formatter: - // Wrap the value with a Formatter that augments the State with - // language-specific attributes. - out[i] = &value{v, p} - - // NOTE: as we use fmt.Formatter, we can't distinguish between - // regular and localized formatters, so we always need to wrap it. - - // TODO: handle - // - numbers - // - lists - // - time? - default: - out[i] = x - } - } - return out -} - -// state implements "golang.org/x/text/internal/format".State. -type state struct { - fmt.State - p *Printer -} - -func (s *state) Language() language.Tag { return s.p.tag } - -var _ format.State = &state{} - -type value struct { - x fmt.Formatter - p *Printer -} - -func (v *value) Format(s fmt.State, verb rune) { - v.x.Format(&state{s, v.p}, verb) -} |