qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 05:04:43 -07:00
Code Releases Activity

fix up prints in flag.go

Browse Source 
R=rsc
DELTA=11  (0 added, 0 deleted, 11 changed)
OCL=31760
CL=31760
This commit is contained in:
Rob Pike 2009-07-16 23:14:33 -07:00
parent be2cf952a8
commit 9b475bd2a4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pkg/flag/flag.go
View File

@ -22,8 +22,8 @@
3) Flags may then be used directly. If you're using the flags themselves, 3) Flags may then be used directly. If you're using the flags themselves,
they are all pointers; if you bind to variables, they're values. they are all pointers; if you bind to variables, they're values.
print("ip has value ", *ip, "\n"); fmt.Println("ip has value ", *ip);
print("flagvar has value ", flagvar, "\n"); fmt.Println("flagvar has value ", flagvar);
4) After parsing, flag.Arg(i) is the i'th argument after the flags. 4) After parsing, flag.Arg(i) is the i'th argument after the flags.
Args are indexed from 0 up to flag.NArg(). Args are indexed from 0 up to flag.NArg().
@ -296,7 +296,7 @@ func add(name string, value FlagValue, usage string) {
f := &Flag{name, usage, value, value.String()}; f := &Flag{name, usage, value, value.String()};
dummy, alreadythere := flags.formal[name]; dummy, alreadythere := flags.formal[name];
if alreadythere { if alreadythere {
print("flag redefined: ", name, "\n"); fmt.Fprintln(os.Stderr, "flag redefined:", name);
panic("flag redefinition"); // Happens only if flags are declared with identical names panic("flag redefinition"); // Happens only if flags are declared with identical names
} }
flags.formal[name] = f; flags.formal[name] = f;
@ -408,7 +408,7 @@ func (f *allFlags) parseOne(index int) (ok bool, next int)
} }
name := s[num_minuses : len(s)]; name := s[num_minuses : len(s)];
if len(name) == 0 || name[0] == '-' || name[0] == '=' { if len(name) == 0 || name[0] == '-' || name[0] == '=' {
print("bad flag syntax: ", s, "\n"); fmt.Fprintln(os.Stderr, "bad flag syntax:", s);
Usage(); Usage();
os.Exit(2); os.Exit(2);
} }
@ -426,21 +426,21 @@ func (f *allFlags) parseOne(index int) (ok bool, next int)
} }
flag, alreadythere := flags.actual[name]; flag, alreadythere := flags.actual[name];
if alreadythere { if alreadythere {
print("flag specified twice: -", name, "\n"); fmt.Fprintf(os.Stderr, "flag specified twice: -%s\n", name);
Usage(); Usage();
os.Exit(2); os.Exit(2);
} }
m := flags.formal; m := flags.formal;
flag, alreadythere = m[name]; // BUG flag, alreadythere = m[name]; // BUG
if !alreadythere { if !alreadythere {
print("flag provided but not defined: -", name, "\n"); fmt.Fprintf(os.Stderr, "flag provided but not defined: -%s\n", name);
Usage(); Usage();
os.Exit(2); os.Exit(2);
} }
if f, ok := flag.Value.(*boolValue); ok { // special case: doesn't need an arg if f, ok := flag.Value.(*boolValue); ok { // special case: doesn't need an arg
if has_value { if has_value {
if !f.set(value) { if !f.set(value) {
print("invalid boolean value ", value, " for flag: -", name, "\n"); fmt.Fprintf(os.Stderr, "invalid boolean value %t for flag: -%s\n", value, name);
Usage(); Usage();
os.Exit(2); os.Exit(2);
} }
@ -456,15 +456,15 @@ func (f *allFlags) parseOne(index int) (ok bool, next int)
value = os.Args[index]; value = os.Args[index];
} }
if !has_value { if !has_value {
print("flag needs an argument: -", name, "\n"); fmt.Fprintf(os.Stderr, "flag needs an argument: -%s\n", name);
Usage(); Usage();
os.Exit(2); os.Exit(2);
} }
ok = flag.Value.set(value); ok = flag.Value.set(value);
if !ok { if !ok {
print("invalid value ", value, " for flag: -", name, "\n"); fmt.Fprintf(os.Stderr, "invalid value %s for flag: -%s\n", value, name);
Usage(); Usage();
os.Exit(2); os.Exit(2);
} }
} }
flags.actual[name] = flag; flags.actual[name] = flag;