compiler: Unary Ops

ncw · ncw · commit d84b59956ddb · 2015-03-23T22:16:57.000Z
diff --git a/compile/compile.go b/compile/compile.go
@@ -306,7 +306,21 @@ func (c *compiler) compileExpr(expr ast.Expr) {
 	case *ast.UnaryOp:
 		// Op      UnaryOpNumber
 		// Operand Expr
-		panic("FIXME not implemented")
+		c.compileExpr(node.Operand)
+		var op byte
+		switch node.Op {
+		case ast.Invert:
+			op = vm.UNARY_INVERT
+		case ast.Not:
+			op = vm.UNARY_NOT
+		case ast.UAdd:
+			op = vm.UNARY_POSITIVE
+		case ast.USub:
+			op = vm.UNARY_NEGATIVE
+		default:
+			panic("Unknown UnaryOp")
+		}
+		c.Op(op)
 	case *ast.Lambda:
 		// Args *Arguments
 		// Body Expr
diff --git a/compile/compile_data_test.go b/compile/compile_data_test.go
@@ -250,4 +250,72 @@ var compileTestData = []struct {
 		Firstlineno:    1,
 		Lnotab:         "",
 	}, "  1           0 LOAD_CONST               0 ('a')\n              3 LOAD_CONST               1 (1)\n              6 BINARY_FLOOR_DIVIDE\n              7 RETURN_VALUE\n"},
+	{"~ \"a\"", "eval", py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x64\x00\x00\x0f\x53",
+		Consts:         []py.Object{py.String("a")},
+		Names:          []string{},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_CONST               0 ('a')\n              3 UNARY_INVERT\n              4 RETURN_VALUE\n"},
+	{"not \"a\"", "eval", py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x64\x00\x00\x0c\x53",
+		Consts:         []py.Object{py.String("a")},
+		Names:          []string{},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_CONST               0 ('a')\n              3 UNARY_NOT\n              4 RETURN_VALUE\n"},
+	{"+\"a\"", "eval", py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x64\x00\x00\x0a\x53",
+		Consts:         []py.Object{py.String("a")},
+		Names:          []string{},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_CONST               0 ('a')\n              3 UNARY_POSITIVE\n              4 RETURN_VALUE\n"},
+	{"-\"a\"", "eval", py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x64\x00\x00\x0b\x53",
+		Consts:         []py.Object{py.String("a")},
+		Names:          []string{},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_CONST               0 ('a')\n              3 UNARY_NEGATIVE\n              4 RETURN_VALUE\n"},
 }
diff --git a/compile/make_compile_test.py b/compile/make_compile_test.py
@@ -24,6 +24,11 @@
     ('''"a"^1''', "eval"),
     ('''"a"&1''', "eval"),
     ('''"a"//1''', "eval"),
+    # UnaryOps
+    ('''~ "a"''', "eval"),
+    ('''not "a"''', "eval"),
+    ('''+"a"''', "eval"),
+    ('''-"a"''', "eval"),
 ]
 
 def string(s):
