compiler: del and raise

Author: ncw

compile/compile.go

@@ -247,7 +247,9 @@ func (c *compiler) Stmt(stmt ast.Stmt) {
 		panic("FIXME compile: Return not implemented")
 	case *ast.Delete:
 		// Targets []Expr
-		panic("FIXME compile: Delete not implemented")
+		for _, target := range node.Targets {
+			c.Expr(target)
+		}
 	case *ast.Assign:
 		// Targets []Expr
 		// Value   Expr
@@ -325,7 +327,16 @@ func (c *compiler) Stmt(stmt ast.Stmt) {
 	case *ast.Raise:
 		// Exc   Expr
 		// Cause Expr
-		panic("FIXME compile: Raise not implemented")
+		args := uint32(0)
+		if node.Exc != nil {
+			args++
+			c.Expr(node.Exc)
+			if node.Cause != nil {
+				args++
+				c.Expr(node.Cause)
+			}
+		}
+		c.OpArg(vm.RAISE_VARARGS, args)
 	case *ast.Try:
 		// Body      []Stmt
 		// Handlers  []*ExceptHandler
@@ -619,7 +630,8 @@ func (c *compiler) Expr(expr ast.Expr) {
 			c.OpArg(vm.LOAD_NAME, c.Name(node.Id))
 		case ast.Store:
 			c.OpArg(vm.STORE_NAME, c.Name(node.Id))
-		// case ast.Del:
+		case ast.Del:
+			c.OpArg(vm.DELETE_NAME, c.Name(node.Id))
 		// case ast.AugLoad:
 		// case ast.AugStore:
 		// case ast.Param:

compile/compile_data_test.go

@@ -1149,7 +1149,7 @@ var compileTestData = []struct {
 		Name:        "<module>",
 		Firstlineno: 1,
 		Lnotab:      "",
-	}, "  1           0 LOAD_CONST               0 (<code object <lambda> at 0x7fa8931d3e40, file \"<string>\", line 1>)\n              3 LOAD_CONST               1 ('<lambda>')\n              6 MAKE_FUNCTION            0\n              9 RETURN_VALUE\n"},
+	}, "  1           0 LOAD_CONST               0 (<code object <lambda> at 0x7fd0bed8ee40, file \"<string>\", line 1>)\n              3 LOAD_CONST               1 ('<lambda>')\n              6 MAKE_FUNCTION            0\n              9 RETURN_VALUE\n"},
 	{"pass", "exec", &py.Code{
 		Argcount:       0,
 		Kwonlyargcount: 0,
@@ -1490,4 +1490,89 @@ var compileTestData = []struct {
 		Firstlineno:    1,
 		Lnotab:         "",
 	}, "  1           0 LOAD_NAME                0 (a)\n              3 LOAD_CONST               0 (1)\n              6 INPLACE_FLOOR_DIVIDE\n              7 STORE_NAME               0 (a)\n             10 LOAD_CONST               1 (None)\n             13 RETURN_VALUE\n"},
+	{"del a", "exec", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x5b\x00\x00\x64\x00\x00\x53",
+		Consts:         []py.Object{py.None},
+		Names:          []string{"a"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 DELETE_NAME              0 (a)\n              3 LOAD_CONST               0 (None)\n              6 RETURN_VALUE\n"},
+	{"del a, b", "exec", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x5b\x00\x00\x5b\x01\x00\x64\x00\x00\x53",
+		Consts:         []py.Object{py.None},
+		Names:          []string{"a", "b"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 DELETE_NAME              0 (a)\n              3 DELETE_NAME              1 (b)\n              6 LOAD_CONST               0 (None)\n              9 RETURN_VALUE\n"},
+	{"raise", "exec", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x82\x00\x00\x64\x00\x00\x53",
+		Consts:         []py.Object{py.None},
+		Names:          []string{},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 RAISE_VARARGS            0\n              3 LOAD_CONST               0 (None)\n              6 RETURN_VALUE\n"},
+	{"raise a", "exec", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x82\x01\x00\x64\x00\x00\x53",
+		Consts:         []py.Object{py.None},
+		Names:          []string{"a"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (a)\n              3 RAISE_VARARGS            1\n              6 LOAD_CONST               0 (None)\n              9 RETURN_VALUE\n"},
+	{"raise a from b", "exec", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      2,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x82\x02\x00\x64\x00\x00\x53",
+		Consts:         []py.Object{py.None},
+		Names:          []string{"a", "b"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (a)\n              3 LOAD_NAME                1 (b)\n              6 RAISE_VARARGS            2\n              9 LOAD_CONST               0 (None)\n             12 RETURN_VALUE\n"},
 }

compile/make_compile_test.py

@@ -122,6 +122,16 @@
     ('''a&=1''', "exec"),
     ('''a//=1''', "exec"),
     # FIXME ('''a[1]+=1''', "exec"),
+    # delete
+    ('''del a''', "exec"),
+    ('''del a, b''', "exec"),
+    # FIXME ('''del a[1]''', "exec"),
+    # raise
+    ('''raise''', "exec"),
+    ('''raise a''', "exec"),
+    ('''raise a from b''', "exec"),
+    
+
 ]
 
 def string(s):