Merge pull request #2 from notmgsk/classical-instructions

Support classical instructions

Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 structopt = "0.3.13"
-quil = { git = "ssh://git@github.com/rigetti/quil-rust.git", branch = "semicolon" }
+quil = { git = "https://github.com/rigetti/quil-rust.git", tag = "v0.2.1" }
 num = "0.4.0"
 ndarray = "0.15.3"
 num-complex = "0.4.0"
@@ -18,9 +18,8 @@ num-traits = "0.2.14"
 itertools = "0.10.1"
 log = "*"
 env_logger = "*"
+thiserror = "1.0.24"
+anyhow = "1.0.39"
 
 [dev-dependencies]
 pretty_assertions = "0.7.2"
-
-#[patch."ssh://[email protected]/rigetti/quil-rust.git"]
-#quil = { path = "../../rigetti/quil-rust" }

src/main.rs

@@ -1,28 +1,39 @@
 use itertools::Itertools;
-use quil::{
-    instruction::{Instruction, Qubit},
-    program::Program,
-};
 use std::{
     collections::HashSet,
     fs,
     io::{self, Read},
     str::FromStr,
 };
 use structopt::StructOpt;
+
+use anyhow::Result;
+use thiserror::Error;
+
+use quil::{
+    instruction::{Instruction, Qubit},
+    program::Program,
+};
+
 use vm::VM;
 
 pub mod gates;
 pub mod matrix;
 pub mod vm;
 pub mod wavefunction;
 
+#[derive(Error, Debug)]
+pub enum SimquilError {
+    #[error("failed to execute program")]
+    ExecutionError(#[from] vm::VMError),
+}
+
 #[derive(StructOpt)]
 struct Cli {
     quil_file: Option<String>,
 }
 
-fn run(cli: Cli) {
+fn run(cli: Cli) -> Result<()> {
     let quil = match cli.quil_file {
         Some(path) => fs::read_to_string(path).expect("bad read"),
         None => {
@@ -38,7 +49,7 @@ fn run(cli: Cli) {
 
     let mut vm = VM::new(max_qubits_needed, program);
 
-    vm.run();
+    vm.run().map_err(SimquilError::ExecutionError)?;
     println!("Wavefunction amplitudes:");
     println!();
     println!("{:?}", vm);
@@ -49,10 +60,13 @@ fn run(cli: Cli) {
         .iter()
         .sorted_by_key(|x| x.0)
         .for_each(|(mref, data)| println!("{}[0..{}]:\t {:?}", mref, data.len(), data));
+
+    Ok(())
 }
 
-fn main() {
+fn main() -> Result<()> {
     env_logger::init();
+
     run(Cli::from_args())
 }