Add PredefinedLabel::Missing to represent nodes that could not be r…

…esolved.
NomicFoundation · Jan 14, 2025 · 0eca315 · 0eca315
1 parent 756deb9
commit 0eca315
Show file tree

Hide file tree

Showing 52 changed files with 110 additions and 156 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/codegen/language/definition/src/model/manifest.rs b/crates/codegen/language/definition/src/model/manifest.rs
@@ -181,6 +181,7 @@ pub struct Topic {
 pub enum PredefinedLabel {
     Root,
     Unrecognized,
+    Missing,
     Item,
     Variant,
     Separator,

diff --git a/crates/codegen/runtime/cargo/crate/src/runtime/cst/generated/edge_label.rs b/crates/codegen/runtime/cargo/crate/src/runtime/cst/generated/edge_label.rs
diff --git a/crates/codegen/runtime/cargo/crate/src/runtime/parser/parser_support/parser_function.rs b/crates/codegen/runtime/cargo/crate/src/runtime/parser/parser_support/parser_function.rs
@@ -79,16 +79,10 @@ where
                     }
                 }
                 let input = &input[start.utf8..];
-                let kind = if input.is_empty() {
-                    TerminalKind::MISSING
+                let (kind, label) = if input.is_empty() {
+                    (TerminalKind::MISSING, EdgeLabel::Missing)
                 } else {
-                    TerminalKind::UNRECOGNIZED
-                };
-
-                let label = if kind == TerminalKind::UNRECOGNIZED {
-                    EdgeLabel::Unrecognized
-                } else {
-                    EdgeLabel::default()
+                    (TerminalKind::UNRECOGNIZED, EdgeLabel::Unrecognized)
                 };
 
                 let node = Node::terminal(kind, input.to_string());
@@ -146,16 +140,10 @@ where
                     } else {
                         start
                     };
