vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

pkg/dockerscript: remove debug messages

Browse source 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-03-21 19:22:25 -07:00
parent 69f4043d3a
commit ae5d5dfa2e
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dockerscript/dockerscript.go
View file

@ -16,7 +16,6 @@ func Parse(src io.Reader) ([]*Command, error) {
s := &scanner.Scanner{} s := &scanner.Scanner{}
s.Init(src) s.Init(src)
s.Whitespace = 1<<'\t' | 1<<' ' s.Whitespace = 1<<'\t' | 1<<' '
//s.Mode = ScanIdents | ScanFloats | ScanChars | ScanStrings | ScanRawStrings | ScanComments | SkipComments
s.Mode = scanner.ScanStrings | scanner.ScanRawStrings | scanner.ScanIdents s.Mode = scanner.ScanStrings | scanner.ScanRawStrings | scanner.ScanIdents
expr, err := parse(s, "") expr, err := parse(s, "")
if err != nil { if err != nil {
@ -60,7 +59,6 @@ func parseArgs(s *scanner.Scanner) ([]string, rune, error) {
return args, tok, parseError return args, tok, parseError
} }
text := s.TokenText() text := s.TokenText()
//fmt.Printf("--> [%s]\n", text)
if text == "{" || text == "}" || text == "\n" || text == "\r" || text == ";" { if text == "{" || text == "}" || text == "\n" || text == "\r" || text == ";" {
return args, tok, nil return args, tok, nil
} }
@ -71,24 +69,23 @@ func parseArgs(s *scanner.Scanner) ([]string, rune, error) {
} }
func parse(s *scanner.Scanner, opener string) (expr []*Command, err error) { func parse(s *scanner.Scanner, opener string) (expr []*Command, err error) {
/*
defer func() { defer func() {
fmt.Printf("parse() returned %d commands:\n", len(expr)) fmt.Printf("parse() returned %d commands:\n", len(expr))
for _, c := range expr { for _, c := range expr {
fmt.Printf("\t----> %s\n", c) fmt.Printf("\t----> %s\n", c)
} }
}() }()
*/
for { for {
args, tok, err := parseArgs(s) args, tok, err := parseArgs(s)
if err != nil { if err != nil {
return nil, err return nil, err
} }
cmd := &Command{Args: args} cmd := &Command{Args: args}
fmt.Printf("---> args=%v finished by %s\n", args, s.TokenText())
afterArgs := s.TokenText() afterArgs := s.TokenText()
if afterArgs == "{" { if afterArgs == "{" {
fmt.Printf("---> therefore calling parse() of sub-expression\n")
children, err := parse(s, "{") children, err := parse(s, "{")
fmt.Printf("---> parse() of sub-epxression returned %d commands (ended by %s) and error=%v\n", children, s.TokenText(), err)
if err != nil { if err != nil {
return nil, err return nil, err
} }