Fix panic on import statement with levels but no module name.

windelbouwman · windelbouwman · commit ce1523c1428a · 2019-07-19T17:31:57.000+02:00
diff --git a/bytecode/src/bytecode.rs b/bytecode/src/bytecode.rs
@@ -80,12 +80,12 @@ pub enum ConversionFlag {
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum Instruction {
     Import {
-        name: String,
+        name: Option<String>,
         symbols: Vec<String>,
         level: usize,
     },
     ImportStar {
-        name: String,
+        name: Option<String>,
         level: usize,
     },
     ImportFrom {
@@ -380,8 +380,13 @@ impl Instruction {
                 name,
                 symbols,
                 level,
-            } => w!(Import, name, format!("{:?}", symbols), level),
-            ImportStar { name, level } => w!(ImportStar, name, level),
+            } => w!(
+                Import,
+                format!("{:?}", name),
+                format!("{:?}", symbols),
+                level
+            ),
+            ImportStar { name, level } => w!(ImportStar, format!("{:?}", name), level),
             ImportFrom { name } => w!(ImportFrom, name),
             LoadName { name, scope } => w!(LoadName, name, format!("{:?}", scope)),
             StoreName { name, scope } => w!(StoreName, name, format!("{:?}", scope)),
diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs
@@ -271,7 +271,7 @@ impl Compiler {
                 // import a, b, c as d
                 for name in names {
                     self.emit(Instruction::Import {
-                        name: name.symbol.clone(),
+                        name: Some(name.symbol.clone()),
                         symbols: vec![],
                         level: 0,
                     });
@@ -293,7 +293,7 @@ impl Compiler {
                 if import_star {
                     // from .... import *
                     self.emit(Instruction::ImportStar {
-                        name: module.clone().unwrap(),
+                        name: module.clone(),
                         level: *level,
                     });
                 } else {
@@ -303,7 +303,7 @@ impl Compiler {
 
                     // Load module once:
                     self.emit(Instruction::Import {
-                        name: module.clone().unwrap(),
+                        name: module.clone(),
                         symbols: from_list,
                         level: *level,
                     });
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -923,15 +923,16 @@ impl Frame {
     fn import(
         &self,
         vm: &VirtualMachine,
-        module: &str,
+        module: &Option<String>,
         symbols: &[String],
         level: usize,
     ) -> FrameResult {
+        let module = module.clone().unwrap_or_default();
         let from_list = symbols
             .iter()
             .map(|symbol| vm.ctx.new_str(symbol.to_string()))
             .collect();
-        let module = vm.import(module, &vm.ctx.new_tuple(from_list), level)?;
+        let module = vm.import(&module, &vm.ctx.new_tuple(from_list), level)?;
 
         self.push_value(module);
         Ok(None)
@@ -949,8 +950,14 @@ impl Frame {
     }
 
     #[cfg_attr(feature = "flame-it", flame("Frame"))]
-    fn import_star(&self, vm: &VirtualMachine, module: &str, level: usize) -> FrameResult {
-        let module = vm.import(module, &vm.ctx.new_tuple(vec![]), level)?;
+    fn import_star(
+        &self,
+        vm: &VirtualMachine,
+        module: &Option<String>,
+        level: usize,
+    ) -> FrameResult {
+        let module = module.clone().unwrap_or_default();
+        let module = vm.import(&module, &vm.ctx.new_tuple(vec![]), level)?;
 
         // Grab all the names from the module and put them in the context
         if let Some(dict) = &module.dict {
