Re-add error recovery. This time, don't require the ; such that it ca…

…n recover without greedy munching until the next semicolon.

src/monoteny_grammar.lalrpop

@@ -81,7 +81,7 @@ Block: Block = {
 }
 
 InnerBlock: Block = {
-    <statements: Box<Decorated<Positioned<(<Statement> ";")>>>*> => Block { <> }
+    <statements: Box<Decorated<Positioned<<Statement>>>>*> => Block { <> }
 };
 
 Struct: Struct = {
@@ -127,8 +127,15 @@ Conformance: TraitConformanceDeclaration = {
 
 // =============================== Statement =====================================
 
-
 Statement: Statement = {
+    <e: Positioned<!>> => {
+        errors.push(e.value.clone());
+        Statement::Error(derive_error(&e))
+    },
+    <StatementNoSemicolon> ";",
+};
+
+StatementNoSemicolon: Statement = {
     <mutability: VariableDeclarationMutability> <identifier: Identifier> <type_declaration: ("'" <Box<Expression>>)?> <assignment: ("=" <Box<Expression>>)?> => Statement::VariableDeclaration { mutability, identifier, type_declaration, assignment },
     "upd" <target: Box<Expression>> "=" <new_value: Box<Expression>> => Statement::VariableUpdate { <> },
     "return" <Box<Expression>?> => Statement::Return(<>),

src/parser/ast.rs

@@ -60,6 +60,7 @@ pub struct IfThenElse {
 
 #[derive(Eq, PartialEq, Clone)]
 pub enum Statement {
+    Error(RuntimeError),
     VariableDeclaration {
         mutability: Mutability,
         identifier: String,
@@ -226,6 +227,7 @@ impl Display for TraitConformanceDeclaration {
 impl Display for Statement {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
         match self {
+            Statement::Error(error) => write!(fmt, "ERR"),
             Statement::VariableDeclaration { mutability, identifier, type_declaration, assignment} => {
                 let mutability_string = mutability.variable_declaration_keyword();
                 write!(fmt, "{} {}", mutability_string, identifier)?;

src/resolver/conformance.rs

@@ -48,6 +48,7 @@ impl <'a, 'b> ConformanceResolver<'a, 'b> {
                     RuntimeError::error(format!("Expression {} not valid in a conformance context.", statement).as_str()).to_array()
                 );
             }
+            ast::Statement::Error(err) => Err(err.clone().to_array())?,
             _ => {
                 return Err(
                     RuntimeError::error(format!("Statement {} not valid in a conformance context.", statement).as_str()).to_array()

src/resolver/global.rs

@@ -240,6 +240,7 @@ impl <'a> GlobalResolver<'a> {
                     RuntimeError::error(format!("Expression {} is not supported in a global context.", e).as_str()).to_array()
                 )
             }
+            ast::Statement::Error(err) => Err(err.clone().to_array())?,
             statement => {
                 return Err(
                     RuntimeError::error(format!("Statement {} is not supported in a global context.", statement).as_str()).to_array()

src/resolver/imperative.rs

@@ -294,6 +294,7 @@ impl <'a> ImperativeResolver<'a> {
 
                 self.resolve_expression(&expression, &scope)?
             }
+            ast::Statement::Error(err) => Err(err.clone().to_array())?,
             statement => {
                 return Err(
                     RuntimeError::error(format!("Statement {} is not supported in an imperative context.", statement).as_str()).to_array()

src/resolver/traits.rs

@@ -80,6 +80,7 @@ impl <'a> TraitResolver<'a> {
                     RuntimeError::error(format!("Expression {} not valid in a trait context.", statement).as_str()).to_array()
                 );
             }
+            ast::Statement::Error(err) => Err(err.clone().to_array())?,
             _ => {
                 return Err(
                     RuntimeError::error(format!("Statement {} not valid in a trait context.", statement).as_str()).to_array()