builder: add command handling to evaluator.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: d6c0bbc3cbf9204c506fedf4d0c5a477c7559a1d
Component: engine

components/engine/builder/parser/dumper/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/erikh/buildfile/parser"
+	"github.com/docker/docker/builder/parser"
 )
 
 func main() {

components/engine/builder/parser/line_parsers.go

@@ -27,13 +27,11 @@ func parseEnv(rest string) (*Node, error) {
 	node := blankNode()
 	rootnode := node
 	strs := TOKEN_WHITESPACE.Split(rest, 2)
-	node.Value = QuoteString(strs[0])
+	node.Value = strs[0]
 	node.Next = blankNode()
-	node.Next.Value = QuoteString(strs[1])
+	node.Next.Value = strs[1]
 
 	return rootnode, nil
-
-	return node, nil
 }
 
 // parses a whitespace-delimited set of arguments. The result is effectively a
@@ -41,18 +39,25 @@ func parseEnv(rest string) (*Node, error) {
 func parseStringsWhitespaceDelimited(rest string) (*Node, error) {
 	node := blankNode()
 	rootnode := node
+	prevnode := node
 	for _, str := range TOKEN_WHITESPACE.Split(rest, -1) { // use regexp
-		node.Value = QuoteString(str)
+		prevnode = node
+		node.Value = str
 		node.Next = blankNode()
 		node = node.Next
 	}
 
+	// XXX to get around regexp.Split *always* providing an empty string at the
+	// end due to how our loop is constructed, nil out the last node in the
+	// chain.
+	prevnode.Next = nil
+
 	return rootnode, nil
 }
 
 // parsestring just wraps the string in quotes and returns a working node.
 func parseString(rest string) (*Node, error) {
-	return &Node{QuoteString(rest), nil, nil}, nil
+	return &Node{rest, nil, nil}, nil
 }
 
 // parseJSON converts JSON arrays to an AST.
@@ -61,6 +66,7 @@ func parseJSON(rest string) (*Node, error) {
 		myJson   []interface{}
 		next     = blankNode()
 		orignext = next
+		prevnode = next
 	)
 
 	if err := json.Unmarshal([]byte(rest), &myJson); err != nil {
@@ -72,11 +78,14 @@ func parseJSON(rest string) (*Node, error) {
 		case float64:
 			str = strconv.FormatFloat(str.(float64), 'G', -1, 64)
 		}
-		next.Value = QuoteString(str.(string))
+		next.Value = str.(string)
 		next.Next = blankNode()
+		prevnode = next
 		next = next.Next
 	}
 
+	prevnode.Next = nil
+
 	return orignext, nil
 }
 
@@ -94,6 +103,6 @@ func parseMaybeJSON(rest string) (*Node, error) {
 	}
 
 	node := blankNode()
-	node.Value = QuoteString(rest)
+	node.Value = rest
 	return node, nil
 }

components/engine/builder/parser/parser.go

@@ -43,7 +43,7 @@ type Node struct {
 
 var (
 	dispatch                map[string]func(string) (*Node, error)
-	TOKEN_WHITESPACE        = regexp.MustCompile(`\s+`)
+	TOKEN_WHITESPACE        = regexp.MustCompile(`[\t\v\f\r ]+`)
 	TOKEN_LINE_CONTINUATION = regexp.MustCompile(`\\$`)
 	TOKEN_COMMENT           = regexp.MustCompile(`^#.*$`)
 )
@@ -70,6 +70,7 @@ func init() {
 		"entrypoint":     parseMaybeJSON,
 		"expose":         parseStringsWhitespaceDelimited,
 		"volume":         parseMaybeJSON,
+		"insert":         parseIgnore,
 	}
 }
 

components/engine/builder/parser/testfiles/brimstone-docker-consul/result

@@ -1,5 +1,5 @@
 (from "brimstone/ubuntu:14.04")
-(cmd)
+(cmd "")
 (entrypoint "/usr/bin/consul" "agent" "-server" "-data-dir=/consul" "-client=0.0.0.0" "-ui-dir=/webui")
 (expose "8500" "8600" "8400" "8301" "8302")
 (run "apt-get update && apt-get install -y unzip wget && apt-get clean && rm -rf /var/lib/apt/lists")

components/engine/builder/parser/utils.go

@@ -41,7 +41,7 @@ func (node *Node) Dump() string {
 			if len(n.Children) > 0 {
 				str += " " + n.Dump()
 			} else {
-				str += " " + n.Value
+				str += " " + QuoteString(n.Value)
 			}
 		}
 	}