Merge pull request #107 from coryb/issue101

[#101] implement heredoc support

Author: hinshun

checker/checker.go

@@ -518,7 +518,7 @@ func (c *checker) checkIdentArg(scope *parser.Scope, typ parser.ObjType, ident *
 func (c *checker) checkBasicLitArg(typ parser.ObjType, lit *parser.BasicLit) error {
 	switch typ {
 	case parser.Str:
-		if lit.Str == nil {
+		if lit.Str == nil && lit.HereDoc == nil {
 			return ErrWrongArgType{lit.Pos, typ, lit.ObjType()}
 		}
 	case parser.Int:

codegen/codegen_test.go

@@ -210,6 +210,36 @@ func TestCodeGen(t *testing.T) {
 				Expect(t, llb.Image("busybox:stable")),
 			)
 		},
+	}, {
+		"here doc processing",
+		[]string{"default"},
+		`
+		fs default() {
+			image "busybox"
+
+			run <<~EOM
+			echo
+			hi
+			EOM
+
+			run <<-EOM
+			echo hi
+			EOM
+
+			run <<EOM
+			echo hi
+			EOM
+		}
+		`,
+		func(t *testing.T, cg *CodeGen) solver.Request {
+			return Expect(t, llb.Image("busybox").Run(
+				llb.Shlex("echo hi"),
+			).Run(
+				llb.Shlex("echo hi"),
+			).Run(
+				llb.Shlex("\techo hi"),
+			).Root())
+		},
 	}} {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {

codegen/expr.go

@@ -30,7 +30,10 @@ func (cg *CodeGen) EmitStringExpr(ctx context.Context, scope *parser.Scope, expr
 			return "", errors.WithStack(ErrCodeGen{expr, errors.Errorf("unknown obj type")})
 		}
 	case expr.BasicLit != nil:
-		return *expr.BasicLit.Str, nil
+		if expr.BasicLit.Str != nil {
+			return expr.BasicLit.Str.Unquoted(), nil
+		}
+		return expr.BasicLit.HereDoc.Value, nil
 	case expr.FuncLit != nil:
 		return cg.EmitStringBlock(ctx, scope, expr.FuncLit.Body.NonEmptyStmts(), nil)
 	default:

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/docker/cli v1.14.0-0.20190523191156-ab688a9a79a1
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/kr/pretty v0.2.0 // indirect
+	github.com/lithammer/dedent v1.1.0
 	github.com/logrusorgru/aurora v0.0.0-20191116043053-66b7ad493a23
 	github.com/mattn/go-isatty v0.0.11
 	github.com/mitchellh/go-homedir v1.1.0

go.sum

@@ -264,6 +264,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/logrusorgru/aurora v0.0.0-20191116043053-66b7ad493a23 h1:Wp7NjqGKGN9te9N/rvXYRhlVcrulGdxnz8zadXWs7fc=
 github.com/logrusorgru/aurora v0.0.0-20191116043053-66b7ad493a23/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=

module/resolve.go

@@ -394,7 +394,7 @@ func ResolveGraph(ctx context.Context, resolver Resolver, res Resolved, mod *par
 					filename = ModuleFilename
 				case n.ImportPath != nil:
 					importRes = res
-					filename = n.ImportPath.Path
+					filename = n.ImportPath.Path.Unquoted()
 				}
 
 				rc, err := importRes.Open(filename)

module/tree.go

@@ -53,9 +53,9 @@ func NewTree(ctx context.Context, cln *client.Client, mw *progress.MultiWriter,
 			value = filepath.Join(prefix, ModuleFilename)
 		case decl.ImportPath != nil:
 			if prefix == "" {
-				value = decl.ImportPath.Path
+				value = decl.ImportPath.Path.Unquoted()
 			} else {
-				value = filepath.Join(prefix, decl.ImportPath.Path)
+				value = filepath.Join(prefix, decl.ImportPath.Path.Unquoted())
 			}
 		}
 

module/vendor.go

@@ -102,7 +102,7 @@ func Vendor(ctx context.Context, cln *client.Client, mw *progress.MultiWriter, m
 			case decl.ImportFunc != nil:
 				filename = ModuleFilename
 			case decl.ImportPath != nil:
-				filename = decl.ImportPath.Path
+				filename = decl.ImportPath.Path.Unquoted()
 			}
 
 			f, err := os.Create(filepath.Join(vp, filename))

parse_test.go

@@ -85,6 +85,24 @@ var (
 				}
 			} "src" "dst"
 		}
+
+		string heredocTest() {
+			value <<-EOM
+			this
+			  should
+			dedent
+			EOM
+			value <<~EOM
+			this 
+			  should
+			fold
+			EOM
+			value <<EOM
+			this
+			  is
+			literal
+			EOM
+		}
 	`
 )