break and continue are not items (FuelLabs#2536)

Co-authored-by: Mohammad Fawaz <[email protected]>
erkancamli · Aug 16, 2022 · f8c5d57 · f8c5d57
1 parent fddb206
commit f8c5d57
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 89 deletions.
diff --git a/sway-ast/src/expr/mod.rs b/sway-ast/src/expr/mod.rs
@@ -168,6 +168,12 @@ pub enum Expr {
         reassignment_op: ReassignmentOp,
         expr: Box<Expr>,
     },
+    Break {
+        break_token: BreakToken,
+    },
+    Continue {
+        continue_token: ContinueToken,
+    },
 }
 
 impl Spanned for Expr {
@@ -233,6 +239,8 @@ impl Spanned for Expr {
             Expr::Reassignment {
                 assignable, expr, ..
             } => Span::join(assignable.span(), expr.span()),
+            Expr::Break { break_token } => break_token.span(),
+            Expr::Continue { continue_token } => continue_token.span(),
         }
     }
 }

diff --git a/sway-ast/src/item/item_control_flow.rs b/sway-ast/src/item/item_control_flow.rs
diff --git a/sway-ast/src/item/mod.rs b/sway-ast/src/item/mod.rs
@@ -2,7 +2,6 @@ use crate::priv_prelude::*;
 
 pub mod item_abi;
 pub mod item_const;
-pub mod item_control_flow;
 pub mod item_enum;
 pub mod item_fn;
 pub mod item_impl;
@@ -34,8 +33,6 @@ pub enum ItemKind {
     Abi(ItemAbi),
     Const(ItemConst),
     Storage(ItemStorage),
-    Break(ItemBreak),
-    Continue(ItemContinue),
 }
 
 impl Spanned for ItemKind {
@@ -50,8 +47,6 @@ impl Spanned for ItemKind {
             ItemKind::Abi(item_abi) => item_abi.span(),
             ItemKind::Const(item_const) => item_const.span(),
             ItemKind::Storage(item_storage) => item_storage.span(),
-            ItemKind::Break(item_break) => item_break.span(),
-            ItemKind::Continue(item_continue) => item_continue.span(),
         }
     }
 }

diff --git a/sway-ast/src/lib.rs b/sway-ast/src/lib.rs
@@ -34,7 +34,6 @@ pub use crate::{
     item::{
         item_abi::ItemAbi,
         item_const::ItemConst,
-        item_control_flow::{ItemBreak, ItemContinue},
         item_enum::ItemEnum,
         item_fn::ItemFn,
         item_impl::ItemImpl,

diff --git a/sway-ast/src/priv_prelude.rs b/sway-ast/src/priv_prelude.rs
@@ -14,7 +14,6 @@ pub use {
         item::{
             item_abi::ItemAbi,
             item_const::ItemConst,
-            item_control_flow::{ItemBreak, ItemContinue},
             item_enum::ItemEnum,
             item_fn::ItemFn,
             item_impl::ItemImpl,

diff --git a/sway-core/src/convert_parse_tree.rs b/sway-core/src/convert_parse_tree.rs
@@ -347,16 +347,6 @@ fn item_to_ast_nodes(ec: &mut ErrorContext, item: Item) -> Result<Vec<AstNode>,
                 Declaration::StorageDeclaration(storage_declaration),
             )]
         }
-        ItemKind::Break(_) => {
-            vec![AstNodeContent::Declaration(Declaration::Break {
-                span: span.clone(),
-            })]
-        }
-        ItemKind::Continue(_) => {
-            vec![AstNodeContent::Declaration(Declaration::Continue {
-                span: span.clone(),
-            })]
-        }
     };
     Ok(contents
         .into_iter()
@@ -1890,6 +1880,28 @@ fn expr_to_expression(ec: &mut ErrorContext, expr: Expr) -> Result<Expression, E
             let error = ConvertParseTreeError::ReassignmentOutsideOfBlock { span };
             return Err(ec.error(error));
         }
+        Expr::Break { .. } => Expression {
+            kind: ExpressionKind::CodeBlock(CodeBlock {
+                contents: vec![AstNode {
+                    content: AstNodeContent::Declaration(Declaration::Break { span: span.clone() }),
+                    span: span.clone(),
+                }],
+                whole_block_span: span.clone(),
+            }),
+            span,
+        },
+        Expr::Continue { .. } => Expression {
+            kind: ExpressionKind::CodeBlock(CodeBlock {
+                contents: vec![AstNode {
+                    content: AstNodeContent::Declaration(Declaration::Continue {
+                        span: span.clone(),
+                    }),
+                    span: span.clone(),
+                }],
+                whole_block_span: span.clone(),
+            }),
+            span,
+        },
     };
     Ok(expression)
 }

diff --git a/sway-fmt-v2/src/utils/expr/mod.rs b/sway-fmt-v2/src/utils/expr/mod.rs
@@ -450,6 +450,8 @@ impl Format for Expr {
                 reassignment_op.format(formatted_code, formatter)?;
                 expr.format(formatted_code, formatter)?;
             }
+            Self::Break { .. } => write!(formatted_code, "break")?,
+            Self::Continue { .. } => write!(formatted_code, "continue")?,
         }
 
         Ok(())
@@ -937,5 +939,11 @@ fn visit_expr(expr: &Expr) -> Vec<ByteSpan> {
             collected_spans.append(&mut expr.leaf_spans());
             collected_spans
         }
