Add skipLineComments flag

Author: zikaeroh

parser/parser.go

@@ -16,6 +16,7 @@ type parser struct {
 	s               *scanner
 	w               io.Writer
 	packageName     string
+	lineComments    bool
 	prefix          string
 	forDepth        int
 	switchDepth     int
@@ -29,10 +30,20 @@ type parser struct {
 // the supplied writer. Uses filename as the source file for line comments, and
 // pkg as the Go package name.
 func Parse(w io.Writer, r io.Reader, filename, pkg string) error {
+	return parse(w, r, filename, pkg, true)
+}
+
+// ParseNoLineComments is the same as Parse, but does not write line comments.
+func ParseNoLineComments(w io.Writer, r io.Reader, filename, pkg string) error {
+	return parse(w, r, filename, pkg, false)
+}
+
+func parse(w io.Writer, r io.Reader, filename, pkg string, lineComments bool) error {
 	p := &parser{
-		s:           newScanner(r, filename),
-		w:           w,
-		packageName: pkg,
+		s:            newScanner(r, filename),
+		w:            w,
+		packageName:  pkg,
+		lineComments: lineComments,
 	}
 	return p.parseTemplate()
 }
@@ -801,8 +812,10 @@ func (p *parser) Printf(format string, args ...interface{}) {
 		return
 	}
 	w := p.w
-	// line comments are required to start at the beginning of the line
-	p.s.WriteLineComment(w)
+	if p.lineComments {
+		// line comments are required to start at the beginning of the line
+		p.s.WriteLineComment(w)
+	}
 	fmt.Fprintf(w, "%s", p.prefix)
 	fmt.Fprintf(w, format, args...)
 	fmt.Fprintf(w, "\n")

qtc/main.go

@@ -25,7 +25,8 @@ var (
 	file = flag.String("file", "", "Path to template file to compile.\n"+
 		"Flags -dir and -ext are ignored if file is set.\n"+
 		"The compiled file will be placed near the original file with .go extension added.")
-	ext = flag.String("ext", "qtpl", "Only files with this extension are compiled")
+	ext              = flag.String("ext", "qtpl", "Only files with this extension are compiled")
+	skipLineComments = flag.Bool("skipLineComments", false, "Don't write line comments")
 )
 
 var logger = log.New(os.Stderr, "qtc: ", log.LstdFlags)
@@ -127,9 +128,16 @@ func compileFile(infile string) {
 	if err != nil {
 		logger.Fatalf("cannot determine package name for %q: %s", infile, err)
 	}
-	if err = parser.Parse(outf, inf, infile, packageName); err != nil {
+
+	parseFunc := parser.Parse
+	if *skipLineComments {
+		parseFunc = parser.ParseNoLineComments
+	}
+
+	if err = parseFunc(outf, inf, infile, packageName); err != nil {
 		logger.Fatalf("error when parsing file %q: %s", infile, err)
 	}
+
 	if err = outf.Close(); err != nil {
 		logger.Fatalf("error when closing file %q: %s", tmpfile, err)
 	}