Source => []rune

Author: antonmedv

file/error.go

@@ -17,7 +17,7 @@ func (e *Error) Error() string {
 	return e.format()
 }
 
-func (e *Error) Bind(source *Source) *Error {
+func (e *Error) Bind(source Source) *Error {
 	if snippet, found := source.Snippet(e.Location.Line); found {
 		snippet := strings.Replace(snippet, "\t", " ", -1)
 		srcLine := "\n | " + snippet

file/source.go

@@ -1,60 +1,40 @@
 package file
 
 import (
-	"encoding/json"
 	"strings"
 	"unicode/utf8"
 )
 
-type Source struct {
-	contents []rune
-}
-
-func NewSource(contents string) *Source {
-	return &Source{
-		contents: []rune(contents),
-	}
-}
-
-func (s *Source) MarshalJSON() ([]byte, error) {
-	return json.Marshal(s.contents)
-}
-
-func (s *Source) UnmarshalJSON(b []byte) error {
-	contents := make([]rune, 0)
-	err := json.Unmarshal(b, &contents)
-	if err != nil {
-		return err
-	}
+type Source []rune
 
-	s.contents = contents
-	return nil
+func NewSource(contents string) Source {
+	return []rune(contents)
 }
 
-func (s *Source) String() string {
-	return string(s.contents)
+func (s Source) String() string {
+	return string(s)
 }
 
-func (s *Source) Snippet(line int) (string, bool) {
+func (s Source) Snippet(line int) (string, bool) {
 	if s == nil {
 		return "", false
 	}
-	lines := strings.Split(string(s.contents), "\n")
+	lines := strings.Split(string(s), "\n")
 	lineOffsets := make([]int, len(lines))
 	var offset int
 	for i, line := range lines {
 		offset = offset + utf8.RuneCountInString(line) + 1
 		lineOffsets[i] = offset
 	}
 	charStart, found := getLineOffset(lineOffsets, line)
-	if !found || len(s.contents) == 0 {
+	if !found || len(s) == 0 {
 		return "", false
 	}
 	charEnd, found := getLineOffset(lineOffsets, line+1)
 	if found {
-		return string(s.contents[charStart : charEnd-1]), true
+		return string(s[charStart : charEnd-1]), true
 	}
-	return string(s.contents[charStart:]), true
+	return string(s[charStart:]), true
 }
 
 func getLineOffset(lineOffsets []int, line int) (int, bool) {

file/source_test.go

@@ -1,10 +1,7 @@
 package file
 
 import (
-	"encoding/json"
 	"testing"
-
-	"github.com/expr-lang/expr/internal/testify/assert"
 )
 
 const (
@@ -55,15 +52,3 @@ func TestStringSource_SnippetSingleLine(t *testing.T) {
 		t.Errorf(unexpectedSnippet, t.Name(), str2, "")
 	}
 }
-
-func TestStringSource_MarshalJSON(t *testing.T) {
-	source := NewSource("hello, world")
-	encoded, err := json.Marshal(source)
-	assert.NoError(t, err)
-	assert.Equal(t, `[104,101,108,108,111,44,32,119,111,114,108,100]`, string(encoded))
-
-	decoded := &Source{}
-	err = json.Unmarshal(encoded, decoded)
-	assert.NoError(t, err)
-	assert.Equal(t, source.String(), decoded.String())
-}

parser/lexer/lexer.go

@@ -8,7 +8,7 @@ import (
 	"github.com/expr-lang/expr/file"
 )
 
-func Lex(source *file.Source) ([]Token, error) {
+func Lex(source file.Source) ([]Token, error) {
 	l := &lexer{
 		input:  source.String(),
 		tokens: make([]Token, 0),

parser/parser.go

@@ -55,7 +55,7 @@ type parser struct {
 
 type Tree struct {
 	Node   Node
-	Source *file.Source
+	Source file.Source
 }
 
 func Parse(input string) (*Tree, error) {

vm/program.go

@@ -21,7 +21,7 @@ type Program struct {
 	Arguments []int
 	Constants []any
 
-	source    *file.Source
+	source    file.Source
 	node      ast.Node
 	locations []file.Location
 	variables int
@@ -32,7 +32,7 @@ type Program struct {
 
 // NewProgram returns a new Program. It's used by the compiler.
 func NewProgram(
-	source *file.Source,
+	source file.Source,
 	node ast.Node,
 	locations []file.Location,
 	variables int,
@@ -58,7 +58,7 @@ func NewProgram(
 }
 
 // Source returns origin file.Source.
-func (program *Program) Source() *file.Source {
+func (program *Program) Source() file.Source {
 	return program.source
 }