core/xgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update directory package structure

Browse source
This commit is contained in:
Daniel Kang 2019-01-11 02:27:28 -08:00
parent d954348e75
commit 27438eea6f
126 changed files with 178 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assert/assert.go
View file

@ -8,9 +8,9 @@ import (
"testing" "testing"
"github.com/d5/tengo/compiler" "github.com/d5/tengo/compiler"
"github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/compiler/token"
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"
"github.com/d5/tengo/source"
"github.com/d5/tengo/token"
) )
func NoError(t *testing.T, err error, msg ...interface{}) bool { func NoError(t *testing.T, err error, msg ...interface{}) bool {

12
cmd/bench/main.go
View file

@ -4,12 +4,12 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/d5/tengo/ast"
"github.com/d5/tengo/compiler" "github.com/d5/tengo/compiler"
"github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/compiler/parser"
"github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"
"github.com/d5/tengo/parser" "github.com/d5/tengo/runtime"
"github.com/d5/tengo/source"
"github.com/d5/tengo/vm"
) )
func main() { func main() {
@ -156,11 +156,11 @@ func compileFile(file *ast.File) (time.Duration, *compiler.Bytecode, error) {
} }
func runVM(bytecode *compiler.Bytecode) (time.Duration, objects.Object, error) { func runVM(bytecode *compiler.Bytecode) (time.Duration, objects.Object, error) {
globals := make([]*objects.Object, vm.GlobalsSize) globals := make([]*objects.Object, runtime.GlobalsSize)
start := time.Now() start := time.Now()
v := vm.NewVM(bytecode, globals) v := runtime.NewVM(bytecode, globals)
if err := v.Run(); err != nil { if err := v.Run(); err != nil {
return time.Since(start), nil, err return time.Since(start), nil, err
} }

12
cmd/repl/main.go
View file

@ -7,12 +7,12 @@ import (
"os" "os"
"os/user" "os/user"
"github.com/d5/tengo/ast"
"github.com/d5/tengo/compiler" "github.com/d5/tengo/compiler"
"github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/compiler/parser"
"github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"
"github.com/d5/tengo/parser" "github.com/d5/tengo/runtime"
"github.com/d5/tengo/source"
"github.com/d5/tengo/vm"
) )
const ( const (
@ -34,7 +34,7 @@ func startRepl(in io.Reader, out io.Writer) {
stdin := bufio.NewScanner(in) stdin := bufio.NewScanner(in)
fileSet := source.NewFileSet() fileSet := source.NewFileSet()
globals := make([]*objects.Object, vm.GlobalsSize) globals := make([]*objects.Object, runtime.GlobalsSize)
symbolTable := compiler.NewSymbolTable() symbolTable := compiler.NewSymbolTable()
for { for {
@ -61,7 +61,7 @@ func startRepl(in io.Reader, out io.Writer) {
continue continue
} }
machine := vm.NewVM(c.Bytecode(), globals) machine := runtime.NewVM(c.Bytecode(), globals)
if err != nil { if err != nil {
_, _ = fmt.Fprintf(out, "VM error:\n %s\n", err.Error()) _, _ = fmt.Fprintf(out, "VM error:\n %s\n", err.Error())
continue continue

4
cmd/tengo/main.go
View file

@ -11,7 +11,7 @@ import (
"github.com/d5/tengo" "github.com/d5/tengo"
"github.com/d5/tengo/compiler" "github.com/d5/tengo/compiler"
"github.com/d5/tengo/vm" "github.com/d5/tengo/runtime"
) )
var ( var (
@ -113,7 +113,7 @@ func doRun(data []byte, _, _ string) (err error) {
return return
} }
machine := vm.NewVM(bytecode, nil) machine := runtime.NewVM(bytecode, nil)
err = machine.Run() err = machine.Run()
if err != nil { if err != nil {

2
ast/array_lit.go → compiler/ast/array_lit.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type ArrayLit struct { type ArrayLit struct {

4
ast/assign_stmt.go → compiler/ast/assign_stmt.go
View file

@ -3,8 +3,8 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type AssignStmt struct { type AssignStmt struct {

0
ast/ast.go → compiler/ast/ast.go
View file

2
ast/bad_expr.go → compiler/ast/bad_expr.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type BadExpr struct { type BadExpr struct {
From source.Pos From source.Pos

2
ast/bad_stmt.go → compiler/ast/bad_stmt.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type BadStmt struct { type BadStmt struct {
From source.Pos From source.Pos

4
ast/binary_expr.go → compiler/ast/binary_expr.go
View file

@ -1,8 +1,8 @@
package ast package ast
import ( import (
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type BinaryExpr struct { type BinaryExpr struct {

2
ast/block_stmt.go → compiler/ast/block_stmt.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type BlockStmt struct { type BlockStmt struct {

2
ast/bool_lit.go → compiler/ast/bool_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type BoolLit struct { type BoolLit struct {
Value bool Value bool

4
ast/branch_stmt.go → compiler/ast/branch_stmt.go
View file

@ -1,8 +1,8 @@
package ast package ast
import ( import (
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type BranchStmt struct { type BranchStmt struct {

2
ast/call_expr.go → compiler/ast/call_expr.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type CallExpr struct { type CallExpr struct {

2
ast/char_lit.go → compiler/ast/char_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type CharLit struct { type CharLit struct {
Value rune Value rune

2
ast/empty_stmt.go → compiler/ast/empty_stmt.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type EmptyStmt struct { type EmptyStmt struct {
Semicolon source.Pos Semicolon source.Pos

0
ast/expr.go → compiler/ast/expr.go
View file

2
ast/expr_stmt.go → compiler/ast/expr_stmt.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type ExprStmt struct { type ExprStmt struct {
Expr Expr Expr Expr

2
ast/file.go → compiler/ast/file.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type File struct { type File struct {

2
ast/float_lit.go → compiler/ast/float_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type FloatLit struct { type FloatLit struct {
Value float64 Value float64

2
ast/for_in_stmt.go → compiler/ast/for_in_stmt.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type ForInStmt struct { type ForInStmt struct {
ForPos source.Pos ForPos source.Pos

2
ast/for_stmt.go → compiler/ast/for_stmt.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type ForStmt struct { type ForStmt struct {
ForPos source.Pos ForPos source.Pos

2
ast/func_lit.go → compiler/ast/func_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type FuncLit struct { type FuncLit struct {
Type *FuncType Type *FuncType

2
ast/func_type.go → compiler/ast/func_type.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type FuncType struct { type FuncType struct {
FuncPos source.Pos FuncPos source.Pos

2
ast/ident.go → compiler/ast/ident.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type Ident struct { type Ident struct {
Name string Name string

2
ast/ident_list.go → compiler/ast/ident_list.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type IdentList struct { type IdentList struct {

2
ast/if_stmt.go → compiler/ast/if_stmt.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type IfStmt struct { type IfStmt struct {
IfPos source.Pos IfPos source.Pos

4
ast/inc_dec_stmt.go → compiler/ast/inc_dec_stmt.go
View file

@ -1,8 +1,8 @@
package ast package ast
import ( import (
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type IncDecStmt struct { type IncDecStmt struct {

2
ast/index_expr.go → compiler/ast/index_expr.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type IndexExpr struct { type IndexExpr struct {
Expr Expr Expr Expr

2
ast/int_lit.go → compiler/ast/int_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type IntLit struct { type IntLit struct {
Value int64 Value int64

2
ast/map_element_lit.go → compiler/ast/map_element_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type MapElementLit struct { type MapElementLit struct {
Key string Key string

2
ast/map_lit.go → compiler/ast/map_lit.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type MapLit struct { type MapLit struct {

2
ast/node.go → compiler/ast/node.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type Node interface { type Node interface {
Pos() source.Pos Pos() source.Pos

2
ast/paren_expr.go → compiler/ast/paren_expr.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type ParenExpr struct { type ParenExpr struct {
Expr Expr Expr Expr

2
ast/return_stmt.go → compiler/ast/return_stmt.go
View file

@ -3,7 +3,7 @@ package ast
import ( import (
"strings" "strings"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type ReturnStmt struct { type ReturnStmt struct {

2
ast/selector_expr.go → compiler/ast/selector_expr.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type SelectorExpr struct { type SelectorExpr struct {
Expr Expr Expr Expr

2
ast/slice_expr.go → compiler/ast/slice_expr.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type SliceExpr struct { type SliceExpr struct {
Expr Expr Expr Expr

0
ast/stmt.go → compiler/ast/stmt.go
View file

2
ast/string_lit.go → compiler/ast/string_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type StringLit struct { type StringLit struct {
Value string Value string

4
ast/unary_expr.go → compiler/ast/unary_expr.go
View file

@ -1,8 +1,8 @@
package ast package ast
import ( import (
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type UnaryExpr struct { type UnaryExpr struct {

2
ast/undefined_lit.go → compiler/ast/undefined_lit.go
View file

@ -1,6 +1,6 @@
package ast package ast
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type UndefinedLit struct { type UndefinedLit struct {
TokenPos source.Pos TokenPos source.Pos

4
compiler/compiler.go
View file

@ -5,9 +5,9 @@ import (
"io" "io"
"reflect" "reflect"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/compiler/token"
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"
"github.com/d5/tengo/token"
) )
type Compiler struct { type Compiler struct {

4
compiler/compiler_assign.go
View file

@ -4,8 +4,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func (c *Compiler) compileAssign(lhs, rhs []ast.Expr, op token.Token) error { func (c *Compiler) compileAssign(lhs, rhs []ast.Expr, op token.Token) error {

2
compiler/compiler_for.go
View file

@ -1,7 +1,7 @@
package compiler package compiler
import ( import (
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
) )
func (c *Compiler) compileForStmt(stmt *ast.ForStmt) error { func (c *Compiler) compileForStmt(stmt *ast.ForStmt) error {

4
compiler/compiler_logical.go
View file

@ -1,8 +1,8 @@
package compiler package compiler
import ( import (
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func (c *Compiler) compileLogical(node *ast.BinaryExpr) error { func (c *Compiler) compileLogical(node *ast.BinaryExpr) error {

4
compiler/compiler_test.go
View file

@ -8,9 +8,9 @@ import (
"github.com/d5/tengo/assert" "github.com/d5/tengo/assert"
"github.com/d5/tengo/compiler" "github.com/d5/tengo/compiler"
"github.com/d5/tengo/compiler/parser"
"github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"
"github.com/d5/tengo/parser"
"github.com/d5/tengo/source"
) )
func TestCompiler_Compile(t *testing.T) { func TestCompiler_Compile(t *testing.T) {

2
parser/error.go → compiler/parser/error.go
View file

@ -1,6 +1,6 @@
package parser package parser
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type Error struct { type Error struct {
Pos source.FilePos Pos source.FilePos

2
parser/error_list.go → compiler/parser/error_list.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"sort" "sort"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
type ErrorList []*Error type ErrorList []*Error

4
parser/parse_file.go → compiler/parser/parse_file.go
View file

@ -3,8 +3,8 @@ package parser
import ( import (
"io" "io"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
func ParseFile(file *source.File, src []byte, trace io.Writer) (res *ast.File, err error) { func ParseFile(file *source.File, src []byte, trace io.Writer) (res *ast.File, err error) {

4
parser/parse_source.go → compiler/parser/parse_source.go
View file

@ -3,8 +3,8 @@ package parser
import ( import (
"io" "io"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
) )
// ParseSource parses source code 'src' and builds an AST. // ParseSource parses source code 'src' and builds an AST.

8
parser/parser.go → compiler/parser/parser.go
View file

@ -5,10 +5,10 @@ import (
"io" "io"
"strconv" "strconv"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/scanner" "github.com/d5/tengo/compiler/scanner"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type bailout struct{} type bailout struct{}

4
parser/parser_array_test.go → compiler/parser/parser_array_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestArray(t *testing.T) { func TestArray(t *testing.T) {

4
parser/parser_assignment_test.go → compiler/parser/parser_assignment_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestAssignment(t *testing.T) { func TestAssignment(t *testing.T) {

4
parser/parser_boolean_test.go → compiler/parser/parser_boolean_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestBoolean(t *testing.T) { func TestBoolean(t *testing.T) {

4
parser/parser_call_test.go → compiler/parser/parser_call_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestCall(t *testing.T) { func TestCall(t *testing.T) {

2
parser/parser_char_test.go → compiler/parser/parser_char_test.go
View file

@ -3,7 +3,7 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
) )
func TestChar(t *testing.T) { func TestChar(t *testing.T) {

2
parser/parser_for_in_test.go → compiler/parser/parser_for_in_test.go
View file

@ -3,7 +3,7 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
) )
func TestForIn(t *testing.T) { func TestForIn(t *testing.T) {

4
parser/parser_for_test.go → compiler/parser/parser_for_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestFor(t *testing.T) { func TestFor(t *testing.T) {

4
parser/parser_function_test.go → compiler/parser/parser_function_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestFunction(t *testing.T) { func TestFunction(t *testing.T) {

4
parser/parser_if_test.go → compiler/parser/parser_if_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestIf(t *testing.T) { func TestIf(t *testing.T) {

4
parser/parser_index_test.go → compiler/parser/parser_index_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestIndex(t *testing.T) { func TestIndex(t *testing.T) {

4
parser/parser_logical_test.go → compiler/parser/parser_logical_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestLogical(t *testing.T) { func TestLogical(t *testing.T) {

4
parser/parser_map_test.go → compiler/parser/parser_map_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestMap(t *testing.T) { func TestMap(t *testing.T) {

0
parser/parser_precendence_test.go → compiler/parser/parser_precendence_test.go
View file

4
parser/parser_selector_test.go → compiler/parser/parser_selector_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestSelector(t *testing.T) { func TestSelector(t *testing.T) {

2
parser/parser_semicolon_test.go → compiler/parser/parser_semicolon_test.go
View file

@ -3,7 +3,7 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
) )
func TestSemicolon(t *testing.T) { func TestSemicolon(t *testing.T) {

4
parser/parser_string_test.go → compiler/parser/parser_string_test.go
View file

@ -3,8 +3,8 @@ package parser_test
import ( import (
"testing" "testing"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
func TestString(t *testing.T) { func TestString(t *testing.T) {

8
parser/parser_test.go → compiler/parser/parser_test.go
View file

@ -7,10 +7,10 @@ import (
"testing" "testing"
"github.com/d5/tengo/assert" "github.com/d5/tengo/assert"
"github.com/d5/tengo/ast" "github.com/d5/tengo/compiler/ast"
"github.com/d5/tengo/parser" "github.com/d5/tengo/compiler/parser"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type pfn func(int, int) source.Pos // position conversion function type pfn func(int, int) source.Pos // position conversion function

2
parser/sync.go → compiler/parser/sync.go
View file

@ -1,6 +1,6 @@
package parser package parser
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
var stmtStart = map[token.Token]bool{ var stmtStart = map[token.Token]bool{
token.Break: true, token.Break: true,

2
scanner/error_handler.go → compiler/scanner/error_handler.go
View file

@ -1,5 +1,5 @@
package scanner package scanner
import "github.com/d5/tengo/source" import "github.com/d5/tengo/compiler/source"
type ErrorHandler func(pos source.FilePos, msg string) type ErrorHandler func(pos source.FilePos, msg string)

0
scanner/mode.go → compiler/scanner/mode.go
View file

4
scanner/scanner.go → compiler/scanner/scanner.go
View file

@ -5,8 +5,8 @@ import (
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
// byte order mark // byte order mark

6
scanner/scanner_test.go → compiler/scanner/scanner_test.go
View file

@ -8,9 +8,9 @@ import (
"time" "time"
"github.com/d5/tengo/assert" "github.com/d5/tengo/assert"
"github.com/d5/tengo/scanner" "github.com/d5/tengo/compiler/scanner"
"github.com/d5/tengo/source" "github.com/d5/tengo/compiler/source"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
var testFileSet = source.NewFileSet() var testFileSet = source.NewFileSet()

0
source/file.go → compiler/source/file.go
View file

0
source/file_pos.go → compiler/source/file_pos.go
View file

0
source/file_set.go → compiler/source/file_set.go
View file

0
source/pos.go → compiler/source/pos.go
View file

0
token/keywords.go → compiler/token/keywords.go
View file

0
token/tokens.go → compiler/token/tokens.go
View file

2
objects/array.go
View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Array struct { type Array struct {

2
objects/bool.go
View file

@ -1,7 +1,7 @@
package objects package objects
import ( import (
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Bool struct { type Bool struct {

2
objects/break.go
View file

@ -1,6 +1,6 @@
package objects package objects
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
type Break struct{} type Break struct{}

2
objects/builtin_function.go
View file

@ -1,7 +1,7 @@
package objects package objects
import ( import (
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type BuiltinFunction struct { type BuiltinFunction struct {

2
objects/char.go
View file

@ -1,7 +1,7 @@
package objects package objects
import ( import (
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Char struct { type Char struct {

2
objects/closure.go
View file

@ -1,7 +1,7 @@
package objects package objects
import ( import (
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Closure struct { type Closure struct {

2
objects/compiled_function.go
View file

@ -1,7 +1,7 @@
package objects package objects
import ( import (
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type CompiledFunction struct { type CompiledFunction struct {

2
objects/continue.go
View file

@ -1,6 +1,6 @@
package objects package objects
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
type Continue struct { type Continue struct {
} }

2
objects/float.go
View file

@ -4,7 +4,7 @@ import (
"math" "math"
"strconv" "strconv"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Float struct { type Float struct {

2
objects/int.go
View file

@ -3,7 +3,7 @@ package objects
import ( import (
"strconv" "strconv"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Int struct { type Int struct {

2
objects/iterator.go
View file

@ -1,6 +1,6 @@
package objects package objects
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
type Iterator interface { type Iterator interface {
Object Object

2
objects/map.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type Map struct { type Map struct {

2
objects/object.go
View file

@ -1,6 +1,6 @@
package objects package objects
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
type Object interface { type Object interface {
TypeName() string TypeName() string

2
objects/return_value.go
View file

@ -1,6 +1,6 @@
package objects package objects
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
type ReturnValue struct { type ReturnValue struct {
Value Object Value Object

2
objects/string.go
View file

@ -3,7 +3,7 @@ package objects
import ( import (
"fmt" "fmt"
"github.com/d5/tengo/token" "github.com/d5/tengo/compiler/token"
) )
type String struct { type String struct {

2
objects/undefined.go
View file

@ -1,6 +1,6 @@
package objects package objects
import "github.com/d5/tengo/token" import "github.com/d5/tengo/compiler/token"
var undefined = &Undefined{} var undefined = &Undefined{}

2
vm/errors.go → runtime/errors.go
View file

@ -1,4 +1,4 @@
package vm package runtime
import ( import (
"errors" "errors"

2
vm/frame.go → runtime/frame.go
View file

@ -1,4 +1,4 @@
package vm package runtime
import ( import (
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"

4
vm/vm.go → runtime/vm.go
View file

@ -1,11 +1,11 @@
package vm package runtime
import ( import (
"fmt" "fmt"
"github.com/d5/tengo/compiler" "github.com/d5/tengo/compiler"
"github.com/d5/tengo/compiler/token"
"github.com/d5/tengo/objects" "github.com/d5/tengo/objects"
"github.com/d5/tengo/token"
) )
const ( const (

2
vm/vm_array_test.go → runtime/vm_array_test.go
View file

@ -1,4 +1,4 @@
package vm_test package runtime_test
import ( import (
"testing" "testing"

6
vm/vm_assignment_test.go → runtime/vm_assignment_test.go
View file

@ -1,4 +1,4 @@
package vm_test package runtime_test
import ( import (
"testing" "testing"
@ -193,8 +193,8 @@ out = func() {
`, 136) `, 136)
// assigning different type value // assigning different type value
expect(t, `a := 1; a = "foo"; out = a`, "foo") // global expect(t, `a := 1; a = "foo"; out = a`, "foo") // global
expect(t, `func() { a := 1; a = "foo"; out = a }()`, "foo") // local expect(t, `func() { a := 1; a = "foo"; out = a }()`, "foo") // local
expect(t, ` expect(t, `
out = func() { out = func() {
a := 5 a := 5

Some files were not shown because too many files have changed in this diff Show more