Restructured project part 1

cmd/compile.go

@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/nolol"
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 
 	"github.com/spf13/cobra"
 )

cmd/debug.go

@@ -8,12 +8,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/nolol"
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/testing"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/testing"
 
 	"github.com/abiosoft/ishell"
-	"github.com/dbaumgarten/yodk/vm"
+	"github.com/dbaumgarten/yodk/pkg/vm"
 	"github.com/spf13/cobra"
 )
 

cmd/format.go

@@ -20,9 +20,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/nolol"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 	"github.com/spf13/cobra"
 )
 

cmd/langserv.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/dbaumgarten/yodk/langserver"
+	"github.com/dbaumgarten/yodk/pkg/langserver"
 	"github.com/spf13/cobra"
 )
 

cmd/optimize.go

@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/optimizers"
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/optimizers"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 	"github.com/spf13/cobra"
 )
 

cmd/test.go

@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/dbaumgarten/yodk/testing"
+	"github.com/dbaumgarten/yodk/pkg/testing"
 	"github.com/spf13/cobra"
 )
 

cmd/verify.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 	"github.com/spf13/cobra"
 )
 

main.go

@@ -1,4 +1,4 @@
-// Copyright © 2019 NAME HERE <EMAIL ADDRESS>
+// Copyright © 2019 dbaumgarten
 
 package main
 

jsonrpc2/jsonrpc2_test.go → pkg/jsonrpc2/jsonrpc2_test.go

@@ -14,7 +14,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/dbaumgarten/yodk/jsonrpc2"
+	"github.com/dbaumgarten/yodk/pkg/jsonrpc2"
 )
 
 var logRPC = flag.Bool("logrpc", false, "Enable jsonrpc2 communication logging")

langserver/diagnostics.go → pkg/langserver/diagnostics.go

@@ -5,10 +5,10 @@ import (
 	"log"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/nolol"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
 
-	"github.com/dbaumgarten/yodk/lsp"
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/lsp"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 func (s *LangServer) Diagnose(ctx context.Context, uri lsp.DocumentURI, text string) {

langserver/formatting.go → pkg/langserver/formatting.go

@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/lsp"
-	"github.com/dbaumgarten/yodk/nolol"
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/lsp"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 	"github.com/pmezard/go-difflib/difflib"
 )
 

