Merge 22184d0 into 298ae6a

Author: minestarks

library/fixed_point/src/Main.qs

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-export Init.PrepareFxP as PrepareFxP, Types.FixedPoint as FixedPoint;
+export Init.PrepareFxP, Types.FixedPoint;
 
 @Config(Unrestricted)
-export Reciprocal.ComputeReciprocalFxP as ComputeReciprocalFxP;
+export Reciprocal.ComputeReciprocalFxP;
 
 @Config(FloatingPointComputations)
-export Measurement.MeasureFxP as MeasureFxP;
+export Measurement.MeasureFxP;

library/rotations/src/Main.qs

@@ -1,4 +1,4 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-export HammingWeightPhasing.HammingWeightPhasing as HammingWeightPhasing;
+export HammingWeightPhasing.HammingWeightPhasing;

library/std/src/legacy_api.qs

@@ -10,7 +10,7 @@ namespace Microsoft.Quantum {
 
 namespace Microsoft.Quantum.Core {
     import Std.Range.*;
-    export RangeStart, RangeEnd, IsRangeEmpty, Length, Repeated, Int, Qubit, Bool, Unit;
+    export RangeStart, RangeEnd, IsRangeEmpty, Length, Repeated;
 }
 
 namespace Microsoft.Quantum.Unstable {

source/compiler/qsc/src/interpret.rs

@@ -334,7 +334,7 @@ impl Interpreter {
             .expect("package should exist in the package store")
             .package;
         for global in global::iter_package(Some(map_fir_package_to_hir(package_id)), package) {
-            if let global::Kind::Term(term) = global.kind {
+            if let global::Kind::Callable(term) = global.kind {
                 let store_item_id = fir::StoreItemId {
                     package: package_id,
                     item: fir::LocalItemId::from(usize::from(term.id.item)),

source/compiler/qsc/src/interpret/tests.rs

@@ -508,7 +508,7 @@ mod given_interpreter {
                 &result,
                 &output,
                 &expect![[r#"
-                    name error: `DumpMachine` could refer to the item in `Other` or `Microsoft.Quantum.Diagnostics`
+                    name error: `DumpMachine` could refer to the item in `Other` or `Std.Diagnostics`
                       ambiguous name [line_3] [DumpMachine]
                       found in this namespace [line_1] [Other]
                       and also in this namespace [line_2] [Std.Diagnostics]

source/compiler/qsc/src/lib.rs

@@ -14,7 +14,9 @@ pub use qsc_formatter::formatter;
 pub use qsc_frontend::compile::{CompileUnit, PackageStore, SourceContents, SourceMap, SourceName};
 
 pub mod resolve {
-    pub use qsc_frontend::resolve::{Local, LocalKind, Locals, Res, path_as_field_accessor};
+    pub use qsc_frontend::resolve::{
+        Local, LocalKind, Locals, Res, iter_valid_items, path_as_field_accessor,
+    };
 }
 
 pub mod fir {

source/compiler/qsc_ast/src/ast.rs

@@ -293,8 +293,7 @@ impl Display for ItemKind {
             },
             ItemKind::Ty(name, t) => write!(f, "New Type ({name}): {t}")?,
             ItemKind::Struct(s) => write!(f, "{s}")?,
-            ItemKind::ImportOrExport(item) if item.is_export => write!(f, "Export ({item})")?,
-            ItemKind::ImportOrExport(item) => write!(f, "Import ({item})")?,
+            ItemKind::ImportOrExport(item) => write!(f, "{item}")?,
         }
         Ok(())
     }
@@ -1889,13 +1888,18 @@ pub struct ImportOrExportDecl {
 
 impl Display for ImportOrExportDecl {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let items_str = self
-            .items
-            .iter()
-            .map(std::string::ToString::to_string)
-            .collect::<Vec<_>>()
-            .join(", ");
-        write!(f, "ImportOrExportDecl {}: [{items_str}]", self.span)
+        let mut indent = set_indentation(indented(f), 0);
+        if self.is_export {
+            write!(indent, "Export")?;
+        } else {
+            write!(indent, "Import")?;
+        }
+        write!(indent, " {}:", self.span)?;
+        indent = set_indentation(indent, 1);
+        for item in &self.items {
+            write!(indent, "\n{item}")?;
+        }
+        Ok(())
     }
 }
 
@@ -1921,39 +1925,32 @@ impl ImportOrExportDecl {
     pub fn is_import(&self) -> bool {
         !self.is_export
     }
-
-    /// Returns an iterator over the items being exported from this namespace.
-    pub fn items(&self) -> impl Iterator<Item = &ImportOrExportItem> {
-        self.items.iter()
-    }
 }
 
 /// An individual item within an [`ImportOrExportDecl`]. This can be a path or a path with an alias.
 #[derive(Clone, Debug, Eq, PartialEq, Default)]
 pub struct ImportOrExportItem {
-    /// The span of the import path including the glob and alias, if any.
+    /// The span of the import path including the wildcard and alias, if any.
     pub span: Span,
     /// The path to the item being exported.
     pub path: PathKind,
-    /// An optional alias for the item being exported.
-    pub alias: Option<Ident>,
-    /// Whether this is a glob import/export.
-    pub is_glob: bool,
+    /// The kind of import being performed, direct or wildcard.
+    pub kind: ImportKind,
 }
 
 impl Display for ImportOrExportItem {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        let ImportOrExportItem {
-            span: _,
-            path,
-            alias,
-            is_glob,
-        } = self;
-        let is_glob = if *is_glob { ".*" } else { "" };
-        match alias {
-            Some(alias) => write!(f, "{path}{is_glob} as {alias}",),
-            None => write!(f, "{path}{is_glob}"),
+        write!(f, "{} ", self.span)?;
+        match &self.kind {
+            ImportKind::Wildcard => write!(f, "Wildcard")?,
+            ImportKind::Direct { alias } => {
+                write!(f, "Direct")?;
+                if let Some(alias) = alias {
+                    write!(f, " (alias: {alias})")?;
+                }
+            }
         }
+        write!(f, ": {}", self.path)
     }
 }
 
@@ -1968,19 +1965,34 @@ impl ImportOrExportItem {
     /// Returns `None` if the path has an error.
     #[must_use]
     pub fn name(&self) -> Option<&Ident> {
-        match &self.alias {
-            Some(_) => self.alias.as_ref(),
-            None => {
-                if let PathKind::Ok(path) = &self.path {
-                    Some(&path.name)
-                } else {
-                    None
-                }
-            }
+        match &self.kind {
+            ImportKind::Wildcard => None,
+            ImportKind::Direct { alias } => alias.as_ref().or_else(|| match &self.path {
+                PathKind::Ok(path) => Some(path.name.as_ref()),
+                PathKind::Err(_) => None,
+            }),
         }
     }
 }
 
+/// The kind of import being performed in an `ImportOrExportItem`.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum ImportKind {
+    /// A wildcard import: `import A.*`
+    Wildcard,
+    /// A direct import or export: `import A.B`, `export A`, etc.
+    Direct {
+        /// An optional alias for the item being imported.
+        alias: Option<Ident>,
+    },
+}
+
+impl Default for ImportKind {
+    fn default() -> Self {
+        ImportKind::Direct { alias: None }
+    }
+}
+
 /// A [`TypeParameter`] is a generic type variable with optional bounds (constraints).
 #[derive(Default, Debug, PartialEq, Eq, Clone, Hash)]
 pub struct TypeParameter {

source/compiler/qsc_ast/src/mut_visit.rs

@@ -3,9 +3,10 @@
 
 use crate::ast::{
     Attr, Block, CallableBody, CallableDecl, Expr, ExprKind, FieldAccess, FieldAssign, FieldDef,
-    FunctorExpr, FunctorExprKind, Ident, Item, ItemKind, Namespace, Package, Pat, PatKind, Path,
-    PathKind, QubitInit, QubitInitKind, SpecBody, SpecDecl, Stmt, StmtKind, StringComponent,
-    StructDecl, TopLevelNode, Ty, TyDef, TyDefKind, TyKind, TypeParameter,
+    FunctorExpr, FunctorExprKind, Ident, ImportKind, ImportOrExportItem, Item, ItemKind, Namespace,
+    Package, Pat, PatKind, Path, PathKind, QubitInit, QubitInitKind, SpecBody, SpecDecl, Stmt,
+    StmtKind, StringComponent, StructDecl, TopLevelNode, Ty, TyDef, TyDefKind, TyKind,
+    TypeParameter,
 };
 use qsc_data_structures::span::Span;
 
@@ -38,6 +39,10 @@ pub trait MutVisitor: Sized {
         walk_struct_decl(self, decl);
     }
 
+    fn visit_import_or_export(&mut self, item: &mut ImportOrExportItem) {
+        walk_import_or_export(self, item);
+    }
+
     fn visit_field_def(&mut self, def: &mut FieldDef) {
         walk_field_def(self, def);
     }
@@ -128,15 +133,11 @@ pub fn walk_item(vis: &mut impl MutVisitor, item: &mut Item) {
             vis.visit_ty_def(def);
         }
         ItemKind::Struct(decl) => vis.visit_struct_decl(decl),
-        ItemKind::ImportOrExport(export) => {
-            vis.visit_span(&mut export.span);
-            for item in &mut *export.items {
-                vis.visit_span(&mut item.span);
-                vis.visit_path_kind(&mut item.path);
-                if let Some(ref mut alias) = item.alias {
-                    vis.visit_ident(alias);
-                }
-            }
+        ItemKind::ImportOrExport(decl) => {
+            vis.visit_span(&mut decl.span);
+            decl.items
+                .iter_mut()
+                .for_each(|item| vis.visit_import_or_export(item));
         }
     }
 }
@@ -193,6 +194,14 @@ pub fn walk_struct_decl(vis: &mut impl MutVisitor, decl: &mut StructDecl) {
     decl.fields.iter_mut().for_each(|f| vis.visit_field_def(f));
 }
 
+pub fn walk_import_or_export(vis: &mut impl MutVisitor, item: &mut ImportOrExportItem) {
+    vis.visit_span(&mut item.span);
+    vis.visit_path_kind(&mut item.path);
+    if let ImportKind::Direct { alias: Some(alias) } = &mut item.kind {
+        vis.visit_ident(alias);
+    }
+}
+
 pub fn walk_field_def(vis: &mut impl MutVisitor, def: &mut FieldDef) {
     vis.visit_span(&mut def.span);
     vis.visit_ident(&mut def.name);

source/compiler/qsc_ast/src/visit.rs

@@ -3,9 +3,10 @@
 
 use crate::ast::{
     Attr, Block, CallableBody, CallableDecl, Expr, ExprKind, FieldAccess, FieldAssign, FieldDef,
-    FunctorExpr, FunctorExprKind, Ident, Item, ItemKind, Namespace, Package, Pat, PatKind, Path,
-    PathKind, QubitInit, QubitInitKind, SpecBody, SpecDecl, Stmt, StmtKind, StringComponent,
-    StructDecl, TopLevelNode, Ty, TyDef, TyDefKind, TyKind, TypeParameter,
+    FunctorExpr, FunctorExprKind, Ident, ImportKind, ImportOrExportItem, Item, ItemKind, Namespace,
+    Package, Pat, PatKind, Path, PathKind, QubitInit, QubitInitKind, SpecBody, SpecDecl, Stmt,
+    StmtKind, StringComponent, StructDecl, TopLevelNode, Ty, TyDef, TyDefKind, TyKind,
+    TypeParameter,
 };
 
 pub trait Visitor<'a>: Sized {
@@ -37,6 +38,10 @@ pub trait Visitor<'a>: Sized {
         walk_struct_decl(self, decl);
     }
 
+    fn visit_import_or_export(&mut self, item: &'a ImportOrExportItem) {
+        walk_import_or_export(self, item);
+    }
+
     fn visit_field_def(&mut self, def: &'a FieldDef) {
         walk_field_def(self, def);
     }
@@ -120,16 +125,12 @@ pub fn walk_item<'a>(vis: &mut impl Visitor<'a>, item: &'a Item) {
         }
         ItemKind::Struct(decl) => vis.visit_struct_decl(decl),
         ItemKind::ImportOrExport(decl) => {
-            for item in &decl.items {
-                vis.visit_path_kind(&item.path);
-                if let Some(ref alias) = item.alias {
-                    vis.visit_ident(alias);
-                }
-            }
+            decl.items
+                .iter()
+                .for_each(|item| vis.visit_import_or_export(item));
         }
     }
 }
-
 pub fn walk_attr<'a>(vis: &mut impl Visitor<'a>, attr: &'a Attr) {
     vis.visit_ident(&attr.name);
     vis.visit_expr(&attr.arg);
@@ -174,6 +175,16 @@ pub fn walk_struct_decl<'a>(vis: &mut impl Visitor<'a>, decl: &'a StructDecl) {
     decl.fields.iter().for_each(|f| vis.visit_field_def(f));
 }
 
+pub fn walk_import_or_export<'a>(vis: &mut impl Visitor<'a>, item: &'a ImportOrExportItem) {
+    vis.visit_path_kind(&item.path);
+    if let ImportKind::Direct {
+        alias: Some(ref alias),
+    } = item.kind
+    {
+        vis.visit_ident(alias);
+    }
+}
+
 pub fn walk_field_def<'a>(vis: &mut impl Visitor<'a>, def: &'a FieldDef) {
     vis.visit_ident(&def.name);
     vis.visit_ty(&def.ty);

source/compiler/qsc_codegen/src/qsharp.rs

@@ -15,10 +15,10 @@ use std::vec;
 
 use qsc_ast::ast::{
     self, Attr, BinOp, Block, CallableBody, CallableDecl, CallableKind, Expr, ExprKind,
-    FieldAccess, Functor, FunctorExpr, FunctorExprKind, Ident, Idents, ImportOrExportItem, Item,
-    ItemKind, Lit, Mutability, Pat, PatKind, Path, PathKind, Pauli, QubitInit, QubitInitKind,
-    QubitSource, SetOp, SpecBody, SpecDecl, SpecGen, Stmt, StmtKind, StringComponent, TernOp,
-    TopLevelNode, Ty, TyDef, TyDefKind, TyKind, UnOp,
+    FieldAccess, Functor, FunctorExpr, FunctorExprKind, Ident, Idents, ImportKind,
+    ImportOrExportItem, Item, ItemKind, Lit, Mutability, Pat, PatKind, Path, PathKind, Pauli,
+    QubitInit, QubitInitKind, QubitSource, SetOp, SpecBody, SpecDecl, SpecGen, Stmt, StmtKind,
+    StringComponent, TernOp, TopLevelNode, Ty, TyDef, TyDefKind, TyKind, UnOp,
 };
 use qsc_ast::ast::{Namespace, Package};
 use qsc_ast::visit::Visitor;
@@ -162,19 +162,18 @@ impl<W: Write> Visitor<'_> for QSharpGen<W> {
                     ImportOrExportItem {
                         span: _,
                         path,
-                        is_glob,
-                        alias,
+                        kind,
                     },
                 ) in decl.items.iter().enumerate()
                 {
                     let is_last = ix == decl.items.len() - 1;
                     self.visit_path_kind(path);
 
-                    if *is_glob {
+                    if let ImportKind::Wildcard = kind {
                         self.write(".*");
                     }
 
-                    if let Some(alias) = alias {
+                    if let ImportKind::Direct { alias: Some(alias) } = kind {
                         self.write(&format!(" as {}", alias.name));
                     }