stmts

ast/expr.go

@@ -3,19 +3,22 @@ package ast
 import (
 	"strings"
 
+	"github.com/covrom/gonec/bincode/binstmt"
 	"github.com/covrom/gonec/builtins"
+	"github.com/covrom/gonec/pos"
 )
 
 // Expr provides all of interfaces for expression.
 type Expr interface {
-	Pos
+	pos.Pos
 	expr()
 	Simplify() Expr
+	BinTo(*binstmt.BinStmts, int, *int, bool)
 }
 
 // ExprImpl provide commonly implementations for Expr.
 type ExprImpl struct {
-	PosImpl // ExprImpl provide Pos() function.
+	pos.PosImpl // ExprImpl provide Pos() function.
 }
 
 // expr provide restraint interface.

ast/stmt.go

@@ -1,15 +1,21 @@
 package ast
 
+import (
+	"github.com/covrom/gonec/bincode/binstmt"
+	"github.com/covrom/gonec/pos"
+)
+
 // Stmt provides all of interfaces for statement.
 type Stmt interface {
-	Pos
+	pos.Pos
 	stmt()
 	Simplify()
+	BinTo(*binstmt.BinStmts, int, *int)
 }
 
 // StmtImpl provide commonly implementations for Stmt..
 type StmtImpl struct {
-	PosImpl // StmtImpl provide Pos() function.
+	pos.PosImpl // StmtImpl provide Pos() function.
 }
 
 // stmt provide restraint interface.
@@ -25,6 +31,11 @@ func (x *ExprStmt) Simplify() {
 	x.Expr = x.Expr.Simplify()
 }
 
+func (s *ExprStmt) BinTo(bins *binstmt.BinStmts, reg int, lid *int) {
+	s.Expr.BinTo(bins, reg, lid, true)
+	// *bins = append(*bins, addBinExpr(s.Expr, reg, lid, true)...)
+}
+
 // IfStmt provide "if/else" statement.
 type IfStmt struct {
 	StmtImpl

ast/token.go

@@ -1,7 +1,9 @@
 package ast
 
+import "github.com/covrom/gonec/pos"
+
 type Token struct {
-	PosImpl // StmtImpl provide Pos() function.
-	Tok     int
-	Lit     string
+	pos.PosImpl // StmtImpl provide Pos() function.
+	Tok         int
+	Lit         string
 }

bincode/bincode.go

@@ -4,9 +4,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/covrom/gonec/env"
-
 	"github.com/covrom/gonec/ast"
+	"github.com/covrom/gonec/env"
 )
 
 ///////////////////////////////////////////////////////////////
@@ -20,6 +19,9 @@ func BinaryCode(inast []ast.Stmt, reg int, lid *int) (bcd BinCode) {
 		bcd.MapLabels()
 	}()
 	for _, st := range inast {
+
+		st.BinTo(&bins, reg, lid)
+
 		// перебираем все подвыражения и команды, и выстраиваем их в линию
 		// если в команде есть выражение - определяем новый id регистра, присваиваем ему выражение, а в команду передаем id этого регистра
 		switch s := st.(type) {

bincode/binstmt.go → bincode/binstmt/binstmt.go

@@ -1,4 +1,4 @@
-package bincode
+package binstmt
 
 import (
 	"compress/gzip"
@@ -8,19 +8,19 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/covrom/gonec/ast"
 	"github.com/covrom/gonec/builtins"
 	"github.com/covrom/gonec/env"
+	"github.com/covrom/gonec/pos"
 )
 
 type BinStmt interface {
-	ast.Pos
+	pos.Pos
 	binstmt()
 	SwapId(map[int]int)
 }
 
 type BinStmtImpl struct {
-	ast.PosImpl
+	pos.PosImpl
 	fmt.Stringer
 }
 
@@ -222,14 +222,14 @@ type BinLOAD struct {
 
 func (v *BinLOAD) SwapId(m map[int]int) {
 	if v.IsId {
-		if newid, ok := m[v.Val.(int)]; ok {
-			v.Val = newid
+		if newid, ok := m[int(v.Val.(core.VMInt))]; ok {
+			v.Val = core.VMInt(newid)
 		}
 	}
 }
 func (v BinLOAD) String() string {
 	if v.IsId {
-		return fmt.Sprintf("LOAD r%d, %#v", v.Reg, env.UniqueNames.Get(v.Val.(int)))
+		return fmt.Sprintf("LOAD r%d, %#v", v.Reg, env.UniqueNames.Get(int(v.Val.(core.VMInt))))
 	}
 	return fmt.Sprintf("LOAD r%d, %#v", v.Reg, v.Val)
 }
@@ -525,11 +525,11 @@ type BinOPER struct {
 
 	RegL int // сюда же помещается результат
 	RegR int
-	Op   int
+	Op   core.VMOperation
 }
 
 func (v BinOPER) String() string {
-	return fmt.Sprintf("OP r%d, %q, r%d", v.RegL, OperMapR[v.Op], v.RegR)
+	return fmt.Sprintf("OP r%d, %q, r%d", v.RegL, core.OperMapR[v.Op], v.RegR)
 }
 
 type BinCALL struct {

ast/pos.go → pos/pos.go

@@ -1,4 +1,4 @@
-package ast
+package pos
 
 // Position provides interface to store code locations.
 type Position struct {