More error handling refactoring

This changes addresses the issues introduced in #4878

The `error_emitted` pattern is replaced by a scoping method on `Handler`
that collects errors within a closure and will error out if new erros are
introduced.

All instances of introducing `ErrorEmitted` as a literal value have
now been replaced by passing arround the receipt of the error emission
through the error representing values. Some types from the AST had to
be moved to `sway-types` to avoid circular dependencies introduced by
this change.

This also repairs some of the discrepancies to emitted warnings
introduced in #4878, as well as rename some of the `Handler` methods.

Fixes #4885
Fixes #4886

forc-pkg/src/pkg.rs

@@ -1800,8 +1800,8 @@ pub fn compile(
         Ok(programs) => programs,
     };
     let typed_program = match programs.typed.as_ref() {
-        None => return fail(handler),
-        Some(typed_program) => typed_program,
+        Err(_) => return fail(handler),
+        Ok(typed_program) => typed_program,
     };
 
     if profile.print_ast {
@@ -1813,7 +1813,7 @@ pub fn compile(
 
     let namespace = typed_program.root.namespace.clone().into();
 
-    if handler.has_error() {
+    if handler.has_errors() {
         return fail(handler);
     }
 
@@ -1893,7 +1893,7 @@ pub fn compile(
         metrics
     );
 
-    let errored = handler.has_error() || (handler.has_warning() && profile.error_on_warnings);
+    let errored = handler.has_errors() || (handler.has_warnings() && profile.error_on_warnings);
 
     let compiled = match bc_res {
         Ok(compiled) if !errored => compiled,
@@ -2663,7 +2663,7 @@ pub fn check(
         };
 
         match programs.typed.as_ref() {
-            Some(typed_program) => {
+            Ok(typed_program) => {
                 if let TreeType::Library = typed_program.kind.tree_type() {
                     let mut namespace = typed_program.root.namespace.clone();
                     namespace.name = Some(Ident::new_no_span(pkg.name.clone()));
@@ -2681,7 +2681,7 @@ pub fn check(
 
                 source_map.insert_dependency(manifest.dir());
             }
-            None => {
+            Err(_) => {
                 results.push((programs_res.ok(), handler));
                 return Ok(results);
             }

forc-plugins/forc-doc/src/main.rs

@@ -109,7 +109,7 @@ pub fn main() -> Result<()> {
 
             if let Some(pkg_manifest_file) = manifest_map.get(id) {
                 let manifest_file = ManifestFile::from_dir(pkg_manifest_file.path())?;
-                let ty_program = match compile_result.and_then(|programs| programs.typed) {
+                let ty_program = match compile_result.and_then(|programs| programs.typed.ok()) {
                     Some(ty_program) => ty_program,
                     _ => bail!(
                         "documentation could not be built from manifest located at '{}'",
@@ -130,7 +130,7 @@ pub fn main() -> Result<()> {
         let ty_program = match compile_results
             .pop()
             .and_then(|(programs, _handler)| programs)
-            .and_then(|p| p.typed)
+            .and_then(|p| p.typed.ok())
         {
             Some(ty_program) => ty_program,
             _ => bail!(

forc/src/ops/forc_check.rs

@@ -38,6 +38,6 @@ pub fn check(command: CheckCommand, engines: &Engines) -> Result<(Option<ty::TyP
     let (res, handler) = v
         .pop()
         .expect("there is guaranteed to be at least one elem in the vector");
-    let res = res.and_then(|programs| programs.typed);
+    let res = res.and_then(|programs| programs.typed.ok());
     Ok((res, handler))
 }

sway-ast/Cargo.toml

@@ -14,3 +14,4 @@ num-bigint = { version = "0.4.3", features = ["serde"] }
 num-traits = "0.2.14"
 serde = { version = "1.0", features = ["derive"] }
 sway-types = { version = "0.42.1", path = "../sway-types" }
+sway-error = { version = "0.42.1", path = "../sway-error" }

sway-ast/src/expr/mod.rs

@@ -1,3 +1,5 @@
+use sway_error::handler::ErrorEmitted;
+
 use crate::{priv_prelude::*, PathExprSegment};
 
 pub mod asm;
@@ -8,7 +10,7 @@ pub enum Expr {
     /// A malformed expression.
     ///
     /// Used for parser recovery when we cannot form a more specific node.
-    Error(Box<[Span]>),
+    Error(Box<[Span]>, #[serde(skip_serializing)] ErrorEmitted),
     Path(PathExpr),
     Literal(Literal),
     AbiCast {
@@ -188,7 +190,7 @@ pub enum Expr {
 impl Spanned for Expr {
     fn span(&self) -> Span {
         match self {
-            Expr::Error(spans) => spans.iter().cloned().reduce(Span::join).unwrap(),
+            Expr::Error(spans, _) => spans.iter().cloned().reduce(Span::join).unwrap(),
             Expr::Path(path_expr) => path_expr.span(),
             Expr::Literal(literal) => literal.span(),
             Expr::AbiCast { abi_token, args } => Span::join(abi_token.span(), args.span()),

sway-ast/src/pattern.rs

@@ -1,3 +1,5 @@
+use sway_error::handler::ErrorEmitted;
+
 use crate::priv_prelude::*;
 
 #[derive(Clone, Debug, Serialize)]
@@ -29,7 +31,7 @@ pub enum Pattern {
     },
     Tuple(Parens<Punctuated<Pattern, CommaToken>>),
     // to handle parser recovery: Error represents an incomplete Constructor
-    Error(Box<[Span]>),
+    Error(Box<[Span]>, #[serde(skip_serializing)] ErrorEmitted),
 }
 
 impl Spanned for Pattern {
@@ -59,7 +61,7 @@ impl Spanned for Pattern {
             Pattern::Constructor { path, args } => Span::join(path.span(), args.span()),
             Pattern::Struct { path, fields } => Span::join(path.span(), fields.span()),
             Pattern::Tuple(pat_tuple) => pat_tuple.span(),
-            Pattern::Error(spans) => spans.iter().cloned().reduce(Span::join).unwrap(),
+            Pattern::Error(spans, _) => spans.iter().cloned().reduce(Span::join).unwrap(),
         }
     }
 }

sway-ast/src/priv_prelude.rs

@@ -31,7 +31,7 @@ pub use {
         punctuated::Punctuated,
         statement::{Statement, StatementLet},
         submodule::Submodule,
-        token::{Delimiter, Group, Punct, PunctKind, Spacing, TokenStream, TokenTree},
+        token::{Group, Punct, Spacing, TokenStream, TokenTree},
         ty::Ty,
         where_clause::{WhereBound, WhereClause},
     },
@@ -41,5 +41,8 @@ pub use {
     std::{
         fmt, marker::PhantomData, mem, ops::ControlFlow, path::PathBuf, str::FromStr, sync::Arc,
     },
-    sway_types::{Ident, Span, Spanned},
+    sway_types::{
+        ast::{Delimiter, PunctKind},
+        Ident, Span, Spanned,
+    },
 };

sway-ast/src/token.rs

@@ -6,28 +6,6 @@ pub enum Spacing {
     Alone,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum PunctKind {
-    Semicolon,
-    Colon,
-    ForwardSlash,
-    Comma,
-    Star,
-    Add,
-    Sub,
-    LessThan,
-    GreaterThan,
-    Equals,
-    Dot,
-    Bang,
-    Percent,
-    Ampersand,
-    Caret,
-    Pipe,
-    Underscore,
-    Sharp,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Hash)]
 pub struct Punct {
     pub span: Span,
@@ -41,31 +19,6 @@ impl Spanned for Punct {
     }
 }
 
-impl PunctKind {
-    pub fn as_char(&self) -> char {
-        match self {
-            PunctKind::Semicolon => ';',
-            PunctKind::Colon => ':',
-            PunctKind::ForwardSlash => '/',
-            PunctKind::Comma => ',',
-            PunctKind::Star => '*',
-            PunctKind::Add => '+',
-            PunctKind::Sub => '-',
-            PunctKind::LessThan => '<',
-            PunctKind::GreaterThan => '>',
-            PunctKind::Equals => '=',
-            PunctKind::Dot => '.',
-            PunctKind::Bang => '!',
-            PunctKind::Percent => '%',
-            PunctKind::Ampersand => '&',
-            PunctKind::Caret => '^',
-            PunctKind::Pipe => '|',
-            PunctKind::Underscore => '_',
-            PunctKind::Sharp => '#',
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Hash)]
 pub struct GenericGroup<T> {
     pub delimiter: Delimiter,
@@ -82,30 +35,6 @@ impl<T> Spanned for GenericGroup<T> {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum Delimiter {
-    Parenthesis,
-    Brace,
-    Bracket,
-}
-
-impl Delimiter {
-    pub fn as_open_char(self) -> char {
-        match self {
-            Delimiter::Parenthesis => '(',
-            Delimiter::Brace => '{',
-            Delimiter::Bracket => '[',
-        }
-    }
-    pub fn as_close_char(self) -> char {
-        match self {
-            Delimiter::Parenthesis => ')',
-            Delimiter::Brace => '}',
-            Delimiter::Bracket => ']',
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Hash)]
 pub enum CommentKind {
     /// A newlined comment is a comment with a preceding newline before another token.

sway-core/src/abi_generation/evm_abi.rs

@@ -104,7 +104,7 @@ pub fn abi_str(type_info: &TypeInfo, type_engine: &TypeEngine, decl_engine: &Dec
         B256 => "uint256".into(),
         Numeric => "u64".into(), // u64 is the default
         Contract => "contract".into(),
-        ErrorRecovery => "unknown due to error".into(),
+        ErrorRecovery(_) => "unknown due to error".into(),
         Enum(decl_ref) => {
             let decl = decl_engine.get_enum(decl_ref);
             format!("enum {}", decl.call_path.suffix)

sway-core/src/abi_generation/fuel_abi.rs

@@ -805,7 +805,7 @@ impl TypeInfo {
             B256 => "b256".into(),
             Numeric => "u64".into(), // u64 is the default
             Contract => "contract".into(),
-            ErrorRecovery => "unknown due to error".into(),
+            ErrorRecovery(_) => "unknown due to error".into(),
             Enum(decl_ref) => {
                 let decl = decl_engine.get_enum(decl_ref);
                 format!("enum {}", call_path_display(ctx, &decl.call_path))