Merge branch 'develop'

Author: perak

lib/quantum-circuit.js

@@ -9319,20 +9319,12 @@ QuantumCircuit.prototype.exportToAQASM = function(options, isExportPyAQASM, expo
 		hybrid = this.options ? !!this.options.hybrid : false;
 	}
 
-	var obj = null;
-	// decompose
-	if(decompose) {
-		circuit = new QuantumCircuit();
-		tempCircuit = new QuantumCircuit();
-		obj = this.save(true);
-		circuit.load(obj);
-		tempCircuit.load(obj);
-	} else {
-		circuit = this;
-		obj = this.save(false);
-		tempCircuit = new QuantumCircuit();
-		tempCircuit.load(obj);
-	}
+	var obj = this.save(!!decompose);
+
+	circuit = new QuantumCircuit();
+	tempCircuit = new QuantumCircuit();
+	circuit.load(obj);
+	tempCircuit.load(obj);
 
 	var mathToStringHandler = function(node, options) {