Restructure to library / binary combo

src/bin/ijvm.rs

@@ -1,7 +1,6 @@
-mod ijvm;
+extern crate rustijvm;
 
-
+use rustijvm::machine::Machine;
-use ijvm::machine::Machine;
 use std::env;
 
 

src/binread.rs

@@ -1,6 +1,6 @@
-use ijvm::Result;
+use Result;
-use ijvm::block::Block;
+use block::Block;
-use ijvm::ops::{Operation,num_to_op};
+use ops::{Operation,num_to_op};
 
 pub trait BinReadable {
     fn get(&mut self) -> Result<u8>;

src/block.rs

@@ -1,5 +1,5 @@
-use ijvm::Result;
+use Result;
-use ijvm::binread::BinReadable;
+use binread::BinReadable;
 
 #[derive(Debug)]
 pub struct Block {

src/frame.rs

@@ -1,5 +1,5 @@
-use ijvm::Result;
+use Result;
-use ijvm::stack::Stack;
+use stack::Stack;
 
 #[derive(Debug)]
 pub struct Frame {

src/ijvmreader.rs

@@ -1,7 +1,7 @@
 use std::io::Read;
 use std::fs::File;
-use ijvm::Result;
+use Result;
-use ijvm::binread::BinReadable;
+use binread::BinReadable;
 
 pub struct IJVMReader {
     pointer: usize,
@@ -32,14 +32,14 @@ impl BinReadable for IJVMReader {
         Ok(byte)
     }
 
-    fn len(&self) -> usize {
-        self.source.len()
-    }
-
     fn cur(&self) -> usize {
         self.pointer
     }
 
+    fn len(&self) -> usize {
+        self.source.len()
+    }
+
     fn slice(&mut self, len: usize) -> &[u8] {
         let slice = &self.source[self.pointer..self.pointer+len];
         self.pointer += len;

src/machine.rs

@@ -1,14 +1,13 @@
-use ijvm::block::Block;
+use block::Block;
 
-use ijvm::ops::Operation;
+use ops::Operation;
-use ijvm::ijvmreader::IJVMReader;
+use ijvmreader::IJVMReader;
-use ijvm::binread::BinReadable;
+use binread::{BinRead, BinReadable};
-use ijvm::binread::BinRead;
+use frame::Frame;
-use ijvm::frame::Frame;
+use stack::Stack;
-use ijvm::stack::Stack;
+use pool::Pool;
-use ijvm::pool::Pool;
+use netstack::NetStack;
-use ijvm::netstack::NetStack;
+use Result;
-use ijvm::Result;
 
 const MAGIC_HEADER:u32 = 0x1DEA_DFAD;
 const ANTI_BS_SIZE:usize = 0xFFFF;

src/netstack.rs

@@ -1,7 +1,7 @@
 use std::net::TcpStream;
 
 #[cfg(feature = "bonus:network")]
-use ijvm::Result;
+use Result;
 #[cfg(feature = "bonus:network")]
 use std::io::{Read, Write};
 #[cfg(feature = "bonus:network")]

src/ops.rs

@@ -1,7 +1,7 @@
-use ijvm::binread::BinRead;
+use binread::BinRead;
-use ijvm::machine::Machine;
+use machine::Machine;
-use ijvm::frame::Frame;
+use frame::Frame;
-use ijvm::Result;
+use Result;
 use std::io::Write;
 use std::io::Read;
 

src/pool.rs

@@ -1,6 +1,6 @@
-use ijvm::Result;
+use Result;
-use ijvm::block::Block;
+use block::Block;
-use ijvm::binread::{BinRead, BinReadable};
+use binread::{BinRead, BinReadable};
 
 #[derive(Debug)]
 pub struct Pool {

src/stack.rs

@@ -1,4 +1,4 @@
-use ijvm::Result;
+use Result;
 
 #[derive(Debug)]
 pub struct Stack {