Merge pull request RustPython#1324 from RustPython/subscript-bytecode

Make subscript its own bytecode.

Author: windelbouwman

bytecode/src/bytecode.rs

@@ -115,6 +115,7 @@ pub enum Instruction {
     DeleteName {
         name: String,
     },
+    Subscript,
     StoreSubscript,
     DeleteSubscript,
     StoreAttr {
@@ -145,7 +146,6 @@ pub enum Instruction {
     },
     Duplicate,
     GetIter,
-    Pass,
     Continue,
     Break,
     Jump {
@@ -316,7 +316,6 @@ pub enum BinaryOperator {
     Modulo,
     Add,
     Subtract,
-    Subscript,
     Lshift,
     Rshift,
     And,
@@ -467,6 +466,7 @@ impl Instruction {
             LoadName { name, scope } => w!(LoadName, name, format!("{:?}", scope)),
             StoreName { name, scope } => w!(StoreName, name, format!("{:?}", scope)),
             DeleteName { name } => w!(DeleteName, name),
+            Subscript => w!(Subscript),
             StoreSubscript => w!(StoreSubscript),
             DeleteSubscript => w!(DeleteSubscript),
             StoreAttr { name } => w!(StoreAttr, name),
@@ -487,7 +487,6 @@ impl Instruction {
             Rotate { amount } => w!(Rotate, amount),
             Duplicate => w!(Duplicate),
             GetIter => w!(GetIter),
-            Pass => w!(Pass),
             Continue => w!(Continue),
             Break => w!(Break),
             Jump { target } => w!(Jump, label_map[target]),

compiler/src/compile.rs

@@ -584,7 +584,7 @@ impl<O: OutputStream> Compiler<O> {
                 }
             }
             Pass => {
-                self.emit(Instruction::Pass);
+                // No need to emit any code here :)
             }
         }
         Ok(())
@@ -1443,10 +1443,7 @@ impl<O: OutputStream> Compiler<O> {
             Subscript { a, b } => {
                 self.compile_expression(a)?;
                 self.compile_expression(b)?;
-                self.emit(Instruction::BinaryOperation {
-                    op: bytecode::BinaryOperator::Subscript,
-                    inplace: false,
-                });
+                self.emit(Instruction::Subscript);
             }
             Unop { op, a } => {
                 self.compile_expression(a)?;
@@ -2129,7 +2126,6 @@ mod tests {
                 JumpIfFalse {
                     target: Label::new(0)
                 },
-                Pass,
                 LoadConst { value: None },
                 ReturnValue
             ],
@@ -2160,7 +2156,6 @@ mod tests {
                 JumpIfFalse {
                     target: Label::new(0)
                 },
-                Pass,
                 LoadConst { value: None },
                 ReturnValue
             ],
@@ -2197,7 +2192,6 @@ mod tests {
                 JumpIfFalse {
                     target: Label::new(0)
                 },
-                Pass,
                 LoadConst { value: None },
                 ReturnValue
             ],