[spv-in] move all the image-related logic into a sub-module

faro-oss · Feb 8, 2021 · cf0a86a · cf0a86a
1 parent 6b9d3ea
commit cf0a86a
Show file tree

Hide file tree

Showing 3 changed files with 549 additions and 504 deletions.
diff --git a/src/front/spv/function.rs b/src/front/spv/function.rs
@@ -1,7 +1,6 @@
-use crate::arena::Handle;
+use crate::arena::{Arena, Handle};
 
-use super::flow::*;
-use super::*;
+use super::{flow::*, Error, Instruction, LookupExpression, LookupHelper as _};
 
 pub type BlockId = u32;
 
@@ -50,13 +49,7 @@ pub enum Terminator {
 }
 
 impl<I: Iterator<Item = u32>> super::Parser<I> {
-    pub fn parse_function(
-        &mut self,
-        inst: Instruction,
-        module: &mut crate::Module,
-    ) -> Result<(), Error> {
-        self.switch(ModuleState::Function, inst.op)?;
-        inst.expect(5)?;
+    pub fn parse_function(&mut self, module: &mut crate::Module) -> Result<(), Error> {
         let result_type_id = self.next()?;
         let fun_id = self.next()?;
         let _fun_control = self.next()?;