init work for loops

MontFerret · Jun 5, 2023 · 9f35ee0 · 9f35ee0
1 parent 38ebb2a
commit 9f35ee0
Show file tree

Hide file tree

Showing 14 changed files with 258 additions and 119 deletions.
diff --git a/pkg/compiler/compiler.go b/pkg/compiler/compiler.go
@@ -2,6 +2,7 @@ package compiler
 
 import (
 	"errors"
+
 	"github.com/MontFerret/ferret/pkg/runtime"
 
 	"github.com/MontFerret/ferret/pkg/parser"

diff --git a/pkg/compiler/compiler_eq_test.go b/pkg/compiler/compiler_eq_test.go
@@ -2,9 +2,10 @@ package compiler_test
 
 import (
 	"context"
-	runtime2 "github.com/MontFerret/ferret/pkg/runtime"
 	"testing"
 
+	runtime2 "github.com/MontFerret/ferret/pkg/runtime"
+
 	. "github.com/smartystreets/goconvey/convey"
 
 	"github.com/MontFerret/ferret/pkg/compiler"

diff --git a/pkg/compiler/compiler_for_while_test.go b/pkg/compiler/compiler_for_while_test.go
@@ -0,0 +1,19 @@
+package compiler_test
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	"github.com/MontFerret/ferret/pkg/compiler"
+)
+
+func TestForWhile(t *testing.T) {
+	RunUseCases(t, compiler.New(), []UseCase{
+		{
+			"FOR i WHILE false RETURN i",
+			[]any{},
+			ShouldEqualJSON,
+		},
+	})
+}
diff --git a/pkg/compiler/compiler_func_test.go b/pkg/compiler/compiler_func_test.go
@@ -1,8 +1,9 @@
 package compiler_test
 
 import (
-	"github.com/MontFerret/ferret/pkg/compiler"
 	"testing"
+
+	"github.com/MontFerret/ferret/pkg/compiler"
 )
 
 func TestFunctionCall(t *testing.T) {

diff --git a/pkg/compiler/compiler_math_test.go b/pkg/compiler/compiler_math_test.go
@@ -3,9 +3,10 @@ package compiler_test
 import (
 	"context"
 	j "encoding/json"
-	runtime2 "github.com/MontFerret/ferret/pkg/runtime"
 	"testing"
 
+	runtime2 "github.com/MontFerret/ferret/pkg/runtime"
+
 	. "github.com/smartystreets/goconvey/convey"
 
 	"github.com/MontFerret/ferret/pkg/compiler"

diff --git a/pkg/compiler/compiler_member_test.go b/pkg/compiler/compiler_member_test.go
@@ -2,12 +2,13 @@ package compiler_test
 
 import (
 	"fmt"
-	"github.com/MontFerret/ferret/pkg/runtime"
 	"regexp"
 	"strconv"
 	"strings"
 	"testing"
 
+	"github.com/MontFerret/ferret/pkg/runtime"
+
 	. "github.com/smartystreets/goconvey/convey"
 
 	"github.com/MontFerret/ferret/pkg/compiler"

diff --git a/pkg/compiler/namespace.go b/pkg/compiler/namespace.go
@@ -15,7 +15,7 @@ const emptyNS = ""
 const separator = "::"
 
 type NamespaceContainer struct {
-	funcs *core.Functions
+	funcs core.Functions
 	name  string
 }
 
@@ -26,7 +26,7 @@ func NewRootNamespace() *NamespaceContainer {
 	return ns
 }
 
-func NewNamespace(funcs *core.Functions, name string) *NamespaceContainer {
+func NewNamespace(funcs core.Functions, name string) *NamespaceContainer {
 	return &NamespaceContainer{funcs, strings.ToUpper(name)}
 }
 
@@ -67,13 +67,13 @@ func (nc *NamespaceContainer) RemoveFunction(name string) {
 	nc.funcs.Unset(nc.makeFullName(name))
 }
 
-func (nc *NamespaceContainer) MustRegisterFunctions(funcs *core.Functions) {
+func (nc *NamespaceContainer) MustRegisterFunctions(funcs core.Functions) {
 	if err := nc.RegisterFunctions(funcs); err != nil {
 		panic(err)
 	}
 }
 
-func (nc *NamespaceContainer) RegisterFunctions(funcs *core.Functions) error {
+func (nc *NamespaceContainer) RegisterFunctions(funcs core.Functions) error {
 	for _, name := range funcs.Names() {
 		fun, _ := funcs.Get(name)
 
@@ -104,7 +104,7 @@ func (nc *NamespaceContainer) RegisteredFunctions() []string {
 	return res
 }
 
-func (nc *NamespaceContainer) Functions() *core.Functions {
+func (nc *NamespaceContainer) Functions() core.Functions {
 	return nc.funcs
 }