mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ripper: Preserve indentation

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-05-12 11:59:44 +09:00
parent 147134b474
commit 47efdae602
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/ripper/tools/dsl.rb
View File

@ -20,9 +20,9 @@ class DSL
NAME_PATTERN = /(?>\$|\d+|[a-zA-Z_][a-zA-Z0-9_]*|\[[a-zA-Z_.][-a-zA-Z0-9_.]*\])(?>(?:\.|->)[a-zA-Z_][a-zA-Z0-9_]*)*/.source
NOT_REF_PATTERN = /(?>\#.*|[^\"$@]*|"(?>\\.|[^\"])*")/.source
def self.line?(line, lineno = nil)
if %r</\*% *ripper(?:\[(.*?)\])?: *(.*?) *%\*/> =~ line
new($2, $1&.split(",") || [], lineno)
def self.line?(line, lineno = nil, indent: nil)
if %r<(?<space>\s*)/\*% *ripper(?:\[(?<option>.*?)\])?: *(?<code>.*?) *%\*/> =~ line
new(code, option&.split(",") || [], lineno, indent: indent || space)
end
end
@ -38,8 +38,9 @@ class DSL
end
}
def initialize(code, options, lineno = nil)
def initialize(code, options, lineno = nil, indent: "\t\t\t")
@lineno = lineno
@indent = indent
@events = {}
@error = options.include?("error")
@brace = options.include?("brace")
@ -80,7 +81,7 @@ class DSL
s = "{VALUE #{ (1..@vars).map {|v| "v#{ v }" }.join(",") };#{ s }}" if @vars > 0
s << "ripper_error(p);" if @error
s = "{#{ s }}" if @brace
"\t\t\t#{s}"
"#{@indent}#{s}"
end
def new_var

2
ext/ripper/tools/preproc.rb
View File

@ -56,7 +56,7 @@ require_relative 'dsl'
def generate_line(f, out)
while line = f.gets
case
when gen = DSL.line?(line)
when gen = DSL.line?(line, f.lineno)
out << gen.generate << "\n"
when line.start_with?("%%")
out << "%%\n"