-                    let kind = if input[start..].is_empty() {
-                        TerminalKind::MISSING
-                    } else {
-                        TerminalKind::UNRECOGNIZED
-                    };
-
-                    let label = if kind == TerminalKind::UNRECOGNIZED {
-                        EdgeLabel::Unrecognized
+                    let (kind, label) = if input[start..].is_empty() {
+                        (TerminalKind::MISSING, EdgeLabel::Missing)
                     } else {
-                        EdgeLabel::default()
+                        (TerminalKind::UNRECOGNIZED, EdgeLabel::Unrecognized)
                     };
 
                     let skipped_node = Node::terminal(kind, input[start..].to_string());

diff --git a/crates/codegen/runtime/cargo/crate/src/runtime/parser/parser_support/separated_helper.rs b/crates/codegen/runtime/cargo/crate/src/runtime/parser/parser_support/separated_helper.rs
@@ -51,16 +51,10 @@ impl SeparatedHelper {
                     match skip_until_with_nested_delims::<_, LexCtx>(input, lexer, separator) {
                         // A separator was found, so we can recover the incomplete match
                         Some((found, skipped_range)) if found == separator => {
-                            let kind = if skipped_range.is_empty() {
-                                TerminalKind::MISSING
+                            let (kind, label) = if skipped_range.is_empty() {
+                                (TerminalKind::MISSING, EdgeLabel::Missing)
                             } else {
-                                TerminalKind::UNRECOGNIZED
-                            };
-
-                            let label = if kind == TerminalKind::UNRECOGNIZED {
-                                EdgeLabel::Unrecognized
-                            } else {
-                                EdgeLabel::default()
+                                (TerminalKind::UNRECOGNIZED, EdgeLabel::Unrecognized)
                             };
 
                             accum.push(Edge {

diff --git a/crates/codegen/runtime/cargo/crate/src/runtime/parser/parser_support/sequence_helper.rs b/crates/codegen/runtime/cargo/crate/src/runtime/parser/parser_support/sequence_helper.rs
@@ -155,16 +155,10 @@ impl SequenceHelper {
                     });
                     debug_assert_eq!(next_terminal, Ok(Some(running.found)));
 
-                    let kind = if running.skipped.is_empty() {
-                        TerminalKind::MISSING
+                    let (kind, label) = if running.skipped.is_empty() {
+                        (TerminalKind::MISSING, EdgeLabel::Missing)
                     } else {
-                        TerminalKind::UNRECOGNIZED
-                    };
-
-                    let label = if kind == TerminalKind::UNRECOGNIZED {
-                        EdgeLabel::Unrecognized
-                    } else {
-                        EdgeLabel::default()
+                        (TerminalKind::UNRECOGNIZED, EdgeLabel::Unrecognized)
                     };
 
                     running.nodes.push(Edge{label, node: Node::terminal(

diff --git a/crates/codegen/runtime/cargo/wasm/src/runtime/interface/generated/cst.wit b/crates/codegen/runtime/cargo/wasm/src/runtime/interface/generated/cst.wit
diff --git a/crates/codegen/runtime/npm/package/wasm/generated/interfaces/nomic-foundation-slang-cst.d.ts b/crates/codegen/runtime/npm/package/wasm/generated/interfaces/nomic-foundation-slang-cst.d.ts
diff --git a/crates/solidity/outputs/cargo/crate/generated/public_api.txt b/crates/solidity/outputs/cargo/crate/generated/public_api.txt
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/cst/generated/edge_label.rs b/crates/solidity/outputs/cargo/crate/src/generated/cst/generated/edge_label.rs
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/parser/parser_support/parser_function.rs b/crates/solidity/outputs/cargo/crate/src/generated/parser/parser_support/parser_function.rs
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/parser/parser_support/separated_helper.rs b/crates/solidity/outputs/cargo/crate/src/generated/parser/parser_support/separated_helper.rs
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/parser/parser_support/sequence_helper.rs b/crates/solidity/outputs/cargo/crate/src/generated/parser/parser_support/sequence_helper.rs
diff --git a/crates/solidity/outputs/cargo/wasm/src/generated/interface/generated/cst.wit b/crates/solidity/outputs/cargo/wasm/src/generated/interface/generated/cst.wit
diff --git a/...es/solidity/outputs/npm/package/wasm/generated/interfaces/nomic-foundation-slang-cst.d.ts b/...es/solidity/outputs/npm/package/wasm/generated/interfaces/nomic-foundation-slang-cst.d.ts
diff --git a/...g/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml b/...g/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.4.11-failure.yml
@@ -29,7 +29,7 @@ Tree:
                   - (leading_trivia꞉ Whitespace): "  " # (16..18)
                   - (item꞉ Identifier): "field" # (18..23)
               - (attributes꞉ StateVariableAttributes): [] # (23..23)
-              - (root꞉ MISSING): "" # (23..23)
+              - (missing꞉ MISSING): "" # (23..23)
               - (semicolon꞉ Semicolon): ";" # (23..24)
               - (trailing_trivia꞉ EndOfLine): "\n" # (24..25)
       - (close_brace꞉ CloseBrace): "}" # (25..26)

diff --git a/...ng/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.0-failure.yml b/...ng/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.0-failure.yml
@@ -29,7 +29,7 @@ Tree:
                   - (leading_trivia꞉ Whitespace): "  " # (16..18)
                   - (item꞉ Identifier): "field" # (18..23)
               - (attributes꞉ StateVariableAttributes): [] # (23..23)
-              - (root꞉ MISSING): "" # (23..23)
+              - (missing꞉ MISSING): "" # (23..23)
               - (semicolon꞉ Semicolon): ";" # (23..24)
               - (trailing_trivia꞉ EndOfLine): "\n" # (24..25)
       - (close_brace꞉ CloseBrace): "}" # (25..26)

diff --git a/...ng/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml b/...ng/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.6.5-failure.yml
@@ -29,7 +29,7 @@ Tree:
                   - (leading_trivia꞉ Whitespace): "  " # (16..18)
                   - (item꞉ Identifier): "field" # (18..23)
               - (attributes꞉ StateVariableAttributes): [] # (23..23)
-              - (root꞉ MISSING): "" # (23..23)
+              - (missing꞉ MISSING): "" # (23..23)
               - (semicolon꞉ Semicolon): ";" # (23..24)
               - (trailing_trivia꞉ EndOfLine): "\n" # (24..25)
       - (close_brace꞉ CloseBrace): "}" # (25..26)

diff --git a/...g/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.8.27-failure.yml b/...g/snapshots/cst_output/ContractDefinition/missing_field_type/generated/0.8.27-failure.yml
@@ -29,7 +29,7 @@ Tree:
                   - (leading_trivia꞉ Whitespace): "  " # (16..18)
                   - (item꞉ Identifier): "field" # (18..23)
               - (attributes꞉ StateVariableAttributes): [] # (23..23)
-              - (root꞉ MISSING): "" # (23..23)
+              - (missing꞉ MISSING): "" # (23..23)
               - (semicolon꞉ Semicolon): ";" # (23..24)
               - (trailing_trivia꞉ EndOfLine): "\n" # (24..25)
       - (close_brace꞉ CloseBrace): "}" # (25..26)

diff --git a/...ting/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml b/...ting/snapshots/cst_output/ContractDefinition/recovery_testbed/generated/0.8.0-failure.yml
@@ -146,7 +146,7 @@ Tree:
                                       - (leading_trivia꞉ Whitespace): " " # (195..196)
                                       - (name꞉ Identifier): "sequence" # (196..204)
                                       - (leading_trivia꞉ Whitespace): " " # (204..205)
-                              - (root꞉ MISSING): "" # (205..205)
+                              - (missing꞉ MISSING): "" # (205..205)
                               - (close_brace꞉ CloseBrace): "}" # (205..206)
                               - (trailing_trivia꞉ EndOfLine): "\n" # (206..207)
                   - (leading_trivia꞉ Whitespace): "\t" # (207..208)

diff --git a/...ng/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.11-failure.yml b/...ng/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.11-failure.yml
@@ -21,4 +21,4 @@ Tree:
       - (leading_trivia꞉ Whitespace): " " # (15..16)
       - (open_brace꞉ OpenBrace): "{" # (16..17)
       - (members꞉ ContractMembers): [] # (17..17)
-      - (root꞉ MISSING): "" # (17..17)
+      - (missing꞉ MISSING): "" # (17..17)
diff --git a/...ng/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.22-failure.yml b/...ng/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.4.22-failure.yml
@@ -21,4 +21,4 @@ Tree:
       - (leading_trivia꞉ Whitespace): " " # (15..16)
       - (open_brace꞉ OpenBrace): "{" # (16..17)
       - (members꞉ ContractMembers): [] # (17..17)
-      - (root꞉ MISSING): "" # (17..17)
+      - (missing꞉ MISSING): "" # (17..17)
diff --git a/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.6.0-failure.yml b/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.6.0-failure.yml
@@ -21,4 +21,4 @@ Tree:
       - (leading_trivia꞉ Whitespace): " " # (15..16)
       - (open_brace꞉ OpenBrace): "{" # (16..17)
       - (members꞉ ContractMembers): [] # (17..17)
-      - (root꞉ MISSING): "" # (17..17)
+      - (missing꞉ MISSING): "" # (17..17)
diff --git a/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.0-failure.yml b/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.0-failure.yml
@@ -21,4 +21,4 @@ Tree:
       - (leading_trivia꞉ Whitespace): " " # (15..16)
       - (open_brace꞉ OpenBrace): "{" # (16..17)
       - (members꞉ ContractMembers): [] # (17..17)
-      - (root꞉ MISSING): "" # (17..17)
+      - (missing꞉ MISSING): "" # (17..17)
diff --git a/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.4-failure.yml b/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.4-failure.yml
@@ -21,4 +21,4 @@ Tree:
       - (leading_trivia꞉ Whitespace): " " # (15..16)
       - (open_brace꞉ OpenBrace): "{" # (16..17)
       - (members꞉ ContractMembers): [] # (17..17)
-      - (root꞉ MISSING): "" # (17..17)
+      - (missing꞉ MISSING): "" # (17..17)
diff --git a/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.8-failure.yml b/...ing/snapshots/cst_output/ContractDefinition/unterminated_body/generated/0.8.8-failure.yml
@@ -21,4 +21,4 @@ Tree:
       - (leading_trivia꞉ Whitespace): " " # (15..16)
       - (open_brace꞉ OpenBrace): "{" # (16..17)
       - (members꞉ ContractMembers): [] # (17..17)
-      - (root꞉ MISSING): "" # (17..17)
+      - (missing꞉ MISSING): "" # (17..17)
diff --git a/...ting/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml b/...ting/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.4.11-failure.yml
@@ -275,7 +275,7 @@ Tree:
                           - (item꞉ Expression): # "some." (522..527)
                               - (variant꞉ Identifier): "some" # (522..526)
                               - (period꞉ Period): "." # (526..527)
-                          - (root꞉ MISSING): "" # (527..527)
+                          - (missing꞉ MISSING): "" # (527..527)
                           - (root꞉ Comma): "," # (527..528)
                           - (item꞉ Expression) ► (variant꞉ MemberAccessExpression): # " next.arg" (528..537)
                               - (operand꞉ Expression): # " next" (528..533)

diff --git a/...sting/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.0-failure.yml b/...sting/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.0-failure.yml
@@ -270,7 +270,7 @@ Tree:
                           - (item꞉ IdentifierPath): # "some." (522..527)
                               - (item꞉ Identifier): "some" # (522..526)
                               - (separator꞉ Period): "." # (526..527)
-                          - (root꞉ MISSING): "" # (527..527)
+                          - (missing꞉ MISSING): "" # (527..527)
                           - (root꞉ Comma): "," # (527..528)
                           - (item꞉ IdentifierPath): # " next.arg" (528..537)
                               - (leading_trivia꞉ Whitespace): " " # (528..529)

diff --git a/...sting/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml b/...sting/snapshots/cst_output/ContractMembers/separated_recovery/generated/0.6.2-failure.yml
@@ -197,7 +197,7 @@ Tree:
                                   - (item꞉ NamedArgument): # " no_semicolon" (208..221)
                                       - (leading_trivia꞉ Whitespace): " " # (208..209)
                                       - (name꞉ Identifier): "no_semicolon" # (209..221)
-                                  - (root꞉ MISSING): "" # (221..221)
+                                  - (missing꞉ MISSING): "" # (221..221)
                                   - (root꞉ Comma): "," # (221..222)
                               - (leading_trivia꞉ Whitespace): " " # (222..223)
                               - (unrecognized꞉ UNRECOGNIZED): ", " # (223..225)
@@ -334,7 +334,7 @@ Tree:
                           - (item꞉ IdentifierPath): # "some." (522..527)
                               - (item꞉ Identifier): "some" # (522..526)
                               - (separator꞉ Period): "." # (526..527)
-                          - (root꞉ MISSING): "" # (527..527)
+                          - (missing꞉ MISSING): "" # (527..527)
                           - (root꞉ Comma): "," # (527..528)
                           - (item꞉ IdentifierPath): # " next.arg" (528..537)
                               - (leading_trivia꞉ Whitespace): " " # (528..529)