Function definition passed tess.

pkg/ride/compiler2.go

@@ -44,8 +44,7 @@ func ccc(f Fsm, node Node) (Fsm, error) {
 		}
 		return f.Return(), nil
 	case *FunctionDeclarationNode:
-		// TODO
-		fsm, err := ccc(f.Assigment(n.Name), n.Body)
+		fsm, err := ccc(f.FuncDeclaration(n.Name, n.Arguments), n.Body)
 		if err != nil {
 			return fsm, err
 		}

pkg/ride/compiler2_test.go

@@ -70,16 +70,16 @@ func Test22(t *testing.T) {
 		env     RideEnvironment
 		res     bool
 	}{
-		//{`V1: true`, "AQa3b8tH", nil, true},
-		//{`V3: let x = 1; true`, "AwQAAAABeAAAAAAAAAAAAQbtAkXn", nil, true},
-		//{`V3: let x = "abc"; true`, "AwQAAAABeAIAAAADYWJjBrpUkE4=", nil, true},
-		//{`V1: let i = 1; let s = "string"; toString(i) == s`, "AQQAAAABaQAAAAAAAAAAAQQAAAABcwIAAAAGc3RyaW5nCQAAAAAAAAIJAAGkAAAAAQUAAAABaQUAAAABcwIsH74=", nil, false},
-		//{`V3: let i = 12345; let s = "12345"; toString(i) == s`, "AwQAAAABaQAAAAAAAAAwOQQAAAABcwIAAAAFMTIzNDUJAAAAAAAAAgkAAaQAAAABBQAAAAFpBQAAAAFz1B1iCw==", nil, true},
-		//{`V3: if (true) then {let r = true; r} else {let r = false; r}`, "AwMGBAAAAAFyBgUAAAABcgQAAAABcgcFAAAAAXJ/ok0E", nil, true},
-		//{`V3: if (false) then {let r = true; r} else {let r = false; r}`, "AwMHBAAAAAFyBgUAAAABcgQAAAABcgcFAAAAAXI+tfo1", nil, false},
+		{`V1: true`, "AQa3b8tH", nil, true},
+		{`V3: let x = 1; true`, "AwQAAAABeAAAAAAAAAAAAQbtAkXn", nil, true},
+		{`V3: let x = "abc"; true`, "AwQAAAABeAIAAAADYWJjBrpUkE4=", nil, true},
+		{`V1: let i = 1; let s = "string"; toString(i) == s`, "AQQAAAABaQAAAAAAAAAAAQQAAAABcwIAAAAGc3RyaW5nCQAAAAAAAAIJAAGkAAAAAQUAAAABaQUAAAABcwIsH74=", nil, false},
+		{`V3: let i = 12345; let s = "12345"; toString(i) == s`, "AwQAAAABaQAAAAAAAAAwOQQAAAABcwIAAAAFMTIzNDUJAAAAAAAAAgkAAaQAAAABBQAAAAFpBQAAAAFz1B1iCw==", nil, true},
+		{`V3: if (true) then {let r = true; r} else {let r = false; r}`, "AwMGBAAAAAFyBgUAAAABcgQAAAABcgcFAAAAAXJ/ok0E", nil, true},
+		{`V3: if (false) then {let r = true; r} else {let r = false; r}`, "AwMHBAAAAAFyBgUAAAABcgQAAAABcgcFAAAAAXI+tfo1", nil, false},
 		//{`V3: func abs(i:Int) = if (i >= 0) then i else -i; abs(-10) == 10`, "AwoBAAAAA2FicwAAAAEAAAABaQMJAABnAAAAAgUAAAABaQAAAAAAAAAAAAUAAAABaQkBAAAAAS0AAAABBQAAAAFpCQAAAAAAAAIJAQAAAANhYnMAAAABAP/////////2AAAAAAAAAAAKmp8BWw==", nil, true},
-		//{`V3: let x = 1; func add(i: Int) = i + 1; add(x) == 2`, "AwQAAAABeAAAAAAAAAAAAQoBAAAAA2FkZAAAAAEAAAABaQkAAGQAAAACBQAAAAFpAAAAAAAAAAABCQAAAAAAAAIJAQAAAANhZGQAAAABBQAAAAF4AAAAAAAAAAACfr6U6w==", nil, true},
-		//{`V3: let b = base16'0000000000000001'; func add(b: ByteVector) = toInt(b) + 1; add(b) == 2`, "AwQAAAABYgEAAAAIAAAAAAAAAAEKAQAAAANhZGQAAAABAAAAAWIJAABkAAAAAgkABLEAAAABBQAAAAFiAAAAAAAAAAABCQAAAAAAAAIJAQAAAANhZGQAAAABBQAAAAFiAAAAAAAAAAACX00biA==", nil, true},
+		{`V3: let x = 1; func add(i: Int) = i + 1; add(x) == 2`, "AwQAAAABeAAAAAAAAAAAAQoBAAAAA2FkZAAAAAEAAAABaQkAAGQAAAACBQAAAAFpAAAAAAAAAAABCQAAAAAAAAIJAQAAAANhZGQAAAABBQAAAAF4AAAAAAAAAAACfr6U6w==", env, true},
+		{`V3: let b = base16'0000000000000001'; func add(b: ByteVector) = toInt(b) + 1; add(b) == 2`, "AwQAAAABYgEAAAAIAAAAAAAAAAEKAQAAAANhZGQAAAABAAAAAWIJAABkAAAAAgkABLEAAAABBQAAAAFiAAAAAAAAAAABCQAAAAAAAAIJAQAAAANhZGQAAAABBQAAAAFiAAAAAAAAAAACX00biA==", nil, true},
 		//{`V3: let b = base16'0000000000000001'; func add(v: ByteVector) = toInt(v) + 1; add(b) == 2`, "AwQAAAABYgEAAAAIAAAAAAAAAAEKAQAAAANhZGQAAAABAAAAAXYJAABkAAAAAgkABLEAAAABBQAAAAF2AAAAAAAAAAABCQAAAAAAAAIJAQAAAANhZGQAAAABBQAAAAFiAAAAAAAAAAACI7gYxg==", nil, true},
 		//{`V3: let b = base16'0000000000000001'; func add(v: ByteVector) = toInt(b) + 1; add(b) == 2`, "AwQAAAABYgEAAAAIAAAAAAAAAAEKAQAAAANhZGQAAAABAAAAAXYJAABkAAAAAgkABLEAAAABBQAAAAFiAAAAAAAAAAABCQAAAAAAAAIJAQAAAANhZGQAAAABBQAAAAFiAAAAAAAAAAAChRvwnQ==", nil, true},
 		//{`V3: let data = base64'AAAAAAABhqAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWyt9GyysOW84u/u5V5Ah/SzLfef4c28UqXxowxFZS4SLiC6+XBh8D7aJDXyTTjpkPPED06ZPOzUE23V6VYCsLw=='; func getStock(data:ByteVector) = toInt(take(drop(data, 8), 8)); getStock(data) == 1`, `AwQAAAAEZGF0YQEAAABwAAAAAAABhqAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWyt9GyysOW84u/u5V5Ah/SzLfef4c28UqXxowxFZS4SLiC6+XBh8D7aJDXyTTjpkPPED06ZPOzUE23V6VYCsLwoBAAAACGdldFN0b2NrAAAAAQAAAARkYXRhCQAEsQAAAAEJAADJAAAAAgkAAMoAAAACBQAAAARkYXRhAAAAAAAAAAAIAAAAAAAAAAAICQAAAAAAAAIJAQAAAAhnZXRTdG9jawAAAAEFAAAABGRhdGEAAAAAAAAAAAFCtabi`, nil, true},
@@ -91,7 +91,7 @@ func Test22(t *testing.T) {
 		//{`let x =  throw(); true`, `AQQAAAABeAkBAAAABXRocm93AAAAAAa7bgf4`, nil, true},
 		//{`let x =  throw(); true || x`, `AQQAAAABeAkBAAAABXRocm93AAAAAAMGBgUAAAABeKRnLds=`, nil, true},
 		// Global variables
-		{`tx == tx`, "BAkAAAAAAAACBQAAAAJ0eAUAAAACdHhnqgP4", env, true},
+		//{`tx == tx`, "BAkAAAAAAAACBQAAAAJ0eAUAAAACdHhnqgP4", env, true},
 		//{`tx.id == base58''`, `AQkAAAAAAAACCAUAAAACdHgAAAACaWQBAAAAAJBtD70=`, env, false},
 		//{`tx.id == base58'H5C8bRzbUTMePSDVVxjiNKDUwk6CKzfZGTP2Rs7aCjsV'`, `BAkAAAAAAAACCAUAAAACdHgAAAACaWQBAAAAIO7N5luRDUgN1SJ4kFmy/Ni8U2H6k7bpszok5tlLlRVgHwSHyg==`, env, true},
 		//{`let x = tx.id == base58'a';true`, `AQQAAAABeAkAAAAAAAACCAUAAAACdHgAAAACaWQBAAAAASEGjR0kcA==`, env, true},
@@ -122,3 +122,34 @@ func Test22(t *testing.T) {
 		assert.Equal(t, test.res, r.Result(), test.comment)
 	}
 }
+
+/*
+
+let x = 1; let y = 2; func gt(i: Int, i2: Int) = i > i2; gt(x, y)
+
+*/
+func Test33(t *testing.T) {
+
+	e := Executable{
+		LibVersion: 3,
+		ByteCode: []byte{
+			OpPush, 0, 0, OpReturn,
+			OpPush, 0, 1, OpReturn,
+			OpPushFromFrame, 0, 0,
+			OpPushFromFrame, 0, 1,
+			OpExternalCall, 0, 12, 0, 2,
+			OpReturn,
+			// ENTRYPOINT
+			OpJump, 0, 0, // jump to the beginning, first variable
+			OpJump, 0, 4, // jump to the second variable
+			OpJump, 0, 8, // вызов пользовательской функции add
+			OpReturn,
+		},
+		Constants:   []rideType{rideInt(1), rideInt(2)},
+		EntryPoints: map[string]uint16{"": 20},
+	}
+
+	rs, err := e.Run(nil)
+	t.Log(rs)
+	t.Log(err)
+}

pkg/ride/compiler_fsm.go

@@ -1,5 +1,7 @@
 package ride
 
+import "fmt"
+
 type Fsm interface {
 	Assigment(name string) Fsm
 	Return() Fsm
@@ -12,6 +14,7 @@ type Fsm interface {
 	TrueBranch() Fsm
 	FalseBranch() Fsm
 	Bytes(b []byte) Fsm
+	FuncDeclaration(name string, args []string) Fsm
 }
 
 type FunctionChecker func(string) (uint16, bool)
@@ -23,8 +26,6 @@ type params struct {
 	c *constants
 	// relation of variables and it's offset.
 	r *references
-	// global variables defined not in script.
-	ctx Context
 	// way to get function id.
 	f FunctionChecker
 }
@@ -56,10 +57,10 @@ func constant(a Fsm, params params, rideType rideType) Fsm {
 func reference(f Fsm, params params, name string) Fsm {
 	pos, ok := params.r.get(name)
 	if !ok {
-		index := params.c.put(rideString(name))
-		params.b.fillContext(index)
-		//panic(fmt.Sprintf("reference %s not found", name))
-		return f
+		//index := params.c.put(rideString(name))
+		//params.b.fillContext(index)
+		panic(fmt.Sprintf("reference %s not found", name))
+		//return f
 	}
 	params.b.jump(pos)
 	return f

pkg/ride/compiler_fsm_assigment.go

@@ -8,6 +8,10 @@ type AssigmentFsm struct {
 	offset uint16
 }
 
+func (a AssigmentFsm) FuncDeclaration(name string, args []string) Fsm {
+	return funcDeclarationFsmTransition(a, a.params, name, args)
+}
+
 func (a AssigmentFsm) Bytes(b []byte) Fsm {
 	return constant(a, a.params, rideBytes(b))
 }
@@ -43,16 +47,18 @@ func newAssigmentFsm(prev Fsm, p params, name string) Fsm {
 			b: p.b,
 			c: p.c,
 			f: p.f,
-			// Create new scope, so assigment in assigment can't affect global state.
-			r: newReferences(p.r),
+			r: p.r,
 		},
 		name:   name,
 		offset: p.b.len(),
 	}
 }
 
+// Create new scope, so assigment in assigment can't affect global state.
 func (a AssigmentFsm) Assigment(name string) Fsm {
-	return assigmentFsmTransition(a, a.params, name)
+	params := a.params
+	params.r = newReferences(params.r)
+	return assigmentFsmTransition(a, params, name)
 }
 
 func (a AssigmentFsm) Return() Fsm {

pkg/ride/compiler_fsm_call.go

@@ -10,6 +10,10 @@ type CallFsm struct {
 	argc uint16
 }
 
+func (a CallFsm) FuncDeclaration(name string, args []string) Fsm {
+	return funcDeclarationFsmTransition(a, a.params, name, args)
+}
+
 func (a CallFsm) Bytes(b []byte) Fsm {
 	return constant(a, a.params, rideBytes(b))
 }
@@ -56,9 +60,16 @@ func (a CallFsm) Long(value int64) Fsm {
 }
 
 func (a CallFsm) Return() Fsm {
-	n, ok := a.f(a.name)
+	// check user functions
+	n, ok := a.r.get(a.name)
+	if ok {
+		a.b.call(n, a.argc)
+		return a.prev
+	}
+
+	n, ok = a.f(a.name)
 	if !ok {
-		panic(fmt.Sprintf("function names %s not found", a.name))
+		panic(fmt.Sprintf("function named %s not found", a.name))
 	}
 	a.b.externalCall(n, a.argc)
 	return a.prev

pkg/ride/compiler_fsm_conditional.go

@@ -7,6 +7,10 @@ type ConditionalFsm struct {
 	patchPosition uint16
 }
 
+func (a ConditionalFsm) FuncDeclaration(name string, args []string) Fsm {
+	panic("Illegal call FuncDeclaration on ConditionalFsm")
+}
+
 func (a ConditionalFsm) Bytes(b []byte) Fsm {
 	return constant(a, a.params, rideBytes(b))
 }

pkg/ride/compiler_fsm_definitions.go

@@ -6,6 +6,10 @@ type DefinitionFsm struct {
 	params
 }
 
+func (a DefinitionFsm) FuncDeclaration(name string, args []string) Fsm {
+	return funcDeclarationFsmTransition(a, a.params, name, args)
+}
+
 func (a DefinitionFsm) Bytes(b []byte) Fsm {
 	panic("Illegal call `Bytes` on `DefinitionFsm`")
 }

pkg/ride/compiler_fsm_func_declaration.go

@@ -0,0 +1,83 @@
+package ride
+
+type FuncDeclarationFsm struct {
+	params
+	prev        Fsm
+	name        string
+	args        []string
+	offset      uint16
+	globalScope *references
+}
+
+func funcDeclarationFsmTransition(prev Fsm, params params, name string, args []string) Fsm {
+	// save reference to global scope, where code lower that function will be able to use it.
+	globalScope := params.r
+	// all variable we add only visible to current scope,
+	// avoid corrupting parent state.
+	params.r = newReferences(params.r)
+	for i := range args {
+		params.r.set(args[i], params.b.len())
+		params.b.w.WriteByte(OpPushFromFrame)
+		params.b.w.Write(encode(uint16(i)))
+		params.b.ret()
+	}
+
+	return &FuncDeclarationFsm{
+		prev:        prev,
+		name:        name,
+		args:        args,
+		params:      params,
+		offset:      params.b.len(),
+		globalScope: globalScope,
+	}
+}
+
+func (a FuncDeclarationFsm) Assigment(name string) Fsm {
+	return assigmentFsmTransition(a, a.params, name)
+}
+
+func (a FuncDeclarationFsm) Return() Fsm {
+	a.globalScope.set(a.name, a.offset)
+	a.b.ret()
+	return a.prev
+}
+
+func (a FuncDeclarationFsm) Long(value int64) Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) Call(name string, argc uint16) Fsm {
+	return callTransition(a, a.params, name, argc)
+}
+
+func (a FuncDeclarationFsm) Reference(name string) Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) Boolean(v bool) Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) String(s string) Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) Condition() Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) TrueBranch() Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) FalseBranch() Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) Bytes(b []byte) Fsm {
+	panic("implement me")
+}
+
+func (a FuncDeclarationFsm) FuncDeclaration(name string, args []string) Fsm {
+	panic("Illegal call `FuncDeclaration` is `FuncDeclarationFsm`")
+}