+        Expr::Break { break_token } => {
+            vec![ByteSpan::from(break_token.span())]
+        }
+        Expr::Continue { continue_token } => {
+            vec![ByteSpan::from(continue_token.span())]
+        }
     }
 }
diff --git a/sway-fmt-v2/src/utils/item.rs b/sway-fmt-v2/src/utils/item.rs
@@ -16,8 +16,6 @@ impl LeafSpans for Item {
             Trait(item_trait) => item_trait.leaf_spans(),
             Impl(item_impl) => item_impl.leaf_spans(),
             Use(item_use) => item_use.leaf_spans(),
-            Break(_) => todo!(),
-            Continue(_) => todo!(),
         }
     }
 }
@@ -38,8 +36,6 @@ impl Format for Item {
             Abi(item_abi) => item_abi.format(formatted_code, formatter),
             Const(item_const) => item_const.format(formatted_code, formatter),
             Storage(item_storage) => item_storage.format(formatted_code, formatter),
-            Break(_item_break) => todo!(),
-            Continue(_item_continue) => todo!(),
         }
     }
 }

diff --git a/sway-parse/src/expr/mod.rs b/sway-parse/src/expr/mod.rs
@@ -6,10 +6,10 @@ use core::ops::ControlFlow;
 use sway_ast::brackets::{Braces, Parens, SquareBrackets};
 use sway_ast::expr::{ReassignmentOp, ReassignmentOpVariant};
 use sway_ast::keywords::{
-    AbiToken, AddEqToken, AsmToken, BreakToken, CommaToken, ConstToken, ContinueToken, DivEqToken,
-    DoubleColonToken, EnumToken, EqToken, FalseToken, FnToken, IfToken, ImplToken, LetToken,
-    OpenAngleBracketToken, PubToken, SemicolonToken, ShlEqToken, ShrEqToken, StarEqToken,
-    StorageToken, StructToken, SubEqToken, TildeToken, TraitToken, TrueToken, UseToken,
+    AbiToken, AddEqToken, AsmToken, CommaToken, ConstToken, DivEqToken, DoubleColonToken,
+    EnumToken, EqToken, FalseToken, FnToken, IfToken, ImplToken, LetToken, OpenAngleBracketToken,
+    PubToken, SemicolonToken, ShlEqToken, ShrEqToken, StarEqToken, StorageToken, StructToken,
+    SubEqToken, TildeToken, TraitToken, TrueToken, UseToken,
 };
 use sway_ast::literal::{LitBool, LitBoolType};
 use sway_ast::punctuated::Punctuated;
@@ -155,8 +155,6 @@ fn parse_stmt<'a>(parser: &mut Parser<'a, '_>) -> ParseResult<StmtOrTail<'a>> {
         || parser.peek::<ImplToken>().is_some()
         || parser.peek::<(AbiToken, Ident)>().is_some()
         || parser.peek::<ConstToken>().is_some()
-        || parser.peek::<BreakToken>().is_some()
-        || parser.peek::<ContinueToken>().is_some()
         || matches!(
             parser.peek::<(StorageToken, Delimiter)>(),
             Some((_, Delimiter::Brace))
@@ -614,6 +612,12 @@ fn parse_atom(parser: &mut Parser, ctx: ParseExprCtx) -> ParseResult<Expr> {
     if let Some(asm_block) = parser.guarded_parse::<AsmToken, _>()? {
         return Ok(Expr::Asm(asm_block));
     }
+    if let Some(break_token) = parser.take() {
+        return Ok(Expr::Break { break_token });
+    }
+    if let Some(continue_token) = parser.take() {
+        return Ok(Expr::Continue { continue_token });
+    }
     if let Some(abi_token) = parser.take() {
         let args = parser.parse()?;
         return Ok(Expr::AbiCast { abi_token, args });

diff --git a/sway-parse/src/item/item_control_flow.rs b/sway-parse/src/item/item_control_flow.rs
diff --git a/sway-parse/src/item/mod.rs b/sway-parse/src/item/mod.rs
@@ -1,9 +1,8 @@
 use crate::{Parse, ParseErrorKind, ParseResult, ParseToEnd, Parser, ParserConsumed};
 
 use sway_ast::keywords::{
-    AbiToken, BreakToken, ConstToken, ContinueToken, EnumToken, FnToken, ImplToken, MutToken,
-    OpenAngleBracketToken, RefToken, SelfToken, StorageToken, StructToken, TraitToken, UseToken,
-    WhereToken,
+    AbiToken, ConstToken, EnumToken, FnToken, ImplToken, MutToken, OpenAngleBracketToken, RefToken,
+    SelfToken, StorageToken, StructToken, TraitToken, UseToken, WhereToken,
 };
 use sway_ast::token::{DocComment, DocStyle};
 use sway_ast::{
@@ -13,7 +12,6 @@ use sway_ast::{
 
 mod item_abi;
 mod item_const;
-mod item_control_flow;
 mod item_enum;
 mod item_fn;
 mod item_impl;
@@ -54,10 +52,6 @@ impl Parse for ItemKind {
             ItemKind::Const(item)
         } else if let Some(item) = parser.guarded_parse::<StorageToken, _>()? {
             ItemKind::Storage(item)
-        } else if let Some(item) = parser.guarded_parse::<BreakToken, _>()? {
-            ItemKind::Break(item)
-        } else if let Some(item) = parser.guarded_parse::<ContinueToken, _>()? {
-            ItemKind::Continue(item)
         } else {
             return Err(parser.emit_error(ParseErrorKind::ExpectedAnItem));
         };