Parse: take an io.Reader argument instead of a string

cmd/markdown/main.go

@@ -5,13 +5,11 @@ import (
 	"flag"
 	"fmt"
 	"github.com/knieriem/markdown"
-	"io/ioutil"
+	"log"
 	"os"
 )
 
 func main() {
-	var b []byte
-
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "Usage: %s [FILE]\n", os.Args[0])
 		flag.PrintDefaults()
@@ -21,10 +19,14 @@ func main() {
 	optDlists := flag.Bool("dlists", false, "support definitions lists")
 	flag.Parse()
 
+	r := os.Stdin
 	if flag.NArg() > 0 {
-		b, _ = ioutil.ReadFile(flag.Arg(0))
+		f, err := os.Open(flag.Arg(0))
-	} else {
+		if err != nil {
-		b, _ = ioutil.ReadAll(os.Stdin)
+			log.Fatal(err)
+		}
+		defer f.Close()
+		r = f
 	}
 
 	e := markdown.Extensions{
@@ -36,7 +38,7 @@ func main() {
 	startPProf()
 	defer stopPProf()
 
-	doc := markdown.Parse(string(b), e)
+	doc := markdown.Parse(r, e)
 	w := bufio.NewWriter(os.Stdout)
 	doc.WriteHtml(w)
 	w.Flush()

doc.go

@@ -3,17 +3,16 @@ A translation of peg-markdown [1] into Go.
 
 Usage example:
 
+	package main
+
 	import (
-		md "markdown"
+		md "github.com/knieriem/markdown"
 		"os"
-		"io/ioutil"
 		"bufio"
 	)
 
 	func main() {
-		b, _ := ioutil.ReadAll(os.Stdin)
+		doc := md.Parse(os.Stdin, md.Extensions{Smart: true})
-
-		doc := md.Parse(string(b), md.Extensions{Smart: true})
 
 		w := bufio.NewWriter(os.Stdout)
 		doc.WriteHtml(w)	

markdown.go

@@ -21,6 +21,7 @@ package markdown
 
 import (
 	"bytes"
+	"io"
 	"log"
 	"strings"
 )
@@ -35,7 +36,7 @@ type Extensions struct {
 }
 
 // Parse converts a Markdown document into a tree for later output processing.
-func Parse(text string, ext Extensions) *Doc {
+func Parse(r io.Reader, ext Extensions) *Doc {
 	d := new(Doc)
 	d.extension = ext
 
@@ -43,7 +44,7 @@ func Parse(text string, ext Extensions) *Doc {
 	d.parser.Doc = d
 	d.parser.Init()
 
-	s := preformat(text)
+	s := preformat(r)
 
 	d.parseRule(ruleReferences, s)
 	if ext.Notes {
@@ -109,31 +110,39 @@ const (
 /* preformat - allocate and copy text buffer while
  * performing tab expansion.
  */
-func preformat(text string) (s string) {
+func preformat(r io.Reader) (s string) {
 	charstotab := TABSTOP
-	i0 := 0
+	buf := make([]byte, 32768)
 
-	b := bytes.NewBuffer(make([]byte, 0, len(text)+256))
+	b := bytes.NewBuffer(make([]byte, 0, 32768))
-	for i, _ := range text {
+	for {
-		switch text[i] {
+		n, err := r.Read(buf)
-		case '\t':
+		if err != nil {
-			b.WriteString(text[i0:i])
+			break
-			for ; charstotab > 0; charstotab-- {
+		}
-				b.WriteByte(' ')
+		i0 := 0
+		for i := range buf[:n] {
+			switch buf[i] {
+			case '\t':
+				b.Write(buf[i0:i])
+				for ; charstotab > 0; charstotab-- {
+					b.WriteByte(' ')
+				}
+				i0 = i + 1
+			case '\n':
+				b.Write(buf[i0 : i+1])
+				i0 = i + 1
+				charstotab = TABSTOP
+			default:
+				charstotab--
+			}
+			if charstotab == 0 {
+				charstotab = TABSTOP
 			}
-			i0 = i + 1
-		case '\n':
-			b.WriteString(text[i0 : i+1])
-			i0 = i + 1
-			charstotab = TABSTOP
-		default:
-			charstotab--
-		}
-		if charstotab == 0 {
-			charstotab = TABSTOP
 		}
+		b.Write(buf[i0:n])
 	}
-	b.WriteString(text[i0:])
+
 	b.WriteString("\n\n")
 	return b.String()
 }