Remove external parser. Fix Qiskit's failure to emit gates.

Cargo.toml

@@ -62,11 +62,6 @@ ndarray = "0.15.4"
 num-bigint = "0.4"
 num-complex = "0.4"
 num-traits = "0.2"
-oq3_source_file = "0.7.0"
-oq3_syntax = "0.7.0"
-oq3_parser = "0.7.0"
-oq3_lexer = "0.7.0"
-oq3_semantics = "0.7.0"
 probability = "0.20"
 indenter = "0.3"
 regex-lite = "0.1"

compiler/qsc/src/compile.rs

@@ -37,6 +37,9 @@ pub enum ErrorKind {
     #[error("Cycle in dependency graph")]
     /// `DependencyCycle` occurs when there is a cycle in the dependency graph.
     DependencyCycle,
+
+    #[diagnostic(transparent)]
+    OpenQasm(#[from] crate::qasm::error::Error),
 }
 
 /// Compiles a package from its AST representation.

compiler/qsc/src/lib.rs

@@ -75,7 +75,4 @@ pub mod partial_eval {
     pub use qsc_partial_eval::Error;
 }
 
-pub mod qasm3 {
-    pub use qsc_qasm3::parse::*;
-    pub use qsc_qasm3::*;
-}
+pub mod qasm;

compiler/qsc/src/qasm.rs

@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+use std::path::Path;
+
+use qsc_qasm3::io::SourceResolver;
+pub use qsc_qasm3::CompilerConfig;
+pub use qsc_qasm3::OperationSignature;
+pub use qsc_qasm3::OutputSemantics;
+pub use qsc_qasm3::ProgramType;
+pub use qsc_qasm3::QasmCompileUnit;
+pub use qsc_qasm3::QubitSemantics;
+pub mod io {
+    pub use qsc_qasm3::io::*;
+}
+pub mod parser {
+    pub use qsc_qasm3::parser::*;
+}
+pub mod error {
+    pub use qsc_qasm3::Error;
+    pub use qsc_qasm3::ErrorKind;
+}
+pub mod completion {
+    pub use qsc_qasm3::parser::completion::*;
+}
+pub use qsc_qasm3::compile_to_qsharp_ast_with_config;
+pub use qsc_qasm3::package_store_with_qasm;
+
+#[must_use]
+pub fn parse_raw_qasm_as_fragments<S, P, R>(
+    source: S,
+    path: P,
+    resolver: Option<&mut R>,
+) -> QasmCompileUnit
+where
+    S: AsRef<str>,
+    P: AsRef<Path>,
+    R: SourceResolver,
+{
+    let config = CompilerConfig::new(
+        QubitSemantics::Qiskit,
+        OutputSemantics::OpenQasm,
+        ProgramType::Fragments,
+        None,
+        None,
+    );
+    compile_to_qsharp_ast_with_config(source, path, resolver, config)
+}
+
+#[must_use]
+pub fn parse_raw_qasm_as_operation<S, P, R>(
+    source: S,
+    name: S,
+    path: P,
+    resolver: Option<&mut R>,
+) -> QasmCompileUnit
+where
+    S: AsRef<str>,
+    P: AsRef<Path>,
+    R: SourceResolver,
+{
+    let config = CompilerConfig::new(
+        QubitSemantics::Qiskit,
+        OutputSemantics::OpenQasm,
+        ProgramType::Operation,
+        Some(name.as_ref().into()),
+        None,
+    );
+    compile_to_qsharp_ast_with_config(source, path, resolver, config)
+}

compiler/qsc_qasm3/Cargo.toml

@@ -22,10 +22,6 @@ qsc_parse = { path = "../qsc_parse" }
 qsc_passes = { path = "../qsc_passes" }
 rustc-hash = { workspace = true }
 thiserror = { workspace = true }
-oq3_source_file = { workspace = true }
-oq3_syntax = { workspace = true }
-oq3_parser = { workspace = true }
-oq3_semantics = { workspace = true }
 
 [dev-dependencies]
 difference = { workspace = true }