langserver/server.go → pkg/langserver/server.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/dbaumgarten/yodk/jsonrpc2"
-	"github.com/dbaumgarten/yodk/lsp"
+	"github.com/dbaumgarten/yodk/pkg/jsonrpc2"
+	"github.com/dbaumgarten/yodk/pkg/lsp"
 )
 
 type LangServer struct {

lsp/client.go → pkg/lsp/client.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/dbaumgarten/yodk/jsonrpc2"
+	"github.com/dbaumgarten/yodk/pkg/jsonrpc2"
 )
 
 type Client interface {

lsp/general.go → pkg/lsp/general.go

@@ -7,7 +7,7 @@
 
 package lsp
 
-import "github.com/dbaumgarten/yodk/jsonrpc2"
+import "github.com/dbaumgarten/yodk/pkg/jsonrpc2"
 
 type CancelParams struct {
 	/**

lsp/protocol.go → pkg/lsp/protocol.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/dbaumgarten/yodk/jsonrpc2"
+	"github.com/dbaumgarten/yodk/pkg/jsonrpc2"
 )
 
 func canceller(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) {

lsp/server.go → pkg/lsp/server.go

@@ -8,7 +8,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/dbaumgarten/yodk/jsonrpc2"
+	"github.com/dbaumgarten/yodk/pkg/jsonrpc2"
 )
 
 type Server interface {

nolol/ast.go → pkg/nolol/ast.go

@@ -1,6 +1,6 @@
 package nolol
 
-import "github.com/dbaumgarten/yodk/parser"
+import "github.com/dbaumgarten/yodk/pkg/parser"
 
 // Program represents a complete programm
 type Program struct {

nolol/converter.go → pkg/nolol/converter.go

@@ -3,9 +3,9 @@ package nolol
 import (
 	"fmt"
 
-	"github.com/dbaumgarten/yodk/optimizers"
+	"github.com/dbaumgarten/yodk/pkg/optimizers"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 // special error that is emitted if a nolol if can not be converted to an inline yolol-if

nolol/nolol_test.go → pkg/nolol/nolol_test.go

@@ -3,9 +3,9 @@ package nolol_test
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/nolol"
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/vm"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/vm"
 )
 
 var testProg = `

nolol/parser.go → pkg/nolol/parser.go

@@ -1,7 +1,7 @@
 package nolol
 
 import (
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 // Parser pasres a nolol-program

nolol/printer.go → pkg/nolol/printer.go

@@ -3,7 +3,7 @@ package nolol
 import (
 	"fmt"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 // Printer can generate the nolol-code corresponding to a nolol ast

nolol/tokenizer.go → pkg/nolol/tokenizer.go

@@ -3,7 +3,7 @@ package nolol
 import (
 	"regexp"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 // NewNololTokenizer creates a Yolol-Tokenizer that is modified to also accept Nolol-specific tokens

nolol/visitor.go → pkg/nolol/visitor.go

@@ -1,7 +1,7 @@
 package nolol
 
 import (
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 // Accept is used to implement Acceptor

optimizers/optimizer.go → pkg/optimizers/optimizer.go

@@ -1,6 +1,6 @@
 package optimizers
 
-import "github.com/dbaumgarten/yodk/parser"
+import "github.com/dbaumgarten/yodk/pkg/parser"
 
 // Optimizer is the common interface for all optimizers
 type Optimizer interface {

optimizers/optimizer_test.go → pkg/optimizers/optimizer_test.go

@@ -3,8 +3,8 @@ package optimizers
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/testdata"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/testdata"
 )
 
 func TestOptimizers(t *testing.T) {

optimizers/static_expressions.go → pkg/optimizers/static_expressions.go

@@ -3,8 +3,8 @@ package optimizers
 import (
 	"fmt"
 
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/vm"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/vm"
 	"github.com/shopspring/decimal"
 )
 

optimizers/static_expressions_test.go → pkg/optimizers/static_expressions_test.go

@@ -3,8 +3,8 @@ package optimizers
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/testdata"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/testdata"
 )
 
 func TestStaticExpressions(t *testing.T) {

optimizers/variable_name_test.go → pkg/optimizers/variable_name_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/testdata"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/testdata"
 )
 
 func TestGetNextVarName(t *testing.T) {

optimizers/variable_names.go → pkg/optimizers/variable_names.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 // VariableNameOptimizer replaces variable names with sorter names

parser/parser_test.go → pkg/parser/parser_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/testdata"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/testdata"
 )
 
 func TestParser(t *testing.T) {

parser/printer_test.go → pkg/parser/printer_test.go

@@ -3,8 +3,8 @@ package parser_test
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/parser"
-	"github.com/dbaumgarten/yodk/testdata"
+	"github.com/dbaumgarten/yodk/pkg/parser"
+	"github.com/dbaumgarten/yodk/pkg/testdata"
 )
 
 func TestGenerator(t *testing.T) {

parser/tokenizer_test.go → pkg/parser/tokenizer_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 func TestTokenizer(t *testing.T) {

testdata/dataset.go → pkg/testdata/dataset.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dbaumgarten/yodk/vm"
+	"github.com/dbaumgarten/yodk/pkg/vm"
 	"github.com/shopspring/decimal"
 )
 

testing/test.go → pkg/testing/test.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/dbaumgarten/yodk/nolol"
+	"github.com/dbaumgarten/yodk/pkg/nolol"
 
 	"github.com/shopspring/decimal"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/dbaumgarten/yodk/vm"
+	"github.com/dbaumgarten/yodk/pkg/vm"
 )
 
 // Test defines a test-run
@@ -67,7 +67,7 @@ func Parse(file []byte, absolutePath string) (Test, error) {
 		if script.Iterations == 0 {
 			test.Scripts[i].Iterations = 1
 		}
-		script.AbsolutePath = absolutePath
+		test.Scripts[i].AbsolutePath = absolutePath
 	}
 	return test, err
 }

testing/test_test.go → pkg/testing/test_test.go

@@ -3,7 +3,7 @@ package testing_test
 import (
 	"testing"
 
-	thistesting "github.com/dbaumgarten/yodk/testing"
+	thistesting "github.com/dbaumgarten/yodk/pkg/testing"
 )
 
 func TestTestcase(t *testing.T) {

vm/coordinator_test.go → pkg/vm/coordinator_test.go

@@ -3,7 +3,7 @@ package vm_test
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/vm"
+	"github.com/dbaumgarten/yodk/pkg/vm"
 )
 
 func TestCoordinatedExecution(t *testing.T) {

vm/yolol_vm.go → pkg/vm/yolol_vm.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/shopspring/decimal"
 
-	"github.com/dbaumgarten/yodk/parser"
+	"github.com/dbaumgarten/yodk/pkg/parser"
 )
 
 var errAbortLine = fmt.Errorf("")

vm/yolol_vm_test.go → pkg/vm/yolol_vm_test.go

@@ -3,7 +3,7 @@ package vm_test
 import (
 	"testing"
 
-	"github.com/dbaumgarten/yodk/testdata"
+	"github.com/dbaumgarten/yodk/pkg/testdata"
 )
 
 func TestOperators(t *testing.T) {