pkg/ride/compiler_helpers.go

@@ -66,6 +66,13 @@ func (b *builder) externalCall(id uint16, argc uint16) {
 	b.w.Write(encode(argc))
 }
 
+// Call user defined function.
+func (b *builder) call(id uint16, argc uint16) {
+	b.w.WriteByte(OpCall)
+	b.w.Write(encode(id))
+	b.w.Write(encode(argc))
+}
+
 func (b *builder) startPos() {
 	b.startAt = uint16(b.w.Len())
 }
@@ -78,10 +85,10 @@ func (b *builder) jpmIfFalse() {
 	b.w.WriteByte(OpJumpIfFalse)
 }
 
-func (b *builder) fillContext(id constid) {
-	b.w.WriteByte(OpFillContext)
-	b.w.Write(encode(id))
-}
+//func (b *builder) fillContext(id constid) {
+//	b.w.WriteByte(OpFillContext)
+//	b.w.Write(encode(id))
+//}
 
 type constants struct {
 	values []rideType

pkg/ride/executable.go

@@ -13,16 +13,23 @@ func (a *Executable) Run(environment RideEnvironment) (RideResult, error) {
 		return nil, err
 	}
 
-	ctx := newContext()
-	ctx = ctx.add("tx", environment.transaction())
+	provider, err := selectFunctionNameProvider(a.LibVersion)
+	if err != nil {
+		return nil, err
+	}
+	//ctx := newContext()
+	//ctx = ctx.add("tx", environment.transaction())
 
 	v := vm{
 		code:      a.ByteCode,
 		ip:        int(a.EntryPoints[""]),
 		constants: a.Constants,
 		functions: fSelect,
-		context:   ctx,
+		//context:   ctx,
+		functionName: provider,
 	}
 
+	//v.push(environment.transaction())
+
 	return v.run()
 }

