Move qasm std into std

Author: idavis

compiler/qsc/src/packages.rs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 use crate::{
-    compile::{self, Error, ErrorKind},
+    compile::{self, package_store_with_stdlib, Error, ErrorKind},
     hir::PackageId,
     PackageStore, TargetCapabilityFlags,
 };
@@ -81,7 +81,7 @@ pub fn prepare_package_store(
     capabilities: TargetCapabilityFlags,
     package_graph_sources: PackageGraphSources,
 ) -> BuildableProgram {
-    let (std_id, qasm_id, mut package_store) = crate::qasm::package_store_with_qasm(capabilities);
+    let (std_id, mut package_store) = package_store_with_stdlib(capabilities);
 
     let mut canonical_package_identifier_to_package_id_mapping = FxHashMap::default();
 
@@ -156,7 +156,6 @@ pub fn prepare_package_store(
                 .map(|pkg| (pkg, Some(alias.clone())))
         })
         .chain(std::iter::once((std_id, None)))
-        .chain(std::iter::once((qasm_id, Some("QasmStd".into()))))
         .collect::<Vec<_>>();
 
     BuildableProgram {

compiler/qsc/src/qasm.rs

@@ -27,7 +27,8 @@ pub mod completion {
     pub use qsc_qasm::parser::completion::*;
 }
 pub use qsc_qasm::compile_to_qsharp_ast_with_config;
-pub use qsc_qasm::package_store_with_qasm;
+
+use crate::compile::package_store_with_stdlib;
 
 pub struct CompileRawQasmResult(
     pub PackageStore,
@@ -68,12 +69,8 @@ pub fn compile_with_config<R: SourceResolver, S: Into<Arc<str>>>(
 
     let (source_map, errors, package, sig) = unit.into_tuple();
 
-    let (stdid, qasmid, mut store) = package_store_with_qasm(capabilities);
-    let dependencies = vec![
-        (PackageId::CORE, None),
-        (stdid, None),
-        (qasmid, Some("QasmStd".into())),
-    ];
+    let (stdid, mut store) = package_store_with_stdlib(capabilities);
+    let dependencies = vec![(PackageId::CORE, None), (stdid, None)];
 
     let (mut unit, compile_errors) = crate::compile::compile_ast(
         &store,

compiler/qsc_doc_gen/src/generate_docs.rs

@@ -631,7 +631,12 @@ fn get_namespace(package: &Package, item: &Item) -> Option<Rc<str>> {
     if name.starts_with("QIR") {
         None // We ignore "QIR" namespaces
     } else {
-        Some(name.name())
+        let name = name.name();
+        if name.to_lowercase().starts_with("std.openqasm") {
+            None // We ignore openqasm namespaces
+        } else {
+            Some(name)
+        }
     }
 }
 

compiler/qsc_qasm/src/ast_builder.rs

@@ -1048,7 +1048,7 @@ pub(crate) fn build_qasm_import_items() -> Vec<Item> {
 
 pub(crate) fn build_qasm_import_decl_intrinsic() -> Item {
     let path_kind = Path {
-        segments: Some(Box::new([build_ident("QasmStd")])),
+        segments: Some(Box::new([build_ident("Std"), build_ident("OpenQASM")])),
         name: Box::new(build_ident("Intrinsic")),
         id: NodeId::default(),
         span: Span::default(),
@@ -1170,7 +1170,7 @@ fn build_angle_ident_pathkind() -> PathKind {
 fn build_qasmstd_convert_pathkind<S: AsRef<str>>(name: S, span: Span) -> PathKind {
     let alloc_ident = build_ident(name.as_ref());
     PathKind::Ok(Box::new(Path {
-        segments: build_idents(&["QasmStd", "Convert"]),
+        segments: build_idents(&["Std", "OpenQASM", "Convert"]),
         name: Box::new(alloc_ident),
         id: NodeId::default(),
         span,
@@ -1180,7 +1180,7 @@ fn build_qasmstd_convert_pathkind<S: AsRef<str>>(name: S, span: Span) -> PathKin
 fn build_angle_pathkind<S: AsRef<str>>(name: S, span: Span) -> PathKind {
     let alloc_ident = build_ident(name.as_ref());
     PathKind::Ok(Box::new(Path {
-        segments: build_idents(&["QasmStd", "Angle"]),
+        segments: build_idents(&["Std", "OpenQASM", "Angle"]),
         name: Box::new(alloc_ident),
         id: NodeId::default(),
         span,

compiler/qsc_qasm/src/compiler.rs

@@ -1231,7 +1231,7 @@ impl QasmCompiler {
         if matches!(expr.ty, Type::Angle(..)) {
             build_call_with_param(
                 "AngleNotB",
-                &["QasmStd", "Angle"],
+                &["Std", "OpenQASM", "Angle"],
                 compiled_expr,
                 span,
                 expr.span,
@@ -1326,7 +1326,7 @@ impl QasmCompiler {
             }
         };
 
-        build_call_with_params(fn_name, &["QasmStd", "Angle"], operands, span, span)
+        build_call_with_params(fn_name, &["Std", "OpenQASM", "Angle"], operands, span, span)
     }
 
     fn compile_complex_binary_op(
@@ -1785,7 +1785,7 @@ impl QasmCompiler {
                     build_lit_int_expr(width.unwrap_or(f64::MANTISSA_DIGITS).into(), expr_span);
                 build_call_with_params(
                     "DoubleAsAngle",
-                    &["QasmStd", "Angle"],
+                    &["Std", "OpenQASM", "Angle"],
                     vec![expr, width],
                     expr_span,
                     expr_span,

compiler/qsc_qasm/src/lib.rs

@@ -5,7 +5,6 @@ mod ast_builder;
 mod compiler;
 mod stdlib;
 pub use compiler::compile_to_qsharp_ast_with_config;
-pub use stdlib::package_store_with_qasm;
 mod convert;
 pub mod display_utils;
 pub mod io;

compiler/qsc_qasm/src/semantic/lowerer.rs

@@ -286,7 +286,7 @@ impl Lowerer {
     /// definitions for many gates that aren't included in the
     /// standard gates include file. We define them here so that
     /// the symbol table is complete and we can lower the QASM3.
-    /// We must also define the gates in the `QasmStd` module so
+    /// We must also define the gates in the `Std.OpenQASM` module so
     /// that we can compile the QASM3 to Q#.
     fn define_qiskit_standard_gate_if_needed<S>(&mut self, name: S, span: Span)
     where

compiler/qsc_qasm/src/stdlib.rs

@@ -2,6 +2,3 @@
 // Licensed under the MIT License.
 
 pub(crate) mod angle;
-pub(crate) mod compile;
-
-pub use compile::package_store_with_qasm;