tamer: asg: Move {expr,ident} into object/
Starting to re-organize things to match my mental model of the new system; the ASG abstraction has changed quite a bit since the early days. This isn't quite enough, though; see next commit. DEV-13597main
parent
c9746230ef
commit
cdfe9083f8
|
@ -64,21 +64,21 @@
|
|||
//! if either identifier has not yet been declared.
|
||||
|
||||
mod error;
|
||||
mod expr;
|
||||
mod graph;
|
||||
mod ident;
|
||||
mod object;
|
||||
|
||||
pub mod air;
|
||||
|
||||
pub use error::AsgError;
|
||||
pub use expr::{Expr, ExprDim, ExprOp};
|
||||
pub use graph::{Asg, AsgResult, IndexType};
|
||||
pub use ident::{
|
||||
FragmentText, Ident, IdentKind, Source, TransitionError, TransitionResult,
|
||||
UnresolvedError,
|
||||
pub use object::{
|
||||
expr::{Expr, ExprDim, ExprOp},
|
||||
ident::{
|
||||
FragmentText, Ident, IdentKind, Source, TransitionError,
|
||||
TransitionResult, UnresolvedError,
|
||||
},
|
||||
Object, ObjectIndex, ObjectKind,
|
||||
};
|
||||
pub use object::{Object, ObjectIndex, ObjectKind};
|
||||
|
||||
/// Default concrete ASG implementation.
|
||||
pub type DefaultAsg = graph::Asg;
|
||||
|
|
|
@ -71,6 +71,9 @@ use crate::{
|
|||
use petgraph::graph::NodeIndex;
|
||||
use std::{convert::Infallible, fmt::Display, marker::PhantomData};
|
||||
|
||||
pub mod expr;
|
||||
pub mod ident;
|
||||
|
||||
/// An object on the ASG.
|
||||
///
|
||||
/// See the [module-level documentation](super) for more information.
|
||||
|
|
|
@ -19,7 +19,10 @@
|
|||
|
||||
//! Identifiers (a type of [object][super::object]).
|
||||
|
||||
use super::{object::ObjectRelTo, Asg, AsgError, ObjectIndex, ObjectKind};
|
||||
use super::{
|
||||
super::{Asg, AsgError, ObjectIndex, ObjectKind},
|
||||
ObjectRelTo,
|
||||
};
|
||||
use crate::{
|
||||
diagnose::{Annotate, Diagnostic},
|
||||
f::Functor,
|
Loading…
Reference in New Issue