Fix parsing of repeated label definitions

Author: jgardn3r

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   `pasfmt.toml` file. It is now an error to provide a path to a directory.
 - Detection of decoding errors when reading from stdin.
 - Silent ignoral of non-existent paths (were being treated as globs matching no files).
+- Parsing of repeated label definitions.
 
 ## [0.3.0] - 2024-05-29
 

core/datatests/generators/logical_line_parser.rs

@@ -33,6 +33,9 @@ macro_rules! generate_test_cases {
                 std::fs::create_dir_all(&dir)
                     .expect(&format!("failed to create all directories: {}", &dir.display()));
                 let file_name = dir.join(stringify!($name));
+                if file_name.exists() {
+                    panic!("Test with name {} already exists at {}", stringify!($name), file_name.display());
+                }
                 std::fs::write(&file_name, $input)
                     .expect(&format!("failed to write file `{}` for test", &file_name.display()));
             }
@@ -2509,8 +2512,70 @@ mod statements {
                 root_dir,
                 test_group,
                 goto_i = "goto Foo",
-                goto_n = "goto 1",
-                label = "Foo:"
+                goto_d = "goto 1",
+                goto_h = "goto $1",
+                goto_b = "goto %1",
+                label_i = "Foo:",
+                label_d = "1111:",
+                label_h = "$1111:",
+                label_b = "%1111:",
+            );
+            generate_test_cases!(
+                root_dir,
+                multi_label = "
+                    _|begin
+                    _|  Foo:
+                    _|  111:
+                    _|  $111:
+                    _|  %111:
+                    _|end
+                ",
+                i_label_statement = "
+                    _|begin
+                    _|  Foo:
+                    _|  Bar();
+                    _|end
+                ",
+                d_label_statement = "
+                    _|begin
+                    _|  111:
+                    _|  Bar();
+                    _|end
+                ",
+                b_label_statement = "
+                    _|begin
+                    _|  $111:
+                    _|  Bar();
+                    _|end
+                ",
+                h_label_statement = "
+                    _|begin
+                    _|  %111:
+                    _|  Bar();
+                    _|end
+                ",
+                other_contexts = "
+                    _|begin
+                    _|  repeat
+                    _|    111:
+                    _|  until True;
+                    _|  try
+                    _|    111:
+                    _|  except
+                    _|    111:
+                    _|  end;
+                    _|end;
+                    _|initialization
+                    _|  Foo:
+                    _|  111:
+                    _|  $111:
+                    _|  %111:
+                    _|finalization
+                    _|  Foo:
+                    _|  111:
+                    _|  $111:
+                    _|  %111:
+                ",
             );
         }
     }

core/src/defaults/parser.rs

@@ -309,7 +309,7 @@ impl<'a, 'b> InternalDelphiLogicalLineParser<'a, 'b> {
                     );
                     self.finish_logical_line();
                 }
-                TT::Op(OK::LBrack) if self.get_current_logical_line().tokens.is_empty() => {
+                TT::Op(OK::LBrack) if self.is_at_start_of_line() => {
                     // If there is a `[` at the start of a line, it must be an attribute
                     self.skip_pair();
                     self.set_logical_line_type(LogicalLineType::Attribute);
@@ -911,6 +911,25 @@ impl<'a, 'b> InternalDelphiLogicalLineParser<'a, 'b> {
                     self.take_until(no_more_separators());
                     self.finish_logical_line();
                 }
+                TT::Identifier | TT::NumberLiteral(_) | TT::IdentifierOrKeyword(_)
+                    if self.is_at_start_of_line()
+                        && self.get_next_token_type() == Some(TT::Op(OK::Colon))
+                        && !matches!(
+                            self.get_last_context_type(),
+                            Some(
+                                ContextType::DeclarationBlock
+                                    | ContextType::VisibilityBlock
+                                    | ContextType::CaseStatement
+                                    | ContextType::TypeDeclaration
+                            )
+                        ) =>
+                {
+                    // Labels can only occur at the start of a line within a compound statement
+                    self.next_token(); // Label specifier
+                    self.next_token(); // Colon
+                    self.take_until(no_more_separators());
+                    self.finish_logical_line();
+                }
                 _ => self.next_token(),
             }
         }
@@ -1364,8 +1383,12 @@ impl<'a, 'b> InternalDelphiLogicalLineParser<'a, 'b> {
         {}
     }
 
+    fn is_at_start_of_line(&self) -> bool {
+        self.get_current_logical_line().tokens.is_empty()
+    }
+
     fn finish_logical_line(&mut self) {
-        if self.get_current_logical_line().tokens.is_empty() {
+        if self.is_at_start_of_line() {
             self.get_current_logical_line_mut().line_type = LLT::Unknown;
             return;
         }