Various cleanup for initializers and typechecks

Author: kddnewton

.gitignore

@@ -65,6 +65,7 @@ out.svg
 /sig/prism/node.rbs
 /sig/prism/visitor.rbs
 /sig/prism/_private/dot_visitor.rbs
+/rbi/prism/dsl.rb
 /rbi/prism/node.rbi
 /rbi/prism/visitor.rbi
 

gemfiles/typecheck/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gemspec path: "../.."
+# gemspec path: "../.."
 
 gem "minitest"
 gem "parser"

gemfiles/typecheck/Gemfile.lock

@@ -1,8 +1,3 @@
-PATH
-  remote: ../..
-  specs:
-    prism (0.30.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -42,6 +37,7 @@ GEM
       ast (~> 2.4.1)
       racc
     power_assert (2.0.3)
+    prism (0.30.0)
     racc (1.8.0)
     rainbow (3.1.1)
     rake (13.2.1)
@@ -118,7 +114,6 @@ PLATFORMS
 DEPENDENCIES
   minitest
   parser
-  prism!
   rake
   rake-compiler
   rbs

lib/prism/parse_result.rb

@@ -588,6 +588,7 @@ class ParseResult < Result
     autoload :Newlines, "prism/parse_result/newlines"
 
     private_constant :Comments
+    private_constant :Errors
     private_constant :Newlines
 
     # The syntax tree that was parsed from the source code.

lib/prism/parse_result/errors.rb

@@ -32,19 +32,19 @@ def format
         io = StringIO.new
         source_lines.each.with_index(1) do |line, line_number|
           io.puts(line)
-  
+
           (error_lines.delete(line_number) || []).each do |error|
             location = error.location
-  
+
             case line_number
             when location.start_line
               io.print(" " * location.start_column + "^")
-  
+
               if location.start_line == location.end_line
                 if location.start_column != location.end_column
                   io.print("~" * (location.end_column - location.start_column - 1))
                 end
-  
+
                 io.puts(" " + error.message)
               else
                 io.puts("~" * (line.bytesize - location.start_column))
@@ -56,7 +56,7 @@ def format
             end
           end
         end
-  
+
         io.puts
         io.string
       end

prism.gemspec

@@ -104,6 +104,7 @@ Gem::Specification.new do |spec|
     "prism.gemspec",
     "rbi/prism.rbi",
     "rbi/prism/compiler.rbi",
+    "rbi/prism/dsl.rbi",
     "rbi/prism/inspect_visitor.rbi",
     "rbi/prism/node_ext.rbi",
     "rbi/prism/node.rbi",

rbi/prism/dsl.rbi

@@ -40,9 +40,6 @@ enum NodeFieldType {
     #[serde(rename = "uint32")]
     UInt32,
 
-    #[serde(rename = "flags")]
-    Flags,
-
     #[serde(rename = "integer")]
     Integer,
 
@@ -85,6 +82,8 @@ struct Flags {
 struct Node {
     name: String,
 
+    flags: Option<String>,
+
     #[serde(default)]
     fields: Vec<NodeField>,
 
@@ -235,6 +234,28 @@ fn write_node(file: &mut File, flags: &[Flags], node: &Node) -> Result<(), Box<d
     writeln!(file, "        let pointer: *mut pm_location_t = unsafe {{ &mut (*self.pointer).base.location }};")?;
     writeln!(file, "        Location::new(self.parser, unsafe {{ &(*pointer) }})")?;
     writeln!(file, "    }}")?;
+    writeln!(file)?;
+    writeln!(file, "    /// Returns the flags of this node.")?;
+    writeln!(file, "    #[must_use]")?;
+    writeln!(file, "    pub fn flags(&self) -> pm_node_flags_t {{")?;
+    writeln!(file, "        unsafe {{ (*self.pointer).base.flags }}")?;
+    writeln!(file, "    }}")?;
+
+    if let Some(kind) = &node.flags {
+        let our_flags = flags.iter().filter(|f| &f.name == kind).collect::<Vec<_>>();
+        assert!(our_flags.len() == 1);
+
+        for flag in our_flags {
+            for value in &flag.values {
+                writeln!(file)?;
+                writeln!(file, "    /// {}", value.comment)?;
+                writeln!(file, "    #[must_use]")?;
+                writeln!(file, "    pub fn {}(&self) -> bool {{", accessor_func_name(&value.name))?;
+                writeln!(file, "        (self.flags() & {}) != 0", enum_const_name(&flag.name, &value.name))?;
+                writeln!(file, "    }}")?;
+            }
+        }
+    }
 
     for field in &node.fields {
         writeln!(file)?;
@@ -335,27 +356,6 @@ fn write_node(file: &mut File, flags: &[Flags], node: &Node) -> Result<(), Box<d
                 writeln!(file, "        unsafe {{ (*self.pointer).{} }}", field.name)?;
                 writeln!(file, "    }}")?;
             },
-            NodeFieldType::Flags => {
-                let Some(NodeFieldKind::Concrete(kind)) = &field.kind else {
-                    panic!("Flag fields must have a concrete kind");
-                };
-                let our_flags = flags.iter().filter(|f| &f.name == kind).collect::<Vec<_>>();
-                assert!(our_flags.len() == 1);
-
-                writeln!(file, "    fn {}(&self) -> pm_node_flags_t {{", field.name)?;
-                writeln!(file, "        unsafe {{ (*self.pointer).base.flags }}")?;
-                writeln!(file, "    }}")?;
-
-                for flag in our_flags {
-                    for value in &flag.values {
-                        writeln!(file, "    /// {}", value.comment)?;
-                        writeln!(file, "    #[must_use]")?;
-                        writeln!(file, "    pub fn {}(&self) -> bool {{", accessor_func_name(&value.name))?;
-                        writeln!(file, "        (self.{}() & {}) != 0", field.name, enum_const_name(&flag.name, &value.name))?;
-                        writeln!(file, "    }}")?;
-                    }
-                }
-            },
             NodeFieldType::Integer => {
                 writeln!(file, "    pub fn {}(&self) -> Integer<'pr> {{", field.name)?;
                 writeln!(file, "        Integer::new(unsafe {{ &(*self.pointer).{} }})", field.name)?;

rust/ruby-prism/build.rs

@@ -49,6 +49,13 @@ module Prism
       def nearest_targets: (Prism::node, comment) -> (untyped | ::Array[untyped])
     end
 
+    class Errors
+      attr_reader parse_result: ParseResult
+
+      def initialize: (ParseResult parse_result) -> void
+      def format: () -> String
+    end
+
     class Newlines < Visitor
       @newline_marked: Array[bool]
 

sig/prism/_private/parse_result.rbs

@@ -17,6 +17,8 @@ module Prism
     def character_column: (Integer byte_offset) -> Integer
     def code_units_offset: (Integer byte_offset, Encoding encoding) -> Integer
     def code_units_column: (Integer byte_offset, Encoding encoding) -> Integer
+
+    def self.for: (String source) -> Source
   end
 
   class ASCIISource < Source