Merge pull request #302 from MichaelS11/types

0.0.9 Making types now more dynamic

anko.go

@@ -17,7 +17,7 @@ import (
 	"github.com/mattn/anko/vm"
 )
 
-const version = "0.0.8"
+const version = "0.0.9"
 
 var (
 	flagExecute string

ast/ast.go

@@ -0,0 +1,34 @@
+package ast
+
+// Token is used in the lexer to split characters into a string called a token
+type Token struct {
+	PosImpl
+	Tok int
+	Lit string
+}
+
+// TypeKind blah
+type TypeKind int
+
+const (
+	// TypeDefault default type
+	TypeDefault TypeKind = iota
+	// TypePtr ptr type
+	TypePtr
+	// TypeSlice slice type
+	TypeSlice
+	// TypeMap map type
+	TypeMap
+	// TypeChan chan type
+	TypeChan
+)
+
+// TypeStruct blah
+type TypeStruct struct {
+	Kind       TypeKind
+	Env        []string
+	Name       string
+	Dimensions int
+	SubType    *TypeStruct
+	Key        *TypeStruct
+}

ast/astutil/walk.go

@@ -202,7 +202,6 @@ func walkExpr(expr ast.Expr, f WalkFunc) error {
 			return err
 		}
 		return walkExprs(expr.RHSS, f)
-	case *ast.NewExpr:
 	case *ast.AnonCallExpr:
 		if err := walkExpr(expr.Expr, f); err != nil {
 			return err
@@ -218,8 +217,6 @@ func walkExpr(expr ast.Expr, f WalkFunc) error {
 			return err
 		}
 		return walkExpr(expr.RHS, f)
-	case *ast.MakeChanExpr:
-		return walkExpr(expr.SizeExpr, f)
 	case *ast.MakeExpr:
 		if err := walkExpr(expr.LenExpr, f); err != nil {
 			return err

ast/expr.go

@@ -149,31 +149,12 @@ type ChanExpr struct {
 	RHS Expr
 }
 
-// NewExpr provide expression to make new instance.
-type NewExpr struct {
-	ExprImpl
-	Type string
-}
-
-// MakeChanExpr provide expression to make chan instance.
-type MakeChanExpr struct {
-	ExprImpl
-	Type     string
-	SizeExpr Expr
-}
-
-// ArrayCount is used in MakeExpr to provide Dimensions
-type ArrayCount struct {
-	Count int
-}
-
 // MakeExpr provide expression to make instance.
 type MakeExpr struct {
 	ExprImpl
-	Dimensions int
-	Type       string
-	LenExpr    Expr
-	CapExpr    Expr
+	TypeData *TypeStruct
+	LenExpr  Expr
+	CapExpr  Expr
 }
 
 // MakeTypeExpr provide expression to make type.

packages/encoding.json_test.go

@@ -10,7 +10,7 @@ import (
 func TestJson(t *testing.T) {
 	os.Setenv("ANKO_DEBUG", "1")
 	tests := []testlib.Test{
-		{Script: `json = import("encoding/json"); a = make(mapStringInterface); a["b"] = "b"; c, err = json.Marshal(a); err`, Types: map[string]interface{}{"mapStringInterface": map[string]interface{}{}}, Output: map[string]interface{}{"a": map[string]interface{}{"b": "b"}, "c": []byte(`{"b":"b"}`)}},
+		{Script: `json = import("encoding/json"); a = make(map[string]interface); a["b"] = "b"; c, err = json.Marshal(a); err`, Output: map[string]interface{}{"a": map[string]interface{}{"b": "b"}, "c": []byte(`{"b":"b"}`)}},
 		{Script: `json = import("encoding/json"); b = 1; err = json.Unmarshal(a, &b); err`, Input: map[string]interface{}{"a": []byte(`{"b": "b"}`)}, Output: map[string]interface{}{"a": []byte(`{"b": "b"}`), "b": map[string]interface{}{"b": "b"}}},
 		{Script: `json = import("encoding/json"); b = 1; err = json.Unmarshal(a, &b); err`, Input: map[string]interface{}{"a": `{"b": "b"}`}, Output: map[string]interface{}{"a": `{"b": "b"}`, "b": map[string]interface{}{"b": "b"}}},
 		{Script: `json = import("encoding/json"); b = 1; err = json.Unmarshal(a, &b); err`, Input: map[string]interface{}{"a": `[["1", "2"],["3", "4"]]`}, Output: map[string]interface{}{"a": `[["1", "2"],["3", "4"]]`, "b": []interface{}{[]interface{}{"1", "2"}, []interface{}{"3", "4"}}}},

parser/lexer.go

@@ -70,6 +70,7 @@ var opName = map[string]int{
 	"len":      LEN,
 	"delete":   DELETE,
 	"close":    CLOSE,
+	"map":      MAP,
 }
 
 var (
@@ -190,19 +191,9 @@ retry:
 				tok = MINUSEQ
 				lit = "-="
 			default:
-				if isDigit(s.peek()) {
-					tok = NUMBER
-					lit, err = s.scanNumber()
-					if err != nil {
-						return
-					}
-					lit = "-" + lit
-					s.back()
-				} else {
-					s.back()
-					tok = int(ch)
-					lit = "-"
-				}
+				s.back()
+				tok = int(ch)
+				lit = "-"
 			}
 		case '*':
 			s.next()