Skip to content

Commit

Permalink
fix multiline string
Browse files Browse the repository at this point in the history
the data needs to remove the multiline quotes but include the command:

e.g.

TEMPLATE """
my template values
"""

should be

TEMPLATE
my template values

after scanning
  • Loading branch information
mxyng committed Jul 25, 2023
1 parent 5614984 commit 24c2c77
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bufio"
"bytes"
"errors"
"fmt"
"io"
"log"
)

type Command struct {
Expand All @@ -28,7 +28,7 @@ func Parse(reader io.Reader) ([]Command, error) {
line := scanner.Bytes()

fields := bytes.SplitN(line, []byte(" "), 2)
if len(fields) == 0 {
if len(fields) == 0 || len(fields[0]) == 0 {
continue
}

Expand All @@ -47,7 +47,7 @@ func Parse(reader io.Reader) ([]Command, error) {
command.Args = string(fields[1])
default:
// log a warning for unknown commands
fmt.Printf("WARNING: Unknown command: %s\n", fields[0])
log.Printf("WARNING: Unknown command: %s", fields[0])
continue
}

Expand Down Expand Up @@ -78,7 +78,10 @@ func scanModelfile(data []byte, atEOF bool) (advance int, token []byte, err erro
}

n := start + len(multilineString) + end + len(multilineString)
return n, data[:n], nil

newData := data[:start]
newData = append(newData, data[start+len(multilineString):n-len(multilineString)]...)
return n, newData, nil
}

return bufio.ScanLines(data, atEOF)
Expand Down

0 comments on commit 24c2c77

Please sign in to comment.