Remove "on error" types from config.yml

Author: thomasmarshall

config.yml

@@ -811,7 +811,6 @@ nodes:
           - GlobalVariableReadNode
           - BackReferenceReadNode
           - NumberedReferenceReadNode
-          - on error: ErrorRecoveryNode
         comment: |
           Represents the old name of the global variable that can be used before aliasing.
 
@@ -852,7 +851,6 @@ nodes:
         kind:
           - SymbolNode
           - InterpolatedSymbolNode
-          - on error: ErrorRecoveryNode
         comment: |
           Represents the old name of the method that will be aliased.
 
@@ -1865,7 +1863,6 @@ nodes:
         kind:
           - ConstantReadNode
           - ConstantPathNode
-          - on error: ErrorRecoveryNode
       - name: inheritance_operator_loc
         type: location?
         comment: |
@@ -2462,9 +2459,7 @@ nodes:
                                ^^^^^^
       - name: right
         type: node
-        kind:
-          - SplatNode
-          - on error: ErrorRecoveryNode
+        kind: SplatNode
         comment: |
           Represents the second wildcard node in the pattern.
 
@@ -2547,7 +2542,6 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
-          - on error: ErrorRecoveryNode
         comment: |
           The index expression for `for` loops.
 
@@ -3301,7 +3295,6 @@ nodes:
           - EmbeddedStatementsNode
           - EmbeddedVariableNode
           - InterpolatedStringNode # `"a" "#{b}"`
-          - on error: ErrorRecoveryNode
       - name: closing_loc
         type: location?
     newline: parts
@@ -3697,7 +3690,6 @@ nodes:
         kind:
           - ConstantReadNode
           - ConstantPathNode
-          - on error: ErrorRecoveryNode # module Parent module end
       - name: body
         type: node?
         kind:
@@ -3727,7 +3719,6 @@ nodes:
           - IndexTargetNode
           - MultiTargetNode
           - RequiredParameterNode # def m((a,b)); end
-          - on error: ErrorRecoveryNode
         comment: |
           Represents the targets expressions before a splat node.
 
@@ -3771,7 +3762,6 @@ nodes:
           - IndexTargetNode
           - MultiTargetNode
           - RequiredParameterNode # def m((*,b)); end
-          - on error: ErrorRecoveryNode
         comment: |
           Represents the targets expressions after a splat node.
 
@@ -3815,7 +3805,6 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
-          - on error: ErrorRecoveryNode
         comment: |
           Represents the targets expressions before a splat node.
 
@@ -3858,7 +3847,6 @@ nodes:
           - CallTargetNode
           - IndexTargetNode
           - MultiTargetNode
-          - on error: ErrorRecoveryNode
         comment: |
           Represents the targets expressions after a splat node.
 
@@ -4044,7 +4032,6 @@ nodes:
         kind:
           - RequiredParameterNode
           - MultiTargetNode
-          - on error: ErrorRecoveryNode
       - name: keywords
         type: node[]
         kind:
@@ -4129,7 +4116,6 @@ nodes:
           - BackReferenceReadNode # foo in ^$&
           - NumberedReferenceReadNode # foo in ^$1
           - ItLocalVariableReadNode # proc { 1 in ^it }
-          - on error: ErrorRecoveryNode # foo in ^Bar
         comment: |
           The variable used in the pinned expression
 
@@ -4327,7 +4313,6 @@ nodes:
           - ConstantPathTargetNode
           - CallTargetNode
           - IndexTargetNode
-          - on error: ErrorRecoveryNode
       - name: then_keyword_loc
         type: location?
       - name: statements

rust/ruby-prism/build.rs

@@ -47,27 +47,12 @@ enum NodeFieldType {
     Double,
 }
 
-#[derive(Debug, Deserialize)]
-#[allow(dead_code)]
-struct OnErrorType {
-    #[serde(rename = "on error")]
-    kind: String,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(untagged)]
-#[allow(dead_code)]
-enum UnionKind {
-    OnSuccess(String),
-    OnError(OnErrorType),
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 #[allow(dead_code)]
 enum NodeFieldKind {
     Concrete(String),
-    Union(Vec<UnionKind>),
+    Union(Vec<String>),
 }
 
 #[derive(Debug, Deserialize)]

src/prism.c

@@ -3814,21 +3814,17 @@ pm_find_pattern_node_create(pm_parser_t *parser, pm_node_list_t *nodes) {
     pm_splat_node_t *left_splat_node = (pm_splat_node_t *) left;
 
     pm_node_t *right;
+    pm_splat_node_t *right_splat_node;
 
     if (nodes->size == 1) {
-        right = UP(pm_missing_node_create(parser, left->location.end, left->location.end));
+        right = left;
+        right_splat_node = left_splat_node;
     } else {
         right = nodes->nodes[nodes->size - 1];
         assert(PM_NODE_TYPE_P(right, PM_SPLAT_NODE));
+        right_splat_node = (pm_splat_node_t *) right;
     }
 
-#if PRISM_SERIALIZE_ONLY_SEMANTICS_FIELDS
-    // FindPatternNode#right is typed as SplatNode in this case, so replace the potential ErrorRecoveryNode with a SplatNode.
-    // The resulting AST will anyway be ignored, but this file still needs to compile.
-    pm_splat_node_t *right_splat_node = PM_NODE_TYPE_P(right, PM_SPLAT_NODE) ? (pm_splat_node_t *) right : left_splat_node;
-#else
-    pm_node_t *right_splat_node = right;
-#endif
     *node = (pm_find_pattern_node_t) {
         .base = PM_NODE_INIT_NODES(parser, PM_FIND_PATTERN_NODE, 0, left, right),
         .constant = NULL,

templates/template.rb

@@ -8,7 +8,6 @@
 module Prism
   module Template
     SERIALIZE_ONLY_SEMANTICS_FIELDS = ENV.fetch("PRISM_SERIALIZE_ONLY_SEMANTICS_FIELDS", false)
-    REMOVE_ON_ERROR_TYPES = SERIALIZE_ONLY_SEMANTICS_FIELDS
     CHECK_FIELD_KIND = ENV.fetch("CHECK_FIELD_KIND", false)
 
     JAVA_BACKEND = ENV["PRISM_JAVA_BACKEND"] || "truffleruby"
@@ -432,13 +431,10 @@ def initialize(config, flags)
                 when "pattern expression"
                   # the list of all possible types is too long with 37+ different classes
                   "Node"
-                when Hash
-                  kind = kind.fetch("on error")
-                  REMOVE_ON_ERROR_TYPES ? nil : kind
                 else
                   kind
                 end
-              end.compact
+              end
               if kinds.size == 1
                 kinds = kinds.first
                 kinds = nil if kinds == "Node"