pkg/ride/opcodes.go

@@ -4,20 +4,21 @@ package ride
 // Parameter is 2 bytes length
 
 const (
-	OpHalt         byte = iota //00 - Halts program execution. No parameters.
-	OpReturn                   //01 - Returns from declaration to stored position. No parameters.
-	OpPush                     //02 - Put constant on stack. One parameter: constant ID.
-	OpPop                      //03 - Removes value from stack. No parameters.
-	OpTrue                     //04 - Put True value on stack. No parameters.
-	OpFalse                    //05 - Put False value on stack. No parameters.
-	OpJump                     //06 - Moves instruction pointer to new position. One parameter: new position.
-	OpJumpIfFalse              //07 - Moves instruction pointer to new position if value on stack is False. One parameter: new position.
-	OpProperty                 //08 - Puts value of object's property on stack. One parameter: constant ID that holds name of the property.
-	OpExternalCall             //09 - Call a standard library function. Two parameters: function ID, number of arguments.
-	OpCall                     //10 - Call a function declared at given address. Two parameters: position of function declaration, number of arguments.
-	OpGlobal                   //11 - Load global constant. One parameter: global constant ID.
-	OpLoad                     //12 - Evaluates an expression that declared at address. One parameter: position of declaration.
-	OpLoadLocal                //13 - Load an argument of function call on stack. One parameter: argument number.
-	OpRef                      //14 - Put reference to expression/function on stack. One parameter: position of declaration.
-	OpFillContext              //15 - Put reference to expression/function on stack. One parameter: position of declaration.
+	OpHalt          byte = iota //00 - Halts program execution. No parameters.
+	OpReturn                    //01 - Returns from declaration to stored position. No parameters.
+	OpPush                      //02 - Put constant on stack. One parameter: constant ID.
+	OpPop                       //03 - Removes value from stack. No parameters.
+	OpTrue                      //04 - Put True value on stack. No parameters.
+	OpFalse                     //05 - Put False value on stack. No parameters.
+	OpJump                      //06 - Moves instruction pointer to new position. One parameter: new position.
+	OpJumpIfFalse               //07 - Moves instruction pointer to new position if value on stack is False. One parameter: new position.
+	OpProperty                  //08 - Puts value of object's property on stack. One parameter: constant ID that holds name of the property.
+	OpExternalCall              //09 - Call a standard library function. Two parameters: function ID, number of arguments.
+	OpCall                      //10 - Call a function declared at given address. Two parameters: position of function declaration, number of arguments.
+	OpGlobal                    //11 - Load global constant. One parameter: global constant ID.
+	OpLoad                      //12 - Evaluates an expression that declared at address. One parameter: position of declaration.
+	OpLoadLocal                 //13 - Load an argument of function call on stack. One parameter: argument number.
+	OpRef                       //14 - Put reference to expression/function on stack. One parameter: position of declaration.
+	OpFillContext               //15 - Put reference to expression/function on stack. One parameter: position of declaration.
+	OpPushFromFrame             //16
 )