Merge remote-tracking branch 'origin/master' into oflo

2016-06-20 12:33:09 +02:00
parent e90ee1674a c9d808e85f
commit a1082b9b1a
22 changed files with 229 additions and 228 deletions
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -32,10 +32,11 @@ pub use error::{
 };

 pub use interpreter::{
-    EvalContext,
-    step,
-    Frame,
    CachedMir,
+    EvalContext,
+    Frame,
+    eval_main,
+    step,
 };

 pub use memory::Memory;