feat: Add some operators and change assignment expr into assignment s…

…tmt (#38)
GuanceCloud · Jul 24, 2023 · c610f88 · c610f88
1 parent ad13550
commit c610f88
Show file tree

Hide file tree

Showing 13 changed files with 1,672 additions and 815 deletions.
diff --git a/pkg/ast/ast.go b/pkg/ast/ast.go
@@ -36,6 +36,7 @@ const (
 	TypeAttrExpr
 	TypeIndexExpr
 
+	TypeUnaryExpr
 	TypeArithmeticExpr
 	TypeConditionalExpr
 	TypeAssignmentExpr
@@ -79,6 +80,8 @@ func (t NodeType) String() string {
 		return "AttrExpr"
 	case TypeIndexExpr:
 		return "IndexExpr"
+	case TypeUnaryExpr:
+		return "UnaryExpr"
 	case TypeArithmeticExpr:
 		return "ArithmeticExpr"
 	case TypeConditionalExpr:
@@ -153,6 +156,7 @@ type Node struct {
 	IndexExpr *IndexExpr
 	InExpr    *InExpr
 
+	UnaryExpr       *UnaryExpr
 	ArithmeticExpr  *ArithmeticExpr
 	ConditionalExpr *ConditionalExpr
 	AssignmentExpr  *AssignmentExpr
@@ -193,6 +197,8 @@ func (node *Node) String() string {
 		return node.AttrExpr.String()
 	case TypeIndexExpr:
 		return node.IndexExpr.String()
+	case TypeUnaryExpr:
+		return node.UnaryExpr.String()
 	case TypeArithmeticExpr:
 		return node.ArithmeticExpr.String()
 	case TypeConditionalExpr:
@@ -315,7 +321,14 @@ func WrapInExpr(node *InExpr) *Node {
 	}
 }
 
-func WrapAssignmentExpr(node *AssignmentExpr) *Node {
+func WrapUnaryExpr(node *UnaryExpr) *Node {
+	return &Node{
+		NodeType:  TypeUnaryExpr,
+		UnaryExpr: node,
+	}
+}
+
+func WrapAssignmentStmt(node *AssignmentExpr) *Node {
 	return &Node{
 		NodeType:       TypeAssignmentExpr,
 		AssignmentExpr: node,
@@ -409,6 +422,8 @@ func NodeStartPos(node *Node) token.LnColPos {
 	case TypeIndexExpr:
 		return node.IndexExpr.Obj.Start
 
+	case TypeUnaryExpr:
+		return node.UnaryExpr.OpPos
 	case TypeArithmeticExpr:
 		return node.ArithmeticExpr.LHS.StartPos()
 	case TypeConditionalExpr:

diff --git a/pkg/ast/expr.go b/pkg/ast/expr.go
@@ -35,8 +35,14 @@ const (
 
 	AND Op = "&&"
 	OR  Op = "||"
-
-	EQ Op = "="
+	NOT Op = "!"
+
+	EQ    Op = "="
+	ADDEQ Op = "+="
+	SUBEQ Op = "-="
+	MULEQ Op = "*="
+	DIVEQ Op = "/="
+	MODEQ Op = "%="
 )
 
 type Identifier struct {
@@ -160,6 +166,20 @@ func (e *ListInitExpr) String() string {
 	return "[" + strings.Join(arr, ", ") + "]"
 }
 
+type UnaryExpr struct {
+	Op    Op
+	RHS   *Node
+	OpPos token.LnColPos
+}
+
+func (e *UnaryExpr) IsExpr() bool {
+	return true
+}
+
+func (e *UnaryExpr) String() string {
+	return fmt.Sprintf("%s%s", e.Op, e.RHS.String())
+}
+
 type ConditionalExpr struct {
 	Op       Op
 	LHS, RHS *Node
@@ -296,6 +316,7 @@ func (e *CallExpr) String() string {
 
 type AssignmentExpr struct {
 	LHS, RHS *Node
+	Op       Op
 	OpPos    token.LnColPos
 }
 
@@ -304,5 +325,5 @@ func (e *AssignmentExpr) IsExpr() bool {
 }
 
 func (e *AssignmentExpr) String() string {
-	return fmt.Sprintf("%s = %s", e.LHS, e.RHS)
+	return fmt.Sprintf("%s %s %s", e.LHS, e.Op, e.RHS)
 }
diff --git a/pkg/engine/op_test.go b/pkg/engine/op_test.go
@@ -29,9 +29,12 @@ func TestOp(t *testing.T) {
 
 	f = map_a["a"]
 
-	aaaa = 1.0 == (b = 1)
+	b = 1
 
-	a = v = a
+	aaaa = 1.0 == (b )
+
+	v = a
+	a = v
 	x7 = [1, 2.1, "3"]
 	if b == 2 {
 		x = 2

diff --git a/pkg/engine/runtime/context.go b/pkg/engine/runtime/context.go
@@ -186,7 +186,6 @@ func (ctx *Context) GetKey(key string) (*Varb, error) {
 	case InRMap:
 		if v, t, err := ctx.inRMap.Get(key); err == nil {
 			return &Varb{
-				Name:  key,
 				Value: v,
 				DType: t,
 			}, nil