Update upstream patches

- Patch #3 did not pass the internal testsuite
- Patches #20 and stadelmanma#22 were merged together

Author: inaki-amatria

codee/patches/0003-Add-semantic-accessors.patch

@@ -9,8 +9,8 @@ Subject: Add semantic accessors
  test/corpus/expressions.txt  |  6 +++---
  test/corpus/preprocessor.txt |  8 ++++----
  test/corpus/regressions.txt  |  2 +-
- test/corpus/statements.txt   |  8 ++++----
- 6 files changed, 35 insertions(+), 22 deletions(-)
+ test/corpus/statements.txt   | 10 +++++-----
+ 6 files changed, 36 insertions(+), 23 deletions(-)
 
 diff --git a/grammar.js b/grammar.js
 index 4e6a7f1..d0af7b9 100644
@@ -198,7 +198,7 @@ index fc47bf1..1af946a 100644
        left: (call_expression
          (identifier)
 diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
-index ca8c86e..ad47d68 100644
+index ca8c86e..d6bebae 100644
 --- a/test/corpus/statements.txt
 +++ b/test/corpus/statements.txt
 @@ -289,7 +289,7 @@ END PROGRAM
@@ -237,3 +237,12 @@ index ca8c86e..ad47d68 100644
      (allocate_statement
        allocation: (sized_allocation
          (identifier)
+@@ -3499,7 +3499,7 @@ end program
+ (translation_unit
+   (program
+     (program_statement
+-      (name))
++      name: (name))
+     (implicit_statement
+       (none))
+     (variable_declaration

codee/patches/0004-Unhide-end_of_statement.patch

@@ -3918,7 +3918,7 @@ index 1af946a..d6b3f37 100644
 +      (name)
 +      (end_of_statement))))
 diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
-index ad47d68..fe7ec84 100644
+index d6bebae..fe7ec84 100644
 --- a/test/corpus/statements.txt
 +++ b/test/corpus/statements.txt
 @@ -34,57 +34,76 @@ end subroutine foo
@@ -6818,7 +6818,7 @@ index ad47d68..fe7ec84 100644
  (translation_unit
    (program
      (program_statement
--      (name))
+-      name: (name))
 +      name: (name)
 +      (end_of_statement))
      (implicit_statement

codee/patches/0020-Allow-to-parse-macro-identifiers-in-variable-decls.patch renamed to codee/patches/0020-Allow-to-parse-macro-identifiers.patch

@@ -1,15 +1,15 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Diego Alonso <diego.alonso@appentra.com>
 Date: Thu, 26 Jun 2025 14:04:51 +0200
-Subject: Allow to parse macro identifiers in variable decls
+Subject: Allow to parse macro identifiers
 
 ---
- grammar.js    |   2 +
+ grammar.js    |   4 ++
  src/scanner.c | 141 +++++++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 119 insertions(+), 24 deletions(-)
+ 2 files changed, 121 insertions(+), 24 deletions(-)
 
 diff --git a/grammar.js b/grammar.js
-index 6e79004..40ac8b7 100644
+index 6e79004..1215588 100644
 --- a/grammar.js
 +++ b/grammar.js
 @@ -67,6 +67,7 @@ module.exports = grammar({
@@ -28,6 +28,22 @@ index 6e79004..40ac8b7 100644
        )),
        optional(seq(',',
          commaSep1(
+@@ -1178,6 +1180,7 @@ module.exports = grammar({
+       // Not strictly valid, but can catch extensions and preprocessor macros
+       $.call_expression,
+       $.include_statement,
++      $.macro_identifier
+     ),
+ 
+     statement_label: $ => prec(1, alias($._integer_literal, 'statement_label')),
+@@ -1941,6 +1944,7 @@ module.exports = grammar({
+       $.implied_do_loop_expression,
+       $.coarray_expression,
+       $.conditional_expression,
++      $.macro_identifier
+     ),
+ 
+     parenthesized_expression: $ => seq(
 diff --git a/src/scanner.c b/src/scanner.c
 index b768d99..e5a37ee 100644
 --- a/src/scanner.c

codee/patches/0021-Parse-multiline-preprocessor-comments.patch

@@ -9,7 +9,7 @@ Subject: Parse multiline preprocessor comments
  2 files changed, 79 insertions(+), 10 deletions(-)
 
 diff --git a/grammar.js b/grammar.js
-index 40ac8b7..b5c11d1 100644
+index 1215588..c6ffa3b 100644
 --- a/grammar.js
 +++ b/grammar.js
 @@ -75,6 +75,7 @@ module.exports = grammar({
@@ -30,7 +30,7 @@ index 40ac8b7..b5c11d1 100644
 
      preproc_binary_expression: $ => {
        const table = [
-@@ -2466,36 +2468,50 @@ function preprocIf(suffix, content, precedence = 0) {
+@@ -2468,36 +2470,50 @@ function preprocIf(suffix, content, precedence = 0) {
      );
    }
 
@@ -87,7 +87,7 @@ index 40ac8b7..b5c11d1 100644
        field('condition', $._preproc_expression),
        field('content', content($)),
        field('alternative', optional(alternativeBlock($))),
-@@ -2504,7 +2520,7 @@ function preprocIf(suffix, content, precedence = 0) {
+@@ -2506,7 +2522,7 @@ function preprocIf(suffix, content, precedence = 0) {
      ['preproc_elifdef' + suffix]: $ => prec(precedence, seq(
        choice(preprocessor('elifdef'), preprocessor('elifndef')),
        field('name', $.identifier),