compile: implement Bytes

ncw · ncw · commit 9b2aead7ffd3 · 2015-03-25T21:16:11.000Z
diff --git a/compile/compile.go b/compile/compile.go
@@ -497,7 +497,7 @@ func (c *compiler) Expr(expr ast.Expr) {
 		c.OpArg(vm.LOAD_CONST, c.Const(node.S))
 	case *ast.Bytes:
 		// S py.Bytes
-		panic("FIXME compile: Bytes not implemented")
+		c.OpArg(vm.LOAD_CONST, c.Const(node.S))
 	case *ast.NameConstant:
 		// Value Singleton
 		panic("FIXME compile: NameConstant not implemented")
diff --git a/compile/compile_data_test.go b/compile/compile_data_test.go
@@ -63,6 +63,23 @@ var compileTestData = []struct {
 		Firstlineno:    1,
 		Lnotab:         "",
 	}, "  1           0 LOAD_NAME                0 (a)\n              3 RETURN_VALUE\n"},
+	{"b\"hello\"", "eval", py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x64\x00\x00\x53",
+		Consts:         []py.Object{py.Bytes("hello")},
+		Names:          []string{},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_CONST               0 (b'hello')\n              3 RETURN_VALUE\n"},
 	{"\"a\"+1", "eval", py.Code{
 		Argcount:       0,
 		Kwonlyargcount: 0,
diff --git a/compile/make_compile_test.py b/compile/make_compile_test.py
@@ -9,9 +9,11 @@
 import dis
 
 inp = [
+    # Constants
     ('''1''', "eval"),
     ('''"hello"''', "eval"),
     ('''a''', "eval"),
+    ('''b"hello"''', "eval"),
     # BinOps - strange operations to defeat constant optimizer!
     ('''"a"+1''', "eval"),
     ('''"a"-1''', "eval"),
@@ -84,6 +86,8 @@ def const(x):
         return 'py.Int(%d)' % x
     elif isinstance(x, float):
         return 'py.Float(%g)' % x
+    elif isinstance(x, bytes):
+        return 'py.Bytes("%s")' % x.decode("latin1")
     elif x is None:
         return 'py.None'
     else:
