+ XML
+
+ namespace = doc.root.not_nil!.namespace.should be_a XML::Namespace
+ namespace.href.should eq "http://a9.com/-/spec/opensearchrss/1.0/"
+ namespace.prefix.should eq "openSearch"
+ end
+ end
+
+ describe "with a default prefix" do
+ it "return the default namespace" do
+ doc = XML.parse(<<-XML)
+
+
+ XML
+
+ namespace = doc.root.not_nil!.namespace.should be_a XML::Namespace
+ namespace.href.should eq "http://a9.com/-/spec/opensearchrss/1.0/"
+ namespace.prefix.should be_nil
+ end
+ end
+
+ describe "without an explicit declaration on the node" do
+ it "returns the related namespace" do
+ doc = XML.parse(<<-XML)
+
+
+
+
+
+ XML
+
+ root = doc.root.not_nil!
+
+ namespace = root.children[1].namespace.should be_a XML::Namespace
+ namespace.href.should eq "http://www.w3.org/2005/Atom"
+ namespace.prefix.should be_nil
+
+ namespace = root.children[3].namespace.should be_a XML::Namespace
+ namespace.href.should eq "https://a-namespace"
+ namespace.prefix.should eq "a"
+ end
+ end
+ end
+
+ describe "when the node does not have namespace" do
+ it "should return nil" do
+ doc = XML.parse(<<-XML)
+
+
+ XML
+
+ doc.root.not_nil!.namespace.should be_nil
+ end
+ end
- namespaces.size.should eq(2)
- namespaces[0].href.should eq("http://www.w3.org/2005/Atom")
- namespaces[0].prefix.should be_nil
- namespaces[1].href.should eq("http://a9.com/-/spec/opensearchrss/1.0/")
- namespaces[1].prefix.should eq("openSearch")
+ describe "when the element does not have a namespace, but has namespace declarations" do
+ it "should return nil" do
+ doc = XML.parse(<<-XML)
+
+
+ XML
+
+ doc.root.not_nil!.namespace.should be_nil
+ end
+ end
end
- it "returns empty array if no namespaces scopes exists" do
- doc = XML.parse(<<-XML
-
- John
- XML
- )
- namespaces = doc.root.not_nil!.namespace_scopes
+ describe "#namespace_definitions" do
+ it "returns namespaces explicitly defined" do
+ doc = XML.parse(<<-XML)
+
+
+ ...
- # tag (looks better). If there isn't a match, we want to preserve the code tag.
- def begin_inline_code
- super
- @inside_inline_code = true
- @code_buffer.clear
+ def code(node : Markd::Node, entering : Bool)
+ tag("code") do
+ if in_link?(node)
+ output(node.text)
+ else
+ literal(expand_code_links(node.text))
+ end
+ end
end
- def end_inline_code
- @inside_inline_code = false
+ def in_link?(node)
+ parent = node.parent?
+ return false unless parent
+ return true if parent.type.link?
- @io << expand_code_links(@code_buffer.to_s)
- super
+ in_link?(parent)
end
def expand_code_links(text : String) : String
@@ -87,71 +107,50 @@ class Crystal::Doc::Markdown::DocRenderer < Crystal::Doc::Markdown::HTMLRenderer
end
end
- def begin_code(language = nil)
- if language.nil? || language == "cr"
- language = "crystal"
- end
-
- super
-
- if language == "crystal"
- @inside_code = true
- @code_buffer.clear
- end
- end
-
- def end_code
- if @inside_code
- text = Highlighter.highlight(@code_buffer.to_s)
- @io << text
- end
-
- @inside_code = false
-
- super
- end
-
- def begin_link(url)
- @io << %()
+ def code_block(node : Markd::Node, entering : Bool)
+ languages = node.fence_language ? node.fence_language.split : nil
+ code_tag_attrs = attrs(node)
+ pre_tag_attrs = if @options.prettyprint
+ {"class" => "prettyprint"}
+ else
+ nil
+ end
- @inside_link = true
- end
-
- def end_link
- super
- @inside_link = false
- end
+ language = languages.try &.first?.try &.strip
+ language = nil if language.try &.empty?
- def text(text)
- if @inside_code
- @code_buffer << text
- return
+ if language.nil? || language == "cr"
+ language = "crystal"
end
- if @inside_link
- super
- return
+ if language
+ code_tag_attrs ||= {} of String => String
+ code_tag_attrs["class"] = "language-#{escape(language)}"
end
- if @inside_inline_code
- @code_buffer << text
- return
+ newline
+ tag("pre", pre_tag_attrs) do
+ tag("code", code_tag_attrs) do
+ code = node.text.chomp
+ if language == "crystal"
+ literal(Highlighter.highlight code)
+ else
+ output(code)
+ end
+ end
end
-
- super(text)
+ newline
end
- def type_link(type, text)
+ private def type_link(type, text)
%(#{text})
end
- def method_link(method, text)
+ private def method_link(method, text)
%(#{text})
end
- def lookup_method(type, name, args, kind = nil)
+ private def lookup_method(type, name, args, kind = nil)
case args
when ""
args_count = nil
diff --git a/src/compiler/crystal/tools/doc/markdown/html_renderer.cr b/src/compiler/crystal/tools/doc/markdown/html_renderer.cr
deleted file mode 100644
index 3e6880bcc597..000000000000
--- a/src/compiler/crystal/tools/doc/markdown/html_renderer.cr
+++ /dev/null
@@ -1,121 +0,0 @@
-require "./renderer"
-
-class Crystal::Doc::Markdown::HTMLRenderer
- include Renderer
-
- def initialize(@io : IO)
- end
-
- def begin_paragraph
- @io << ""
- end
-
- def end_paragraph
- @io << "
"
- end
-
- def begin_italic
- @io << ""
- end
-
- def end_italic
- @io << ""
- end
-
- def begin_bold
- @io << ""
- end
-
- def end_bold
- @io << ""
- end
-
- def begin_header(level : Int32, anchor : String) : Nil
- @io << "'
- @io << Crystal::Doc.anchor_link(anchor)
- end
-
- def end_header(level)
- @io << "'
- end
-
- def begin_inline_code
- @io << ""
- end
-
- def end_inline_code
- @io << ""
- end
-
- def begin_code(language)
- if language.nil?
- @io << ""
- else
- @io << %()
- end
- end
-
- def end_code
- @io << "
"
- end
-
- def begin_quote
- @io << ""
- end
-
- def end_quote
- @io << "
"
- end
-
- def begin_unordered_list
- @io << ""
- end
-
- def end_unordered_list
- @io << "
"
- end
-
- def begin_ordered_list
- @io << ""
- end
-
- def end_ordered_list
- @io << "
"
- end
-
- def begin_list_item
- @io << ""
- end
-
- def end_list_item
- @io << ""
- end
-
- def begin_link(url)
- @io << %()
- end
-
- def end_link
- @io << ""
- end
-
- def image(url, alt)
- @io << %(![)
- @io << alt
- @io << %(]()
- @io << url
- @io << %()
)
- end
-
- def text(text)
- @io << text.gsub('<', "<")
- end
-
- def horizontal_rule
- @io << "
"
- end
-end
diff --git a/src/compiler/crystal/tools/doc/markdown/markdown.cr b/src/compiler/crystal/tools/doc/markdown/markdown.cr
deleted file mode 100644
index 90c595010168..000000000000
--- a/src/compiler/crystal/tools/doc/markdown/markdown.cr
+++ /dev/null
@@ -1,36 +0,0 @@
-# Basic implementation of Markdown for the `crystal doc` tool.
-#
-# It lacks many features and it has some bugs too. Eventually we should replace
-# it with something more feature-complete (like https://github.com/icyleaf/markd)
-# but that means the compiler will start depending on external shards. Otherwise
-# we should extract the doc as a separate tool/binary.
-# We don't expose this library in the standard library because it's probable
-# that we will never make it feature complete.
-#
-# Usage:
-#
-# ```
-# require "compiler/crystal/tools/doc/markdown"
-#
-# text = "## This is title \n This is a [link](https://crystal-lang.org)"
-#
-# Crystal::Doc::Markdown.to_html(text)
-# # => This is title
-# # => This is a link
-# ```
-module Crystal::Doc::Markdown
- def self.parse(text, renderer)
- parser = Parser.new(text, renderer)
- parser.parse
- end
-
- def self.to_html(text) : String
- String.build do |io|
- parse text, Markdown::HTMLRenderer.new(io)
- end
- end
-end
-
-require "./parser"
-require "./renderer"
-require "./html_renderer"
diff --git a/src/compiler/crystal/tools/doc/markdown/parser.cr b/src/compiler/crystal/tools/doc/markdown/parser.cr
deleted file mode 100644
index d6fc1509aadb..000000000000
--- a/src/compiler/crystal/tools/doc/markdown/parser.cr
+++ /dev/null
@@ -1,642 +0,0 @@
-class Crystal::Doc::Markdown::Parser
- record PrefixHeader, count : Int32
- record UnorderedList, char : Char
- record CodeFence, language : String
-
- @lines : Array(String)
-
- def initialize(text : String, @renderer : Renderer)
- @lines = text.lines
- @line = 0
- end
-
- def parse
- while @line < @lines.size
- process_paragraph
- end
- end
-
- def process_paragraph
- line = @lines[@line]
-
- case item = classify(line)
- when :empty
- @line += 1
- when :header1
- render_header 1, line, 2
- when :header2
- render_header 2, line, 2
- when PrefixHeader
- render_prefix_header(item.count, line)
- when :code
- render_code
- when :horizontal_rule
- render_horizontal_rule
- when UnorderedList
- render_unordered_list(item.char)
- when CodeFence
- render_fenced_code(item.language)
- when :ordered_list
- render_ordered_list
- when :quote
- render_quote
- else
- render_paragraph
- end
- end
-
- def classify(line)
- if empty? line
- return :empty
- end
-
- if pounds = count_pounds line
- return PrefixHeader.new(pounds)
- end
-
- if line.starts_with? " "
- return :code
- end
-
- if horizontal_rule? line
- return :horizontal_rule
- end
-
- if starts_with_bullet_list_marker?(line, '*')
- return UnorderedList.new('*')
- end
-
- if starts_with_bullet_list_marker?(line, '+')
- return UnorderedList.new('+')
- end
-
- if starts_with_bullet_list_marker?(line, '-')
- return UnorderedList.new('-')
- end
-
- if (code_fence = code_fence?(line))
- return code_fence
- end
-
- if starts_with_digits_dot? line
- return :ordered_list
- end
-
- if line.starts_with? ">"
- return :quote
- end
-
- if next_line_is_all?('=')
- return :header1
- end
-
- if next_line_is_all?('-')
- return :header2
- end
-
- nil
- end
-
- def render_prefix_header(level, line)
- bytesize = line.bytesize
- str = line.to_unsafe
- pos = level
- while pos < bytesize && str[pos].unsafe_chr.ascii_whitespace?
- pos += 1
- end
-
- render_header level, line.byte_slice(pos), 1
- end
-
- def render_header(level : Int32, line : String, increment : Int32)
- anchor = line
- .underscore # Underscore the string
- .gsub(/[^\w\d\s\-.~]/, "") # Delete unsafe URL characters
- .strip # Strip leading/trailing whitespace
- .gsub(/[\s_-]+/, '-') # Replace `_` and leftover whitespace with `-`
-
- @renderer.begin_header level, anchor
- process_line line
- @renderer.end_header level
- @line += increment
-
- append_double_newline_if_has_more
- end
-
- def render_paragraph
- @renderer.begin_paragraph
-
- join_next_lines continue_on: nil
- process_line @lines[@line]
- @line += 1
-
- @renderer.end_paragraph
-
- append_double_newline_if_has_more
- end
-
- def render_code
- @renderer.begin_code nil
-
- while true
- line = @lines[@line]
-
- break unless has_code_spaces? line
-
- @renderer.text line.byte_slice(Math.min(line.bytesize, 4))
- @line += 1
-
- if @line == @lines.size
- break
- end
-
- if next_lines_empty_of_code?
- break
- end
-
- newline
- end
-
- @renderer.end_code
-
- append_double_newline_if_has_more
- end
-
- def render_fenced_code(language : String)
- line = @lines[@line]
-
- @renderer.begin_code language.presence
-
- @line += 1
-
- if @line < @lines.size
- while true
- line = @lines[@line]
-
- @renderer.text line
- @line += 1
-
- if (@line == @lines.size)
- break
- end
-
- if code_fence? @lines[@line]
- @line += 1
- break
- end
-
- newline
- end
- end
-
- @renderer.end_code
-
- append_double_newline_if_has_more
- end
-
- def render_quote
- @renderer.begin_quote
-
- join_next_lines continue_on: :quote
- line = @lines[@line]
-
- process_line line.byte_slice(line.index('>').not_nil! + 1)
-
- @line += 1
-
- @renderer.end_quote
-
- append_double_newline_if_has_more
- end
-
- def render_unordered_list(prefix = '*')
- @renderer.begin_unordered_list
-
- while true
- break unless starts_with_bullet_list_marker?(@lines[@line], prefix)
-
- join_next_lines continue_on: nil, stop_on: UnorderedList.new(prefix)
- line = @lines[@line]
-
- if empty? line
- @line += 1
-
- if @line == @lines.size
- break
- end
-
- next
- end
-
- if line.starts_with?(" ") && previous_line_is_not_intended_and_starts_with_bullet_list_marker?(prefix)
- @renderer.begin_unordered_list
- end
-
- @renderer.begin_list_item
- process_line line.byte_slice(line.index(prefix).not_nil! + 1)
- @renderer.end_list_item
-
- if line.starts_with?(" ") && next_line_is_not_intended?
- @renderer.end_unordered_list
- end
-
- @line += 1
-
- if @line == @lines.size
- break
- end
- end
-
- @renderer.end_unordered_list
-
- append_double_newline_if_has_more
- end
-
- def render_ordered_list
- @renderer.begin_ordered_list
-
- while true
- break unless starts_with_digits_dot? @lines[@line]
-
- join_next_lines continue_on: nil, stop_on: :ordered_list
- line = @lines[@line]
-
- if empty? line
- @line += 1
-
- if @line == @lines.size
- break
- end
-
- next
- end
-
- @renderer.begin_list_item
- process_line line.byte_slice(line.index('.').not_nil! + 1)
- @renderer.end_list_item
- @line += 1
-
- if @line == @lines.size
- break
- end
- end
-
- @renderer.end_ordered_list
-
- append_double_newline_if_has_more
- end
-
- def append_double_newline_if_has_more
- if @line < @lines.size
- newline
- newline
- end
- end
-
- def process_line(line)
- bytesize = line.bytesize
- str = line.to_unsafe
- pos = 0
-
- while pos < bytesize && str[pos].unsafe_chr.ascii_whitespace?
- pos += 1
- end
-
- cursor = pos
- one_star = false
- two_stars = false
- one_underscore = false
- two_underscores = false
- in_link = false
- last_is_space = true
-
- while pos < bytesize
- case str[pos].unsafe_chr
- when '*'
- if pos + 1 < bytesize && str[pos + 1].unsafe_chr == '*'
- if two_stars || has_closing?('*', 2, str, (pos + 2), bytesize)
- @renderer.text line.byte_slice(cursor, pos - cursor)
- pos += 1
- cursor = pos + 1
- if two_stars
- @renderer.end_bold
- else
- @renderer.begin_bold
- end
- two_stars = !two_stars
- end
- elsif one_star || has_closing?('*', 1, str, (pos + 1), bytesize)
- @renderer.text line.byte_slice(cursor, pos - cursor)
- cursor = pos + 1
- if one_star
- @renderer.end_italic
- else
- @renderer.begin_italic
- end
- one_star = !one_star
- end
- when '_'
- if pos + 1 < bytesize && str[pos + 1].unsafe_chr == '_'
- if two_underscores || (last_is_space && has_closing?('_', 2, str, (pos + 2), bytesize))
- @renderer.text line.byte_slice(cursor, pos - cursor)
- pos += 1
- cursor = pos + 1
- if two_underscores
- @renderer.end_bold
- else
- @renderer.begin_bold
- end
- two_underscores = !two_underscores
- end
- elsif one_underscore || (last_is_space && has_closing?('_', 1, str, (pos + 1), bytesize))
- @renderer.text line.byte_slice(cursor, pos - cursor)
- cursor = pos + 1
- if one_underscore
- @renderer.end_italic
- else
- @renderer.begin_italic
- end
- one_underscore = !one_underscore
- end
- when '`'
- if has_closing?('`', 1, str, (pos + 1), bytesize)
- @renderer.text line.byte_slice(cursor, pos - cursor)
- cursor = pos + 1
- @renderer.begin_inline_code
- idx = (str + pos + 1).to_slice(bytesize).index('`'.ord).not_nil!
- @renderer.text line.byte_slice(cursor, idx)
- pos = pos + 1 + idx
- @renderer.end_inline_code
- cursor = pos + 1
- end
- when '!'
- if pos + 1 < bytesize && str[pos + 1] === '['
- link = check_link str, (pos + 2), bytesize
- if link
- @renderer.text line.byte_slice(cursor, pos - cursor)
-
- bracket_idx = (str + pos + 2).to_slice(bytesize - pos - 2).index(']'.ord).not_nil!
- alt = line.byte_slice(pos + 2, bracket_idx)
-
- @renderer.image link, alt
-
- paren_idx = (str + pos + 2 + bracket_idx + 1).to_slice(bytesize - pos - 2 - bracket_idx - 1).index(')'.ord).not_nil!
- pos += 2 + bracket_idx + 1 + paren_idx
- cursor = pos + 1
- end
- end
- when '['
- unless in_link
- if link = check_link str, (pos + 1), bytesize
- @renderer.text line.byte_slice(cursor, pos - cursor)
- cursor = pos + 1
- @renderer.begin_link link
- in_link = true
- end
- end
- when ']'
- if in_link
- @renderer.text line.byte_slice(cursor, pos - cursor)
- @renderer.end_link
-
- paren_idx = (str + pos + 1).to_slice(bytesize - pos - 1).index(')'.ord).not_nil!
- pos += paren_idx + 1
- cursor = pos + 1
- in_link = false
- end
- end
- last_is_space = pos < bytesize && str[pos].unsafe_chr.ascii_whitespace?
- pos += 1
- end
-
- @renderer.text line.byte_slice(cursor, pos - cursor)
- end
-
- def empty?(line)
- line_is_all? line, ' '
- end
-
- def has_closing?(char, count, str, pos, bytesize)
- str += pos
- bytesize -= pos
- idx = str.to_slice(bytesize).index char.ord
- return false unless idx
-
- if count == 2
- return false unless idx + 1 < bytesize && str[idx + 1].unsafe_chr == char
- end
-
- !str[idx - 1].unsafe_chr.ascii_whitespace?
- end
-
- def check_link(str, pos, bytesize)
- # We need to count nested brackets to do it right
- bracket_count = 1
- while pos < bytesize
- case str[pos].unsafe_chr
- when '['
- bracket_count += 1
- when ']'
- bracket_count -= 1
- if bracket_count == 0
- break
- end
- end
- pos += 1
- end
-
- return nil unless bracket_count == 0
- bracket_idx = pos
-
- return nil unless str[bracket_idx + 1] === '('
-
- paren_idx = (str + bracket_idx + 1).to_slice(bytesize - bracket_idx - 1).index ')'.ord
- return nil unless paren_idx
-
- String.new(Slice.new(str + bracket_idx + 2, paren_idx - 1))
- end
-
- def next_line_is_all?(char)
- return false unless @line + 1 < @lines.size
-
- line = @lines[@line + 1]
- return false if line.empty?
-
- line_is_all? line, char
- end
-
- def line_is_all?(line, char)
- line.each_byte do |byte|
- return false if byte != char.ord
- end
- true
- end
-
- def count_pounds(line)
- bytesize = line.bytesize
- str = line.to_unsafe
- pos = 0
- while pos < bytesize && pos < 6 && str[pos].unsafe_chr == '#'
- pos += 1
- end
- pos == 0 ? nil : pos
- end
-
- def has_code_spaces?(line)
- bytesize = line.bytesize
- str = line.to_unsafe
- pos = 0
- while pos < bytesize && pos < 4 && str[pos].unsafe_chr.ascii_whitespace?
- pos += 1
- end
-
- if pos < 4
- pos == bytesize
- else
- true
- end
- end
-
- def starts_with_bullet_list_marker?(line, prefix = nil)
- bytesize = line.bytesize
- str = line.to_unsafe
- pos = 0
- while pos < bytesize && str[pos].unsafe_chr.ascii_whitespace?
- pos += 1
- end
-
- return false unless pos < bytesize
- return false unless prefix ? str[pos].unsafe_chr == prefix : (str[pos].unsafe_chr == '*' || str[pos].unsafe_chr == '-' || str[pos].unsafe_chr == '+')
-
- pos += 1
-
- return false unless pos < bytesize
- str[pos].unsafe_chr.ascii_whitespace?
- end
-
- def previous_line_is_not_intended_and_starts_with_bullet_list_marker?(prefix)
- previous_line = @lines[@line - 1]
- !previous_line.starts_with?(" ") && starts_with_bullet_list_marker?(previous_line, prefix)
- end
-
- def next_line_is_not_intended?
- return true unless @line + 1 < @lines.size
-
- next_line = @lines[@line + 1]
- !next_line.starts_with?(" ")
- end
-
- def code_fence?(line)
- return nil unless line.starts_with?("```")
- language = line.lstrip('`').strip
- return nil if language.includes? '`'
- CodeFence.new(language)
- end
-
- def starts_with_digits_dot?(line)
- bytesize = line.bytesize
- str = line.to_unsafe
- pos = 0
- while pos < bytesize && str[pos].unsafe_chr.ascii_whitespace?
- pos += 1
- end
-
- return false unless pos < bytesize
- return false unless str[pos].unsafe_chr.ascii_number?
-
- while pos < bytesize && str[pos].unsafe_chr.ascii_number?
- pos += 1
- end
-
- return false unless pos < bytesize
- str[pos].unsafe_chr == '.'
- end
-
- def next_lines_empty_of_code?
- line_number = @line
-
- while line_number < @lines.size
- line = @lines[line_number]
-
- if empty? line
- # Nothing
- elsif has_code_spaces? line
- return false
- else
- return true
- end
-
- line_number += 1
- end
-
- return true
- end
-
- def horizontal_rule?(line)
- non_space_char = nil
- count = 1
-
- line.each_char do |char|
- next if char.ascii_whitespace?
-
- if non_space_char
- if char == non_space_char
- count += 1
- else
- return false
- end
- else
- case char
- when '*', '-', '_'
- non_space_char = char
- else
- return false
- end
- end
- end
-
- count >= 3
- end
-
- def render_horizontal_rule
- @renderer.horizontal_rule
- @line += 1
- end
-
- def newline
- @renderer.text "\n"
- end
-
- # Join this line with next lines if they form a paragraph,
- # until next lines don't start another entity like a list,
- # header, etc.
- def join_next_lines(continue_on = :none, stop_on = :none)
- start = @line
- line = @line
- line += 1
- while line < @lines.size
- item = classify(@lines[line])
-
- case item
- when continue_on
- # continue
- when stop_on
- line -= 1
- break
- when nil
- # paragraph: continue
- else
- line -= 1
- break
- end
-
- line += 1
- end
- line -= 1 if line == @lines.size
-
- if line > start
- @lines[line] = (start..line).join('\n') { |i| @lines[i] }
- @line = line
- end
- end
-end
diff --git a/src/compiler/crystal/tools/doc/markdown/renderer.cr b/src/compiler/crystal/tools/doc/markdown/renderer.cr
deleted file mode 100644
index b278ac3e827b..000000000000
--- a/src/compiler/crystal/tools/doc/markdown/renderer.cr
+++ /dev/null
@@ -1,27 +0,0 @@
-module Crystal::Doc::Markdown::Renderer
- abstract def begin_paragraph
- abstract def end_paragraph
- abstract def begin_italic
- abstract def end_italic
- abstract def begin_bold
- abstract def end_bold
- abstract def begin_header(level : Int32, anchor : String) : Nil
- abstract def end_header(level)
- abstract def begin_inline_code
- abstract def end_inline_code
- abstract def begin_code(language)
- abstract def end_code
- abstract def begin_quote
- abstract def end_quote
- abstract def begin_unordered_list
- abstract def end_unordered_list
- abstract def begin_ordered_list
- abstract def end_ordered_list
- abstract def begin_list_item
- abstract def end_list_item
- abstract def begin_link(url)
- abstract def end_link
- abstract def image(url, alt)
- abstract def text(text)
- abstract def horizontal_rule
-end
diff --git a/src/compiler/crystal/tools/doc/type.cr b/src/compiler/crystal/tools/doc/type.cr
index faa09f51bf50..6c10b70e646a 100644
--- a/src/compiler/crystal/tools/doc/type.cr
+++ b/src/compiler/crystal/tools/doc/type.cr
@@ -176,7 +176,7 @@ class Crystal::Doc::Type
defs << method(def_with_metadata.def, false)
end
end
- defs.sort_by!(stable: true, &.name.downcase)
+ defs.sort_by!(&.name.downcase)
end
end
end
@@ -201,7 +201,7 @@ class Crystal::Doc::Type
end
end
end
- class_methods.sort_by!(stable: true, &.name.downcase)
+ class_methods.sort_by!(&.name.downcase)
end
end
@@ -225,7 +225,7 @@ class Crystal::Doc::Type
end
end
end
- macros.sort_by!(stable: true, &.name.downcase)
+ macros.sort_by!(&.name.downcase)
end
end
@@ -786,7 +786,7 @@ class Crystal::Doc::Type
builder.field "full_name", full_name
builder.field "name", name
builder.field "abstract", abstract?
- builder.field "superclass" { superclass.try(&.to_json_simple(builder)) || builder.scalar(nil) }
+ builder.field "superclass" { (s = superclass) ? s.to_json_simple(builder) : builder.null }
builder.field "ancestors" do
builder.array do
ancestors.each &.to_json_simple(builder)
@@ -821,7 +821,7 @@ class Crystal::Doc::Type
including_types.each &.to_json_simple(builder)
end
end
- builder.field "namespace" { namespace.try(&.to_json_simple(builder)) || builder.scalar(nil) }
+ builder.field "namespace" { (n = namespace) ? n.to_json_simple(builder) : builder.null }
builder.field "doc", doc
builder.field "summary", formatted_summary
builder.field "class_methods", class_methods
diff --git a/src/compiler/crystal/tools/formatter.cr b/src/compiler/crystal/tools/formatter.cr
index 1ded41bea0b0..d5f56aed4d32 100644
--- a/src/compiler/crystal/tools/formatter.cr
+++ b/src/compiler/crystal/tools/formatter.cr
@@ -3568,7 +3568,16 @@ module Crystal
write " " unless has_parentheses
skip_space
- if exp.is_a?(TupleLiteral) && @token.type != :"{"
+ # If the number of consecutive `{`s starting a tuple literal is 1 less
+ # than the level of tuple nesting in the actual AST node, this means the
+ # parser synthesized a TupleLiteral from multiple expressions, e.g.
+ #
+ # return {1, 2}, 3, 4
+ # return { {1, 2}, 3, 4 }
+ #
+ # The tuple depth is 2 in both cases but only 1 leading curly brace is
+ # present on the first return.
+ if exp.is_a?(TupleLiteral) && opening_curly_brace_count < leading_tuple_depth(exp)
format_args(exp.elements, has_parentheses)
skip_space if has_parentheses
else
@@ -3582,6 +3591,26 @@ module Crystal
false
end
+ def opening_curly_brace_count
+ @lexer.peek_ahead do
+ count = 0
+ while @lexer.token.type == :"{"
+ count += 1
+ @lexer.next_token_skip_space_or_newline
+ end
+ count
+ end
+ end
+
+ def leading_tuple_depth(exp)
+ count = 0
+ while exp.is_a?(TupleLiteral)
+ count += 1
+ exp = exp.elements.first?
+ end
+ count
+ end
+
def visit(node : Yield)
if scope = node.scope
write_keyword :with, " "
diff --git a/src/compiler/crystal/tools/playground/server.cr b/src/compiler/crystal/tools/playground/server.cr
index b6ddd6d629c3..69b1f80b57db 100644
--- a/src/compiler/crystal/tools/playground/server.cr
+++ b/src/compiler/crystal/tools/playground/server.cr
@@ -4,7 +4,7 @@ require "http/server"
require "log"
require "ecr/macros"
require "compiler/crystal/tools/formatter"
-require "compiler/crystal/tools/doc/markdown"
+require "../../../../../lib/markd/src/markd"
module Crystal::Playground
Log = ::Log.for("crystal.playground")
@@ -247,7 +247,7 @@ module Crystal::Playground
end
if extname == ".md" || extname == ".cr"
- content = Crystal::Doc::Markdown.to_html(content)
+ content = Markd.to_html(content)
end
content
rescue e
diff --git a/src/compiler/crystal/tools/print_hierarchy.cr b/src/compiler/crystal/tools/print_hierarchy.cr
index 513a53c2574e..b8f4c09cbfba 100644
--- a/src/compiler/crystal/tools/print_hierarchy.cr
+++ b/src/compiler/crystal/tools/print_hierarchy.cr
@@ -3,23 +3,24 @@ require "colorize"
require "../syntax/ast"
module Crystal
- def self.print_hierarchy(program, exp, format)
+ def self.print_hierarchy(program, io, exp, format)
case format
when "text"
- HierarchyPrinter.new(program, exp).execute
+ TextHierarchyPrinter.new(program, io, exp).execute
when "json"
- JSONHierarchyPrinter.new(program, exp).execute
+ JSONHierarchyPrinter.new(program, io, exp).execute
else
raise "Unknown hierarchy format: #{format}"
end
end
- class HierarchyPrinter
+ abstract class HierarchyPrinter
+ abstract def print_all
+
@llvm_typer : LLVMTyper
def initialize(@program : Program, exp : String?)
@exp = exp ? Regex.new(exp) : nil
- @indents = [] of Bool
@targets = Set(Type).new
@llvm_typer = @program.llvm_typer
end
@@ -29,9 +30,7 @@ module Crystal
compute_targets(@program.types, exp, false)
end
- with_color.light_gray.bold.surround(STDOUT) do
- print_type @program.object
- end
+ print_all
end
def compute_targets(types : Array, exp, must_include = false)
@@ -95,6 +94,35 @@ module Crystal
false
end
+ def must_print?(type : NonGenericClassType | GenericClassType)
+ !@exp || @targets.includes?(type)
+ end
+
+ def must_print?(type)
+ false
+ end
+
+ def type_size(type)
+ @llvm_typer.size_of(@llvm_typer.llvm_struct_type(type))
+ end
+
+ def ivar_size(ivar)
+ @llvm_typer.size_of(@llvm_typer.llvm_embedded_type(ivar.type))
+ end
+ end
+
+ class TextHierarchyPrinter < HierarchyPrinter
+ def initialize(program : Program, @io : IO, exp : String?)
+ super(program, exp)
+ @indents = [] of Bool
+ end
+
+ def print_all
+ with_color.light_gray.bold.surround(@io) do
+ print_type @program.object
+ end
+ end
+
def print_subtypes(types)
types = types.sort_by &.to_s
types.each_with_index do |type, i|
@@ -110,8 +138,7 @@ module Crystal
unless @indents.empty?
print_indent
- print "|"
- puts
+ @io << "|\n"
end
print_type type
@@ -119,36 +146,19 @@ module Crystal
def print_type_name(type)
print_indent
- print "+" unless @indents.empty?
- print "- "
- print type.struct? ? "struct" : "class"
- print " "
- print type
+ @io << "+" unless @indents.empty?
+ @io << "- " << (type.struct? ? "struct" : "class") << " " << type
if (type.is_a?(NonGenericClassType) || type.is_a?(GenericClassInstanceType)) &&
!type.is_a?(PointerInstanceType) && !type.is_a?(ProcInstanceType)
- size = @llvm_typer.size_of(@llvm_typer.llvm_struct_type(type))
- with_color.light_gray.surround(STDOUT) do
- print " ("
- print size.to_s
- print " bytes)"
+ with_color.light_gray.surround(@io) do
+ @io << " (" << type_size(type) << " bytes)"
end
end
- puts
+ @io << '\n'
end
- def print_type(type : NonGenericClassType | GenericClassInstanceType)
- print_type_name type
-
- subtypes = type.subclasses.select { |sub| must_print?(sub) }
- print_instance_vars type, !subtypes.empty?
-
- with_indent do
- print_subtypes subtypes
- end
- end
-
- def print_type(type : GenericClassType)
+ def print_type(type : GenericClassType | NonGenericClassType | GenericClassInstanceType)
print_type_name type
subtypes = type.subclasses.select { |sub| must_print?(sub) }
@@ -171,19 +181,13 @@ module Crystal
instance_vars.each do |name, var|
print_indent
- print (@indents.last ? "|" : " ")
- if has_subtypes
- print " . "
- else
- print " "
- end
+ @io << (@indents.last ? "|" : " ") << (has_subtypes ? " . " : " ")
- with_color.light_gray.surround(STDOUT) do
- print name.ljust(max_name_size)
- print " : "
- print var
+ with_color.light_gray.surround(@io) do
+ name.ljust(@io, max_name_size)
+ @io << " : " << var
end
- puts
+ @io << '\n'
end
end
@@ -196,63 +200,40 @@ module Crystal
max_name_size = instance_vars.max_of &.name.size
- if typed_instance_vars.empty?
- max_type_size = 0
- max_bytes_size = 0
- else
- max_type_size = typed_instance_vars.max_of &.type.to_s.size
- max_bytes_size = typed_instance_vars.max_of { |var| @llvm_typer.size_of(@llvm_typer.llvm_embedded_type(var.type)).to_s.size }
- end
+ max_type_size = typed_instance_vars.max_of?(&.type.to_s.size) || 0
+ max_bytes_size = typed_instance_vars.max_of? { |var| ivar_size(var).to_s.size } || 0
instance_vars.each do |ivar|
print_indent
- print (@indents.last ? "|" : " ")
- if has_subtypes
- print " . "
- else
- print " "
- end
+ @io << (@indents.last ? "|" : " ") << (has_subtypes ? " . " : " ")
- with_color.light_gray.surround(STDOUT) do
- print ivar.name.ljust(max_name_size)
- print " : "
+ with_color.light_gray.surround(@io) do
+ ivar.name.ljust(@io, max_name_size)
+ @io << " : "
if ivar_type = ivar.type?
- print ivar_type.to_s.ljust(max_type_size)
- size = @llvm_typer.size_of(@llvm_typer.llvm_embedded_type(ivar_type))
- with_color.light_gray.surround(STDOUT) do
- print " ("
- print size.to_s.rjust(max_bytes_size)
- print " bytes)"
+ ivar_type.to_s.ljust(@io, max_type_size)
+ with_color.light_gray.surround(@io) do
+ @io << " ("
+ ivar_size(ivar).to_s.rjust(@io, max_bytes_size)
+ @io << " bytes)"
end
else
- print "MISSING".colorize.red.bright
+ @io << "MISSING".colorize.red.bright
end
end
- puts
+ @io << '\n'
end
end
- def must_print?(type : NonGenericClassType)
- !(@exp && !@targets.includes?(type))
- end
-
- def must_print?(type : GenericClassType)
- !(@exp && !@targets.includes?(type))
- end
-
- def must_print?(type)
- false
- end
-
def print_indent
unless @indents.empty?
- print " "
+ @io << " "
0.upto(@indents.size - 2) do |i|
indent = @indents[i]
if indent
- print "| "
+ @io << "| "
else
- print " "
+ @io << " "
end
end
end
@@ -270,27 +251,28 @@ module Crystal
end
class JSONHierarchyPrinter < HierarchyPrinter
- def execute
- if exp = @exp
- compute_targets(@program.types, exp, false)
- end
+ def initialize(program : Program, io : IO, exp : String?)
+ super(program, exp)
+ @json = JSON::Builder.new(io)
+ end
- JSON.build(STDOUT) do |json|
- json.object do
- print_type(@program.object, json)
+ def print_all
+ @json.document do
+ @json.object do
+ print_type(@program.object)
end
end
end
- def print_subtypes(types, json)
+ def print_subtypes(types)
types = types.sort_by &.to_s
- json.field "sub_types" do
- json.array do
+ @json.field "sub_types" do
+ @json.array do
types.each_with_index do |type, index|
if must_print? type
- json.object do
- print_type(type, json)
+ @json.object do
+ print_type(type)
end
end
end
@@ -298,57 +280,57 @@ module Crystal
end
end
- def print_type_name(type, json)
- json.field "name", type.to_s
- json.field "kind", type.struct? ? "struct" : "class"
+ def print_type_name(type)
+ @json.field "name", type.to_s
+ @json.field "kind", type.struct? ? "struct" : "class"
if (type.is_a?(NonGenericClassType) || type.is_a?(GenericClassInstanceType)) &&
!type.is_a?(PointerInstanceType) && !type.is_a?(ProcInstanceType)
- json.field "size_in_bytes", @llvm_typer.size_of(@llvm_typer.llvm_struct_type(type))
+ @json.field "size_in_bytes", type_size(type)
end
end
- def print_type(type : GenericClassType | NonGenericClassType | GenericClassInstanceType, json)
- print_type_name(type, json)
+ def print_type(type : GenericClassType | NonGenericClassType | GenericClassInstanceType)
+ print_type_name(type)
subtypes = type.subclasses.select { |sub| must_print?(sub) }
- print_instance_vars(type, !subtypes.empty?, json)
- print_subtypes(subtypes, json)
+ print_instance_vars(type, !subtypes.empty?)
+ print_subtypes(subtypes)
end
- def print_type(type, json)
+ def print_type(type)
# Nothing to do
end
- def print_instance_vars(type : GenericClassType, has_subtypes, json)
+ def print_instance_vars(type : GenericClassType, has_subtypes)
instance_vars = type.instance_vars
return if instance_vars.empty?
- json.field "instance_vars" do
- json.array do
+ @json.field "instance_vars" do
+ @json.array do
instance_vars.each do |name, var|
- json.object do
- json.field "name", name.to_s
- json.field "type", var.to_s
+ @json.object do
+ @json.field "name", name.to_s
+ @json.field "type", var.to_s
end
end
end
end
end
- def print_instance_vars(type, has_subtypes, json)
+ def print_instance_vars(type, has_subtypes)
instance_vars = type.instance_vars
return if instance_vars.empty?
instance_vars = instance_vars.values
- json.field "instance_vars" do
- json.array do
+ @json.field "instance_vars" do
+ @json.array do
instance_vars.each do |instance_var|
if ivar_type = instance_var.type?
- json.object do
- json.field "name", instance_var.name.to_s
- json.field "type", ivar_type.to_s
- json.field "size_in_bytes", @llvm_typer.size_of(@llvm_typer.llvm_embedded_type(ivar_type))
+ @json.object do
+ @json.field "name", instance_var.name.to_s
+ @json.field "type", ivar_type.to_s
+ @json.field "size_in_bytes", ivar_size(instance_var)
end
end
end
diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
index c0188f475c03..a527208a4bbf 100644
--- a/src/compiler/crystal/types.cr
+++ b/src/compiler/crystal/types.cr
@@ -294,8 +294,8 @@ module Crystal
end
end
- def filter_by(other_type)
- restrict other_type, MatchContext.new(self, self, strict: true)
+ def filter_by(other_type : Type)
+ Type.common_descendent(self, other_type)
end
def filter_by_responds_to(name)
@@ -1603,6 +1603,8 @@ module Crystal
end
def run_instance_var_initializer(initializer, instance : GenericClassInstanceType | NonGenericClassType)
+ return if instance.unbound?
+
meta_vars = MetaVars.new
visitor = MainVisitor.new(program, vars: meta_vars, meta_vars: meta_vars)
visitor.scope = instance.metaclass
@@ -3152,6 +3154,9 @@ module Crystal
property? used = false
property? visited = false
+ # Was this const's value cleaned up by CleanupTransformer yet?
+ property? cleaned_up = false
+
# Is this constant accessed with pointerof(...)?
property? pointer_read = false
@@ -3339,6 +3344,10 @@ module Crystal
delegate lookup_first_def, to: instance_type.metaclass
+ def replace_type_parameters(instance)
+ base_type.replace_type_parameters(instance).virtual_type.metaclass
+ end
+
def each_concrete_type
instance_type.subtypes.each do |type|
yield type.metaclass
diff --git a/src/compress/deflate/reader.cr b/src/compress/deflate/reader.cr
index 9a185d809a9c..bde3a187d0fb 100644
--- a/src/compress/deflate/reader.cr
+++ b/src/compress/deflate/reader.cr
@@ -130,7 +130,7 @@ class Compress::Deflate::Reader < IO
end
# Closes this reader.
- def unbuffered_close
+ def unbuffered_close : Nil
return if @closed
@closed = true
@@ -140,7 +140,7 @@ class Compress::Deflate::Reader < IO
@io.close if @sync_close
end
- def unbuffered_rewind
+ def unbuffered_rewind : Nil
check_open
@io.rewind
diff --git a/src/compress/deflate/writer.cr b/src/compress/deflate/writer.cr
index e844604f9b6a..1efcef87cdaa 100644
--- a/src/compress/deflate/writer.cr
+++ b/src/compress/deflate/writer.cr
@@ -54,7 +54,7 @@ class Compress::Deflate::Writer < IO
end
# See `IO#flush`.
- def flush
+ def flush : Nil
return if @closed
consume_output LibZ::Flush::SYNC_FLUSH
@@ -62,7 +62,7 @@ class Compress::Deflate::Writer < IO
end
# Closes this writer. Must be invoked after all data has been written.
- def close
+ def close : Nil
return if @closed
@closed = true
diff --git a/src/compress/gzip/reader.cr b/src/compress/gzip/reader.cr
index 63b5530dcad7..56dac99326d9 100644
--- a/src/compress/gzip/reader.cr
+++ b/src/compress/gzip/reader.cr
@@ -138,7 +138,7 @@ class Compress::Gzip::Reader < IO
end
# Closes this reader.
- def unbuffered_close
+ def unbuffered_close : Nil
return if @closed
@closed = true
@@ -146,7 +146,7 @@ class Compress::Gzip::Reader < IO
@io.close if @sync_close
end
- def unbuffered_rewind
+ def unbuffered_rewind : Nil
check_open
@io.rewind
diff --git a/src/compress/gzip/writer.cr b/src/compress/gzip/writer.cr
index 9cdbe02a370c..3d82548e2d2c 100644
--- a/src/compress/gzip/writer.cr
+++ b/src/compress/gzip/writer.cr
@@ -88,7 +88,7 @@ class Compress::Gzip::Writer < IO
# data has been written yet.
#
# See `IO#flush`.
- def flush
+ def flush : Nil
check_open
flate_io = write_header
@@ -96,7 +96,7 @@ class Compress::Gzip::Writer < IO
end
# Closes this writer. Must be invoked after all data has been written.
- def close
+ def close : Nil
return if @closed
@closed = true
diff --git a/src/compress/zip/file.cr b/src/compress/zip/file.cr
index 6ac8f6972022..843b0758f0a4 100644
--- a/src/compress/zip/file.cr
+++ b/src/compress/zip/file.cr
@@ -75,7 +75,7 @@ class Compress::Zip::File
end
# Closes this zip file.
- def close
+ def close : Nil
return if @closed
@closed = true
if @sync_close
diff --git a/src/compress/zip/reader.cr b/src/compress/zip/reader.cr
index 080620536a97..9763eb71d2e4 100644
--- a/src/compress/zip/reader.cr
+++ b/src/compress/zip/reader.cr
@@ -101,7 +101,7 @@ class Compress::Zip::Reader
end
# Closes this zip reader.
- def close
+ def close : Nil
return if @closed
@closed = true
@io.close if @sync_close
diff --git a/src/compress/zip/writer.cr b/src/compress/zip/writer.cr
index 2acd1570765d..5c5741d7371c 100644
--- a/src/compress/zip/writer.cr
+++ b/src/compress/zip/writer.cr
@@ -151,14 +151,14 @@ class Compress::Zip::Writer
end
# Adds an entry that will have *string* as its contents.
- def add(filename_or_entry : String | Entry, string : String)
+ def add(filename_or_entry : String | Entry, string : String) : Nil
add(filename_or_entry) do |io|
io << string
end
end
# Adds an entry that will have *bytes* as its contents.
- def add(filename_or_entry : String | Entry, bytes : Bytes)
+ def add(filename_or_entry : String | Entry, bytes : Bytes) : Nil
add(filename_or_entry) do |io|
io.write(bytes)
end
@@ -167,7 +167,7 @@ class Compress::Zip::Writer
# Adds an entry that will have its data copied from the given *data*.
# If the given *data* is a `::File`, it is automatically closed
# after data is copied from it.
- def add(filename_or_entry : String | Entry, data : IO)
+ def add(filename_or_entry : String | Entry, data : IO) : Nil
add(filename_or_entry) do |io|
IO.copy(data, io)
data.close if data.is_a?(::File)
@@ -175,13 +175,13 @@ class Compress::Zip::Writer
end
# Adds a directory entry that will have the given *name*.
- def add_dir(name)
+ def add_dir(name) : Nil
name = name + '/' unless name.ends_with?('/')
add(Entry.new(name)) { }
end
# Closes this zip writer.
- def close
+ def close : Nil
return if @closed
@closed = true
diff --git a/src/compress/zlib/reader.cr b/src/compress/zlib/reader.cr
index df6eecb84ffe..953e313e255a 100644
--- a/src/compress/zlib/reader.cr
+++ b/src/compress/zlib/reader.cr
@@ -89,7 +89,7 @@ class Compress::Zlib::Reader < IO
raise IO::Error.new "Can't flush Compress::Zlib::Reader"
end
- def unbuffered_close
+ def unbuffered_close : Nil
return if @closed
@closed = true
@@ -97,7 +97,7 @@ class Compress::Zlib::Reader < IO
@io.close if @sync_close
end
- def unbuffered_rewind
+ def unbuffered_rewind : Nil
check_open
@io.rewind
diff --git a/src/compress/zlib/writer.cr b/src/compress/zlib/writer.cr
index 03e27cf07ab5..bb711be40dc0 100644
--- a/src/compress/zlib/writer.cr
+++ b/src/compress/zlib/writer.cr
@@ -59,7 +59,7 @@ class Compress::Zlib::Writer < IO
# data has been written yet.
#
# See `IO#flush`.
- def flush
+ def flush : Nil
check_open
write_header unless @wrote_header
@@ -67,7 +67,7 @@ class Compress::Zlib::Writer < IO
end
# Closes this writer. Must be invoked after all data has been written.
- def close
+ def close : Nil
return if @closed
@closed = true
diff --git a/src/crystal/system/unix/file.cr b/src/crystal/system/unix/file.cr
index a6808e21d9a9..850a32fa0f28 100644
--- a/src/crystal/system/unix/file.cr
+++ b/src/crystal/system/unix/file.cr
@@ -130,10 +130,10 @@ module Crystal::System::File
raise ::File::Error.from_os_error("Cannot read link", Errno::ENAMETOOLONG, file: path)
end
- def self.rename(old_filename, new_filename)
+ def self.rename(old_filename, new_filename) : ::File::Error?
code = LibC.rename(old_filename.check_no_null_byte, new_filename.check_no_null_byte)
if code != 0
- raise ::File::Error.from_errno("Error renaming file", file: old_filename, other: new_filename)
+ ::File::Error.from_errno("Error renaming file", file: old_filename, other: new_filename)
end
end
diff --git a/src/crystal/system/win32/file.cr b/src/crystal/system/win32/file.cr
index 8ecdbb6893bc..756e443976e2 100644
--- a/src/crystal/system/win32/file.cr
+++ b/src/crystal/system/win32/file.cr
@@ -203,9 +203,9 @@ module Crystal::System::File
raise NotImplementedError.new("readlink")
end
- def self.rename(old_path : String, new_path : String) : Nil
+ def self.rename(old_path : String, new_path : String) : ::File::Error?
if LibC.MoveFileExW(to_windows_path(old_path), to_windows_path(new_path), LibC::MOVEFILE_REPLACE_EXISTING) == 0
- raise ::File::Error.from_winerror("Error renaming file", file: old_path, other: new_path)
+ ::File::Error.from_winerror("Error renaming file", file: old_path, other: new_path)
end
end
diff --git a/src/csv.cr b/src/csv.cr
index 1b8e89e07a1f..494931d8f10e 100644
--- a/src/csv.cr
+++ b/src/csv.cr
@@ -296,7 +296,7 @@ class CSV
end
# Rewinds this CSV to the beginning, rewinding the underlying IO if any.
- def rewind
+ def rewind : Nil
@parser.rewind
@parser.next_row if @headers
@traversed = false
diff --git a/src/csv/builder.cr b/src/csv/builder.cr
index 49c8c2149cbd..49410f9647ac 100644
--- a/src/csv/builder.cr
+++ b/src/csv/builder.cr
@@ -60,7 +60,7 @@ class CSV::Builder
end
# Appends the given values as a single row, and then a newline.
- def row(values : Enumerable)
+ def row(values : Enumerable) : Nil
row do |row|
values.each do |value|
row << value
@@ -69,7 +69,7 @@ class CSV::Builder
end
# :ditto:
- def row(*values)
+ def row(*values) : Nil
row values
end
@@ -111,7 +111,7 @@ class CSV::Builder
end
# Appends the given value to this row.
- def <<(value : String)
+ def <<(value : String) : Nil
if needs_quotes?(value)
@builder.quote_cell value
else
@@ -120,7 +120,7 @@ class CSV::Builder
end
# :ditto:
- def <<(value : Nil | Bool | Number)
+ def <<(value : Nil | Bool | Number) : Nil
case @quoting
when .all?
@builder.cell { |io|
@@ -134,7 +134,7 @@ class CSV::Builder
end
# :ditto:
- def <<(value)
+ def <<(value) : Nil
self << value.to_s
end
@@ -151,7 +151,7 @@ class CSV::Builder
end
# Appends a comma, thus skipping a cell.
- def skip_cell
+ def skip_cell : Nil
self << nil
end
diff --git a/src/csv/lexer.cr b/src/csv/lexer.cr
index 2656d53656b1..634ec716b303 100644
--- a/src/csv/lexer.cr
+++ b/src/csv/lexer.cr
@@ -39,7 +39,7 @@ abstract class CSV::Lexer
end
# Rewinds this lexer to the beginning
- def rewind
+ def rewind : Nil
@column_number = 1
@line_number = 1
@last_empty_column = false
diff --git a/src/csv/lexer/io_based.cr b/src/csv/lexer/io_based.cr
index 253e0b2f8a3f..f33e83d99d9e 100644
--- a/src/csv/lexer/io_based.cr
+++ b/src/csv/lexer/io_based.cr
@@ -7,7 +7,7 @@ class CSV::Lexer::IOBased < CSV::Lexer
@current_char = @io.read_char || '\0'
end
- def rewind
+ def rewind : Nil
super
@io.rewind
@current_char = @io.read_char || '\0'
diff --git a/src/csv/lexer/string_based.cr b/src/csv/lexer/string_based.cr
index fdffd072ed6e..c9d1193adc34 100644
--- a/src/csv/lexer/string_based.cr
+++ b/src/csv/lexer/string_based.cr
@@ -11,7 +11,7 @@ class CSV::Lexer::StringBased < CSV::Lexer
end
end
- def rewind
+ def rewind : Nil
super
@reader.pos = 0
if @reader.current_char == '\n'
diff --git a/src/csv/parser.cr b/src/csv/parser.cr
index 987e3bb150b9..ae3ec7c890d8 100644
--- a/src/csv/parser.cr
+++ b/src/csv/parser.cr
@@ -54,7 +54,7 @@ class CSV::Parser
end
# Rewinds this parser to the beginning.
- def rewind
+ def rewind : Nil
@lexer.rewind
end
diff --git a/src/deque.cr b/src/deque.cr
index 0d55c3abe196..03c7ec4f232c 100644
--- a/src/deque.cr
+++ b/src/deque.cr
@@ -493,7 +493,7 @@ class Deque(T)
#
# * For positive *n*, equivalent to `n.times { push(shift) }`.
# * For negative *n*, equivalent to `(-n).times { unshift(pop) }`.
- def rotate!(n : Int = 1)
+ def rotate!(n : Int = 1) : Nil
return if @size <= 1
if @size == @capacity
@start = (@start + n) % @capacity
diff --git a/src/enumerable.cr b/src/enumerable.cr
index bebb24eff5f8..d8ad4204bcae 100644
--- a/src/enumerable.cr
+++ b/src/enumerable.cr
@@ -34,7 +34,7 @@ module Enumerable(T)
end
# Must yield this collection's elements to the block.
- abstract def each(&block : T -> _)
+ abstract def each(&block : T ->)
# Returns `true` if the passed block returns a value other than `false` or `nil`
# for all elements of the collection.
@@ -222,7 +222,7 @@ module Enumerable(T)
# ["Alice", "Bob"].compact_map { |name| name.match(/^A./) } # => [Regex::MatchData("Al")]
# ```
def compact_map
- ary = [] of typeof((yield first).not_nil!)
+ ary = [] of typeof((yield Enumerable.element_type(self)).not_nil!)
each do |e|
v = yield e
unless v.is_a?(Nil)
@@ -525,7 +525,7 @@ module Enumerable(T)
# array # => ['A', 'l', 'i', 'c', 'e', 'B', 'o', 'b']
# ```
def flat_map(&block : T -> _)
- ary = [] of typeof(flat_map_type(yield first))
+ ary = [] of typeof(flat_map_type(yield Enumerable.element_type(self)))
each do |e|
case v = yield e
when Array, Iterator
@@ -668,14 +668,26 @@ module Enumerable(T)
# For each element in the collection the block is passed an accumulator value (*memo*) and the element. The
# result becomes the new value for *memo*. At the end of the iteration, the final value of *memo* is
# the return value for the method. The initial value for the accumulator is the first element in the collection.
+ # If the collection has only one element, that element is returned.
#
# Raises `Enumerable::EmptyError` if the collection is empty.
#
# ```
# [1, 2, 3, 4, 5].reduce { |acc, i| acc + i } # => 15
+ # [1].reduce { |acc, i| acc + i } # => 1
+ # ([] of Int32).reduce { |acc, i| acc + i } # raises Enumerable::EmptyError
+ # ```
+ #
+ # The block is not required to return a `T`, in which case the accumulator's
+ # type includes whatever the block returns.
+ #
+ # ```
+ # # `acc` is an `Int32 | String`
+ # [1, 2, 3, 4, 5].reduce { |acc, i| "#{acc}-#{i}" } # => "1-2-3-4-5"
+ # [1].reduce { |acc, i| "#{acc}-#{i}" } # => 1
# ```
def reduce
- memo = uninitialized T
+ memo = uninitialized typeof(reduce(Enumerable.element_type(self)) { |acc, i| yield acc, i })
found = false
each do |elem|
@@ -706,7 +718,7 @@ module Enumerable(T)
# ([] of Int32).reduce? { |acc, i| acc + i } # => nil
# ```
def reduce?
- memo = uninitialized T
+ memo = uninitialized typeof(reduce(Enumerable.element_type(self)) { |acc, i| yield acc, i })
found = false
each do |elem|
@@ -1304,7 +1316,7 @@ module Enumerable(T)
# ```
def reject(type : U.class) forall U
ary = [] of typeof(begin
- e = first
+ e = Enumerable.element_type(self)
e.is_a?(U) ? raise("") : e
end)
each { |e| ary << e unless e.is_a?(U) }
@@ -1551,7 +1563,7 @@ module Enumerable(T)
# ([] of Int32).sum { |x| x + 1 } # => 0
# ```
def sum(&block)
- sum(additive_identity(Reflect(typeof(yield first)))) do |value|
+ sum(additive_identity(Reflect(typeof(yield Enumerable.element_type(self))))) do |value|
yield value
end
end
@@ -1630,7 +1642,7 @@ module Enumerable(T)
# ([] of Int32).product { |x| x + 1 } # => 1
# ```
def product(&block)
- product(Reflect(typeof(yield first)).first.multiplicative_identity) do |value|
+ product(Reflect(typeof(yield Enumerable.element_type(self))).first.multiplicative_identity) do |value|
yield value
end
end
@@ -1721,7 +1733,7 @@ module Enumerable(T)
# Tuple.new({:a, 1}, {:c, 2}).to_h # => {:a => 1, :c => 2}
# ```
def to_h
- each_with_object(Hash(typeof(first[0]), typeof(first[1])).new) do |item, hash|
+ each_with_object(Hash(typeof(Enumerable.element_type(self)[0]), typeof(Enumerable.element_type(self)[1])).new) do |item, hash|
hash[item[0]] = item[1]
end
end
diff --git a/src/exception/call_stack.cr b/src/exception/call_stack.cr
index f154dfe6f600..eb4045cedf8e 100644
--- a/src/exception/call_stack.cr
+++ b/src/exception/call_stack.cr
@@ -29,7 +29,7 @@ struct Exception::CallStack
@@skip = [] of String
- def self.skip(filename)
+ def self.skip(filename) : Nil
@@skip << filename
end
@@ -106,7 +106,7 @@ struct Exception::CallStack
end
end
- def self.print_backtrace
+ def self.print_backtrace : Nil
backtrace_fn = ->(context : LibUnwind::Context, data : Void*) do
last_frame = data.as(RepeatedFrame*)
diff --git a/src/fiber/stack_pool.cr b/src/fiber/stack_pool.cr
index f3527b949d22..54d03e4ffa5f 100644
--- a/src/fiber/stack_pool.cr
+++ b/src/fiber/stack_pool.cr
@@ -29,7 +29,7 @@ class Fiber
end
# Appends a stack to the bottom of the pool.
- def release(stack)
+ def release(stack) : Nil
@mutex.synchronize { @deque.push(stack) }
end
diff --git a/src/file.cr b/src/file.cr
index ccbc61384d39..3659a7f50792 100644
--- a/src/file.cr
+++ b/src/file.cr
@@ -398,7 +398,7 @@ class File < IO::FileDescriptor
File.expand_brace_pattern(pattern, expanded_patterns)
expanded_patterns.each do |expanded_pattern|
- return true if match_single_pattern(expanded_pattern, path)
+ return true if match_single_pattern(expanded_pattern, path.to_s)
end
false
end
@@ -587,12 +587,12 @@ class File < IO::FileDescriptor
# Creates a new link (also known as a hard link) at *new_path* to an existing file
# given by *old_path*.
- def self.link(old_path : Path | String, new_path : Path | String)
+ def self.link(old_path : Path | String, new_path : Path | String) : Nil
Crystal::System::File.link(old_path.to_s, new_path.to_s)
end
# Creates a symbolic link at *new_path* to an existing file given by *old_path*.
- def self.symlink(old_path : Path | String, new_path : Path | String)
+ def self.symlink(old_path : Path | String, new_path : Path | String) : Nil
Crystal::System::File.symlink(old_path.to_s, new_path.to_s)
end
@@ -773,7 +773,9 @@ class File < IO::FileDescriptor
# File.exists?("afile.cr") # => true
# ```
def self.rename(old_filename : Path | String, new_filename : Path | String) : Nil
- Crystal::System::File.rename(old_filename.to_s, new_filename.to_s)
+ if error = Crystal::System::File.rename(old_filename.to_s, new_filename.to_s)
+ raise error
+ end
end
# Sets the access and modification times of *filename*.
diff --git a/src/file/preader.cr b/src/file/preader.cr
index e4999e80df53..9bd9fb73d490 100644
--- a/src/file/preader.cr
+++ b/src/file/preader.cr
@@ -35,11 +35,11 @@ class File::PReader < IO
raise IO::Error.new("Can't flush read-only IO")
end
- def unbuffered_rewind
+ def unbuffered_rewind : Nil
@pos = 0
end
- def unbuffered_close
+ def unbuffered_close : Nil
@closed = true
end
end
diff --git a/src/file_utils.cr b/src/file_utils.cr
index ca424ddb6cbb..e82e3c1e15f5 100644
--- a/src/file_utils.cr
+++ b/src/file_utils.cr
@@ -10,7 +10,7 @@ module FileUtils
# ```
#
# NOTE: Alias of `Dir.cd`
- def cd(path : Path | String)
+ def cd(path : Path | String) : Nil
Dir.cd(path)
end
@@ -89,7 +89,7 @@ module FileUtils
# File.info("afile_copy").permissions.value # => 0o600
# ```
def cp(src_path : Path | String, dest : Path | String) : Nil
- dest += File::SEPARATOR + File.basename(src_path) if Dir.exists?(dest)
+ dest = Path[dest, File.basename(src_path)] if Dir.exists?(dest)
File.copy(src_path, dest)
end
@@ -147,7 +147,7 @@ module FileUtils
# # Create a hard link, pointing from /tmp/foo.c to foo.c
# FileUtils.ln("foo.c", "/tmp")
# ```
- def ln(src_path : Path | String, dest_path : Path | String)
+ def ln(src_path : Path | String, dest_path : Path | String) : Nil
if Dir.exists?(dest_path)
File.link(src_path, File.join(dest_path, File.basename(src_path)))
else
@@ -183,7 +183,7 @@ module FileUtils
# # Create a symbolic link pointing from /tmp/src to src
# FileUtils.ln_s("src", "/tmp")
# ```
- def ln_s(src_path : Path | String, dest_path : Path | String)
+ def ln_s(src_path : Path | String, dest_path : Path | String) : Nil
if Dir.exists?(dest_path)
File.symlink(src_path, File.join(dest_path, File.basename(src_path)))
else
@@ -217,7 +217,7 @@ module FileUtils
# # Create a symbolic link pointing from bar.c to foo.c, even if bar.c already exists
# FileUtils.ln_sf("foo.c", "bar.c")
# ```
- def ln_sf(src_path : Path | String, dest_path : Path | String)
+ def ln_sf(src_path : Path | String, dest_path : Path | String) : Nil
if File.directory?(dest_path)
dest_path = File.join(dest_path, File.basename(src_path))
end
@@ -306,15 +306,20 @@ module FileUtils
# Moves *src_path* to *dest_path*.
#
+ # NOTE: If *src_path* and *dest_path* exist on different mounted filesystems,
+ # the file at *src_path* is copied to *dest_path* and then removed.
+ #
# ```
# require "file_utils"
#
# FileUtils.mv("afile", "afile.cr")
# ```
- #
- # NOTE: Alias of `File.rename`
def mv(src_path : Path | String, dest_path : Path | String) : Nil
- File.rename(src_path, dest_path)
+ if error = Crystal::System::File.rename(src_path.to_s, dest_path.to_s)
+ raise error unless Errno.value.in?(Errno::EXDEV, Errno::EPERM)
+ cp_r(src_path, dest_path)
+ rm_r(src_path)
+ end
end
# Moves every *srcs* to *dest*.
diff --git a/src/float.cr b/src/float.cr
index 6a80d730fbf4..79308547933e 100644
--- a/src/float.cr
+++ b/src/float.cr
@@ -181,6 +181,16 @@ struct Float32
LibM.trunc_f32(self)
end
+ # Returns the least `Float32` that is greater than `self`.
+ def next_float : Float32
+ LibM.nextafter_f32(self, INFINITY)
+ end
+
+ # Returns the greatest `Float32` that is less than `self`.
+ def prev_float : Float32
+ LibM.nextafter_f32(self, -INFINITY)
+ end
+
def **(other : Int32)
{% if flag?(:win32) %}
self ** other.to_f32
@@ -288,6 +298,16 @@ struct Float64
LibM.trunc_f64(self)
end
+ # Returns the least `Float64` that is greater than `self`.
+ def next_float : Float64
+ LibM.nextafter_f64(self, INFINITY)
+ end
+
+ # Returns the greatest `Float64` that is less than `self`.
+ def prev_float : Float64
+ LibM.nextafter_f64(self, -INFINITY)
+ end
+
def **(other : Int32)
{% if flag?(:win32) %}
self ** other.to_f64
diff --git a/src/float/printer.cr b/src/float/printer.cr
index 244cd9b36559..bd1b307410a6 100644
--- a/src/float/printer.cr
+++ b/src/float/printer.cr
@@ -47,7 +47,7 @@ module Float::Printer
LibC.snprintf(buffer.to_unsafe, BUFFER_SIZE, "%g", v.to_f64)
end
len = LibC.strlen(buffer)
- io.write_utf8 buffer.to_slice[0, len]
+ io.write_string buffer.to_slice[0, len]
return
end
@@ -65,11 +65,11 @@ module Float::Printer
# add integer part digits
if decimal_exponent > 0 && !exp_mode
# whole number but not big enough to be exp form
- io.write_utf8 buffer.to_slice[i, length - i]
+ io.write_string buffer.to_slice[i, length - i]
i = length
(point - length).times { io << '0' }
elsif i < point
- io.write_utf8 buffer.to_slice[i, point - i]
+ io.write_string buffer.to_slice[i, point - i]
i = point
end
@@ -81,7 +81,7 @@ module Float::Printer
end
# add fractional part digits
- io.write_utf8 buffer.to_slice[i, length - i]
+ io.write_string buffer.to_slice[i, length - i]
i = length
# print trailing 0 if whole number or exp notation of power of ten
diff --git a/src/http/client.cr b/src/http/client.cr
index be561d7b6d35..e0e8f25a00d5 100644
--- a/src/http/client.cr
+++ b/src/http/client.cr
@@ -259,7 +259,7 @@ class HTTP::Client
# Configures this client to perform basic authentication in every
# request.
- def basic_auth(username, password)
+ def basic_auth(username, password) : Nil
header = "Basic #{Base64.strict_encode("#{username}:#{password}")}"
before_request do |request|
request.headers["Authorization"] = header
@@ -398,7 +398,7 @@ class HTTP::Client
# end
# client.get "/"
# ```
- def before_request(&callback : HTTP::Request ->)
+ def before_request(&callback : HTTP::Request ->) : Nil
before_request = @before_request ||= [] of (HTTP::Request ->)
before_request << callback
end
diff --git a/src/http/cookie.cr b/src/http/cookie.cr
index 0ef0b05c0b90..a5707d386cb6 100644
--- a/src/http/cookie.cr
+++ b/src/http/cookie.cr
@@ -101,7 +101,7 @@ module HTTP
end
end
- def to_cookie_header(io)
+ def to_cookie_header(io) : Nil
io << @name
io << '='
io << @value
diff --git a/src/http/formdata/builder.cr b/src/http/formdata/builder.cr
index 983451f25865..17132bf0af72 100644
--- a/src/http/formdata/builder.cr
+++ b/src/http/formdata/builder.cr
@@ -39,7 +39,7 @@ module HTTP::FormData
# Adds a form part with the given *name* and *value*. *Headers* can
# optionally be provided for the form part.
- def field(name : String, value, headers : HTTP::Headers = HTTP::Headers.new)
+ def field(name : String, value, headers : HTTP::Headers = HTTP::Headers.new) : Nil
file(name, IO::Memory.new(value.to_s), headers: headers)
end
@@ -68,7 +68,7 @@ module HTTP::FormData
# Finalizes the multipart message, this method must be called before the
# generated multipart message written to the IO is considered valid.
- def finish
+ def finish : Nil
fail "Cannot finish form-data: no body parts" if @state == :START
fail "Cannot finish form-data: already finished" if @state == :FINISHED
diff --git a/src/http/server.cr b/src/http/server.cr
index 9ad6fc64ae4c..9a62c5f8b07a 100644
--- a/src/http/server.cr
+++ b/src/http/server.cr
@@ -480,7 +480,7 @@ class HTTP::Server
# Gracefully terminates the server. It will process currently accepted
# requests, but it won't accept new connections.
- def close
+ def close : Nil
raise "Can't close server, it's already closed" if closed?
@closed = true
diff --git a/src/http/server/handlers/error_handler.cr b/src/http/server/handlers/error_handler.cr
index c70f210bf925..9468917674ee 100644
--- a/src/http/server/handlers/error_handler.cr
+++ b/src/http/server/handlers/error_handler.cr
@@ -12,7 +12,7 @@ class HTTP::ErrorHandler
def initialize(@verbose : Bool = false, @log = Log.for("http.server"))
end
- def call(context)
+ def call(context) : Nil
begin
call_next(context)
rescue ex : HTTP::Server::ClientError
diff --git a/src/http/server/handlers/log_handler.cr b/src/http/server/handlers/log_handler.cr
index 36d1c90c7a91..8177ede9c712 100644
--- a/src/http/server/handlers/log_handler.cr
+++ b/src/http/server/handlers/log_handler.cr
@@ -8,7 +8,7 @@ class HTTP::LogHandler
def initialize(@log = Log.for("http.server"))
end
- def call(context)
+ def call(context) : Nil
start = Time.monotonic
begin
diff --git a/src/http/server/handlers/static_file_handler.cr b/src/http/server/handlers/static_file_handler.cr
index e70b694cb34f..02e782df2968 100644
--- a/src/http/server/handlers/static_file_handler.cr
+++ b/src/http/server/handlers/static_file_handler.cr
@@ -28,7 +28,7 @@ class HTTP::StaticFileHandler
@directory_listing = !!directory_listing
end
- def call(context)
+ def call(context) : Nil
unless context.request.method.in?("GET", "HEAD")
if @fallthrough
call_next(context)
diff --git a/src/http/server/handlers/websocket_handler.cr b/src/http/server/handlers/websocket_handler.cr
index e3a8b64ba3a2..1d9a20ccd354 100644
--- a/src/http/server/handlers/websocket_handler.cr
+++ b/src/http/server/handlers/websocket_handler.cr
@@ -20,7 +20,7 @@ class HTTP::WebSocketHandler
def initialize(&@proc : WebSocket, Server::Context ->)
end
- def call(context)
+ def call(context) : Nil
unless websocket_upgrade_request? context.request
return call_next context
end
diff --git a/src/http/server/request_processor.cr b/src/http/server/request_processor.cr
index 7b72dd3db744..0ecb2e1ccd9c 100644
--- a/src/http/server/request_processor.cr
+++ b/src/http/server/request_processor.cr
@@ -18,7 +18,7 @@ class HTTP::Server::RequestProcessor
@wants_close = false
end
- def close
+ def close : Nil
@wants_close = true
end
diff --git a/src/http/server/response.cr b/src/http/server/response.cr
index df15aaaa9a6b..1df0d9bfb73d 100644
--- a/src/http/server/response.cr
+++ b/src/http/server/response.cr
@@ -98,19 +98,19 @@ class HTTP::Server
# Upgrades this response, writing headers and yielding the connection `IO` (a socket) to the given block.
# This is useful to implement protocol upgrades, such as websockets.
- def upgrade(&block : IO ->)
+ def upgrade(&block : IO ->) : Nil
write_headers
@upgrade_handler = block
end
# Flushes the output. This method must be implemented if wrapping the response output.
- def flush
+ def flush : Nil
@output.flush
end
# Closes this response, writing headers and body if not done yet.
# This method must be implemented if wrapping the response output.
- def close
+ def close : Nil
return if closed?
@output.close
@@ -134,7 +134,7 @@ class HTTP::Server
#
# Raises `IO::Error` if the response is closed or headers were already
# sent.
- def respond_with_status(status : HTTP::Status, message : String? = nil)
+ def respond_with_status(status : HTTP::Status, message : String? = nil) : Nil
check_headers
reset
@status = status
@@ -145,7 +145,7 @@ class HTTP::Server
end
# :ditto:
- def respond_with_status(status : Int, message : String? = nil)
+ def respond_with_status(status : Int, message : String? = nil) : Nil
respond_with_status(HTTP::Status.new(status), message)
end
@@ -189,7 +189,7 @@ class HTTP::Server
@closed = false
end
- def reset
+ def reset : Nil
@in_buffer_rem = Bytes.empty
@out_count = 0
@sync = false
@@ -231,7 +231,7 @@ class HTTP::Server
@closed
end
- def close
+ def close : Nil
return if closed?
# Conditionally determine based on status if the `content-length` header should be added automatically.
diff --git a/src/http/web_socket.cr b/src/http/web_socket.cr
index 5a79e56190ba..6516dee2bbb8 100644
--- a/src/http/web_socket.cr
+++ b/src/http/web_socket.cr
@@ -30,6 +30,8 @@ class HTTP::WebSocket
# HTTP::WebSocket.new(URI.parse("http://websocket.example.com:8080/chat")) # Creates a new WebSocket to `websocket.example.com` on port `8080`
# HTTP::WebSocket.new(URI.parse("ws://websocket.example.com/chat"), # Creates a new WebSocket to `websocket.example.com` with an Authorization header
# HTTP::Headers{"Authorization" => "Bearer authtoken"})
+ # HTTP::WebSocket.new(
+ # URI.parse("ws://user:password@websocket.example.com/chat")) # Creates a new WebSocket to `websocket.example.com` with an HTTP basic auth Authorization header
# ```
def self.new(uri : URI | String, headers = HTTP::Headers.new)
new(Protocol.new(uri, headers: headers))
@@ -73,7 +75,7 @@ class HTTP::WebSocket
end
# Sends a message payload (message) to the client.
- def send(message)
+ def send(message) : Nil
check_open
@ws.send(message)
end
@@ -91,7 +93,7 @@ class HTTP::WebSocket
# Server can send an unsolicited PONG frame which the client should not respond to.
#
# See `#ping`.
- def pong(message = nil)
+ def pong(message = nil) : Nil
check_open
@ws.pong(message)
end
@@ -105,7 +107,7 @@ class HTTP::WebSocket
# Sends a close frame to the client, and closes the connection.
# The close frame may contain a body (message) that indicates the reason for closing.
- def close(code : CloseCode | Int? = nil, message = nil)
+ def close(code : CloseCode | Int? = nil, message = nil) : Nil
return if closed?
@closed = true
@ws.close(code, message)
diff --git a/src/http/web_socket/protocol.cr b/src/http/web_socket/protocol.cr
index 4c07889e0327..8aec99bfd148 100644
--- a/src/http/web_socket/protocol.cr
+++ b/src/http/web_socket/protocol.cr
@@ -74,7 +74,7 @@ class HTTP::WebSocket::Protocol
raise "This IO is write-only"
end
- def flush(final = true)
+ def flush(final = true) : Nil
@websocket.send(
@buffer + (@pos % @buffer.size),
@opcode,
@@ -86,11 +86,11 @@ class HTTP::WebSocket::Protocol
end
end
- def send(data : String)
+ def send(data : String) : Nil
send(data.to_slice, Opcode::TEXT)
end
- def send(data : Bytes)
+ def send(data : Bytes) : Nil
send(data, Opcode::BINARY)
end
@@ -100,7 +100,7 @@ class HTTP::WebSocket::Protocol
stream_io.flush
end
- def send(data : Bytes, opcode : Opcode, flags = Flags::FINAL, flush = true)
+ def send(data : Bytes, opcode : Opcode, flags = Flags::FINAL, flush = true) : Nil
write_header(data.size, opcode, flags)
write_payload(data)
@io.flush if flush
@@ -227,7 +227,7 @@ class HTTP::WebSocket::Protocol
end
end
- def pong(message = nil)
+ def pong(message = nil) : Nil
if message
send(message.to_slice, Opcode::PONG)
else
@@ -235,7 +235,7 @@ class HTTP::WebSocket::Protocol
end
end
- def close(code : CloseCode? = nil, message = nil)
+ def close(code : CloseCode? = nil, message = nil) : Nil
return if @io.closed?
if message
@@ -259,7 +259,7 @@ class HTTP::WebSocket::Protocol
@io.close if @sync_close
end
- def close(code : Int, message = nil)
+ def close(code : Int, message = nil) : Nil
close(CloseCode.new(code), message)
end
@@ -320,6 +320,9 @@ class HTTP::WebSocket::Protocol
if (host = uri.hostname) && (path = uri.request_target)
tls = uri.scheme.in?("https", "wss")
+ if (user = uri.user) && (password = uri.password)
+ headers["Authorization"] ||= "Basic #{Base64.strict_encode("#{user}:#{password}")}"
+ end
return new(host, path, uri.port, tls, headers)
end
diff --git a/src/int.cr b/src/int.cr
index 57114be4e52b..13c455f1a25f 100644
--- a/src/int.cr
+++ b/src/int.cr
@@ -616,41 +616,115 @@ struct Int
private DIGITS_UPCASE = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
private DIGITS_BASE62 = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
- def to_s(base : Int = 10, *, upcase : Bool = false) : String
+ # Returns a string representation of this integer.
+ #
+ # *base* specifies the radix of the returned string, and must be either 62 or
+ # a number between 2 and 36. By default, digits above 9 are represented by
+ # ASCII lowercase letters (`a` for 10, `b` for 11, etc.), but uppercase
+ # letters may be used if *upcase* is `true`, unless base 62 is used. In that
+ # case, lowercase letters are used for 10 to 35, and uppercase ones for 36 to
+ # 61, and *upcase* must be `false`.
+ #
+ # *precision* specifies the minimum number of digits in the returned string.
+ # If there are fewer digits than this number, the string is left-padded by
+ # zeros. If `self` and *precision* are both zero, returns an empty string.
+ #
+ # ```
+ # 1234.to_s # => "1234"
+ # 1234.to_s(2) # => "10011010010"
+ # 1234.to_s(16) # => "4d2"
+ # 1234.to_s(16, upcase: true) # => "4D2"
+ # 1234.to_s(36) # => "ya"
+ # 1234.to_s(62) # => "jU"
+ # 1234.to_s(precision: 2) # => "1234"
+ # 1234.to_s(precision: 6) # => "001234"
+ # ```
+ def to_s(base : Int = 10, *, precision : Int = 1, upcase : Bool = false) : String
raise ArgumentError.new("Invalid base #{base}") unless 2 <= base <= 36 || base == 62
raise ArgumentError.new("upcase must be false for base 62") if upcase && base == 62
+ raise ArgumentError.new("Precision must be non-negative") unless precision >= 0
- case self
- when 0
+ case {self, precision}
+ when {0, 0}
+ ""
+ when {0, 1}
"0"
- when 1
+ when {1, 1}
"1"
else
- internal_to_s(base, upcase) do |ptr, count|
- String.new(ptr, count, count)
+ internal_to_s(base, precision, upcase) do |ptr, count, negative|
+ # reuse the `chars` buffer in `internal_to_s` if possible
+ if precision <= count || precision <= 128
+ if precision > count
+ difference = precision - count
+ ptr -= difference
+ Intrinsics.memset(ptr, '0'.ord.to_u8, difference, false)
+ count += difference
+ end
+
+ if negative
+ ptr -= 1
+ ptr.value = '-'.ord.to_u8
+ count += 1
+ end
+
+ String.new(ptr, count, count)
+ else
+ len = precision + (negative ? 1 : 0)
+ String.new(len) do |buffer|
+ if negative
+ buffer.value = '-'.ord.to_u8
+ buffer += 1
+ end
+
+ Intrinsics.memset(buffer, '0'.ord.to_u8, precision - count, false)
+ ptr.copy_to(buffer + precision - count, count)
+ {len, len}
+ end
+ end
end
end
end
- def to_s(io : IO, base : Int = 10, *, upcase : Bool = false) : Nil
+ # Appends a string representation of this integer to the given *io*.
+ #
+ # *base* specifies the radix of the written string, and must be either 62 or
+ # a number between 2 and 36. By default, digits above 9 are represented by
+ # ASCII lowercase letters (`a` for 10, `b` for 11, etc.), but uppercase
+ # letters may be used if *upcase* is `true`, unless base 62 is used. In that
+ # case, lowercase letters are used for 10 to 35, and uppercase ones for 36 to
+ # 61, and *upcase* must be `false`.
+ #
+ # *precision* specifies the minimum number of digits in the written string.
+ # If there are fewer digits than this number, the string is left-padded by
+ # zeros. If `self` and *precision* are both zero, returns an empty string.
+ def to_s(io : IO, base : Int = 10, *, precision : Int = 1, upcase : Bool = false) : Nil
raise ArgumentError.new("Invalid base #{base}") unless 2 <= base <= 36 || base == 62
raise ArgumentError.new("upcase must be false for base 62") if upcase && base == 62
+ raise ArgumentError.new("Precision must be non-negative") unless precision >= 0
- case self
- when 0
+ case {self, precision}
+ when {0, 0}
+ # do nothing
+ when {0, 1}
io << '0'
- when 1
+ when {1, 1}
io << '1'
else
- internal_to_s(base, upcase) do |ptr, count|
- io.write_utf8 Slice.new(ptr, count)
+ internal_to_s(base, precision, upcase) do |ptr, count, negative|
+ io << '-' if negative
+ if precision > count
+ (precision - count).times { io << '0' }
+ end
+ io.write_string Slice.new(ptr, count)
end
end
end
- private def internal_to_s(base, upcase = false)
+ private def internal_to_s(base, precision, upcase = false)
# Given sizeof(self) <= 128 bits, we need at most 128 bytes for a base 2
- # representation, plus one byte for the trailing 0.
+ # representation, plus one byte for the negative sign (possibly used by the
+ # string-returning overload).
chars = uninitialized UInt8[129]
ptr_end = chars.to_unsafe + 128
ptr = ptr_end
@@ -666,13 +740,8 @@ struct Int
num = num.tdiv(base)
end
- if neg
- ptr -= 1
- ptr.value = '-'.ord.to_u8
- end
-
count = (ptr_end - ptr).to_i32
- yield ptr, count
+ yield ptr, count, neg
end
# Writes this integer to the given *io* in the given *format*.
diff --git a/src/io.cr b/src/io.cr
index 5e941ced23db..58da0a7b6907 100644
--- a/src/io.cr
+++ b/src/io.cr
@@ -463,8 +463,21 @@ abstract class IO
nil
end
- # Writes a slice of UTF-8 encoded bytes to this `IO`, using the current encoding.
- def write_utf8(slice : Bytes) : Nil
+ # Writes the contents of *slice*, interpreted as a sequence of UTF-8 or ASCII
+ # characters, into this `IO`. The contents are transcoded into this `IO`'s
+ # current encoding.
+ #
+ # ```
+ # bytes = "你".to_slice # => Bytes[228, 189, 160]
+ #
+ # io = IO::Memory.new
+ # io.set_encoding("GB2312")
+ # io.write_string(bytes)
+ # io.to_slice # => Bytes[196, 227]
+ #
+ # "你".encode("GB2312") # => Bytes[196, 227]
+ # ```
+ def write_string(slice : Bytes) : Nil
if encoder = encoder()
encoder.write(self, slice)
else
@@ -474,6 +487,12 @@ abstract class IO
nil
end
+ # :ditto:
+ @[Deprecated("Use `#write_string` instead.")]
+ def write_utf8(slice : Bytes) : Nil
+ write_string(slice)
+ end
+
private def encoder
if encoding = @encoding
@encoder ||= Encoder.new(encoding)
@@ -1010,10 +1029,7 @@ abstract class IO
# String operations (`gets`, `gets_to_end`, `read_char`, `<<`, `print`, `puts`
# `printf`) will use this encoding.
def set_encoding(encoding : String, invalid : Symbol? = nil) : Nil
- if invalid != :skip && (
- encoding.compare("UTF-8", case_insensitive: true) == 0 ||
- encoding.compare("UTF8", case_insensitive: true) == 0
- )
+ if utf8_encoding?(encoding, invalid)
@encoding = nil
else
@encoding = EncodingOptions.new(encoding, invalid)
@@ -1030,6 +1046,13 @@ abstract class IO
@encoding.try(&.name) || "UTF-8"
end
+ private def utf8_encoding?(encoding : String, invalid : Symbol? = nil) : Bool
+ invalid.nil? && (
+ encoding.compare("UTF-8", case_insensitive: true) == 0 ||
+ encoding.compare("UTF8", case_insensitive: true) == 0
+ )
+ end
+
# :nodoc:
def has_non_utf8_encoding? : Bool
!!@encoding
diff --git a/src/io/console.cr b/src/io/console.cr
index 849a82af2c97..a5ea2e52530c 100644
--- a/src/io/console.cr
+++ b/src/io/console.cr
@@ -51,7 +51,7 @@ class IO::FileDescriptor < IO
# doing line wise editing by the terminal and only sending the input to
# the program on a newline.
# Only call this when this IO is a TTY, such as a not redirected stdin.
- def cooked!
+ def cooked! : Nil
if LibC.tcgetattr(fd, out mode) != 0
raise IO::Error.from_errno "can't set IO#cooked!"
end
diff --git a/src/io/delimited.cr b/src/io/delimited.cr
index 172362309346..3451b47f4492 100644
--- a/src/io/delimited.cr
+++ b/src/io/delimited.cr
@@ -111,7 +111,7 @@ class IO::Delimited < IO
raise IO::Error.new "Can't write to IO::Delimited"
end
- def close
+ def close : Nil
return if @closed
@closed = true
diff --git a/src/io/encoding.cr b/src/io/encoding.cr
index 48a2023cdcd3..665b3e3fcfa1 100644
--- a/src/io/encoding.cr
+++ b/src/io/encoding.cr
@@ -224,17 +224,17 @@ class IO
string
end
- def write(io)
+ def write(io) : Nil
io.write @out_slice
@out_slice = Bytes.empty
end
- def write(io, numbytes)
+ def write(io, numbytes) : Nil
io.write @out_slice[0, numbytes]
@out_slice += numbytes
end
- def advance(numbytes)
+ def advance(numbytes) : Nil
@out_slice += numbytes
end
diff --git a/src/io/evented.cr b/src/io/evented.cr
index 75f60b76145a..c2f12bfebff1 100644
--- a/src/io/evented.cr
+++ b/src/io/evented.cr
@@ -165,11 +165,11 @@ module IO::Evented
event.add timeout
end
- def evented_reopen
+ def evented_reopen : Nil
evented_close
end
- def evented_close
+ def evented_close : Nil
@read_event.consume_each &.free
@write_event.consume_each &.free
diff --git a/src/io/memory.cr b/src/io/memory.cr
index 1c1583255183..7d5503024557 100644
--- a/src/io/memory.cr
+++ b/src/io/memory.cr
@@ -242,7 +242,7 @@ class IO::Memory < IO
# io = IO::Memory.new "hello"
# io.clear # raises IO::Error
# ```
- def clear
+ def clear : Nil
check_open
check_resizeable
@bytesize = 0
@@ -372,7 +372,7 @@ class IO::Memory < IO
# io.close
# io.gets_to_end # raises IO::Error (closed stream)
# ```
- def close
+ def close : Nil
@closed = true
end
diff --git a/src/io/sized.cr b/src/io/sized.cr
index ad451523fffe..d46a548da432 100644
--- a/src/io/sized.cr
+++ b/src/io/sized.cr
@@ -76,7 +76,7 @@ class IO::Sized < IO
raise IO::Error.new "Can't write to IO::Sized"
end
- def close
+ def close : Nil
return if @closed
@closed = true
diff --git a/src/io/stapled.cr b/src/io/stapled.cr
index 98d90eadb238..774873476fb6 100644
--- a/src/io/stapled.cr
+++ b/src/io/stapled.cr
@@ -65,7 +65,7 @@ class IO::Stapled < IO
end
# Writes a byte to `writer`.
- def write_byte(byte : UInt8)
+ def write_byte(byte : UInt8) : Nil
check_open
@writer.write_byte(byte)
diff --git a/src/iterator.cr b/src/iterator.cr
index 179e5aac0493..4f3373c30d29 100644
--- a/src/iterator.cr
+++ b/src/iterator.cr
@@ -590,7 +590,7 @@ module Iterator(T)
# iter = ["a", "b", "c"].each
# iter.each { |x| print x, " " } # Prints "a b c"
# ```
- def each(& : T -> _) : Nil
+ def each(& : T ->) : Nil
while true
value = self.next
break if value.is_a?(Stop)
diff --git a/src/json/builder.cr b/src/json/builder.cr
index 49af4b7bdb6d..65b10fc03c10 100644
--- a/src/json/builder.cr
+++ b/src/json/builder.cr
@@ -28,7 +28,7 @@ class JSON::Builder
end
# Starts a document.
- def start_document
+ def start_document : Nil
case state = @state.last
when StartState
@state[-1] = DocumentStartState.new
@@ -62,28 +62,28 @@ class JSON::Builder
end
# Writes a `null` value.
- def null
+ def null : Nil
scalar do
@io << "null"
end
end
# Writes a boolean value.
- def bool(value : Bool)
+ def bool(value : Bool) : Nil
scalar do
@io << value
end
end
# Writes an integer.
- def number(number : Int)
+ def number(number : Int) : Nil
scalar do
@io << number
end
end
# Writes a float.
- def number(number : Float)
+ def number(number : Float) : Nil
scalar do
case number
when .nan?
@@ -100,7 +100,7 @@ class JSON::Builder
# by invoking `to_s` on it.
#
# This method can also be used to write the name of an object field.
- def string(value)
+ def string(value) : Nil
string = value.to_s
scalar(string: true) do
@@ -157,14 +157,14 @@ class JSON::Builder
# the IO without processing. This is the only method that
# might lead to invalid JSON being generated, so you must
# be sure that *string* contains a valid JSON string.
- def raw(string : String)
+ def raw(string : String) : Nil
scalar do
@io << string
end
end
# Writes the start of an array.
- def start_array
+ def start_array : Nil
start_scalar
increase_indent
@state.push ArrayState.new(empty: true)
@@ -172,7 +172,7 @@ class JSON::Builder
end
# Writes the end of an array.
- def end_array
+ def end_array : Nil
case state = @state.last
when ArrayState
@state.pop
@@ -193,7 +193,7 @@ class JSON::Builder
end
# Writes the start of an object.
- def start_object
+ def start_object : Nil
start_scalar
increase_indent
@state.push ObjectState.new(empty: true, name: true)
@@ -201,7 +201,7 @@ class JSON::Builder
end
# Writes the end of an object.
- def end_object
+ def end_object : Nil
case state = @state.last
when ObjectState
unless state.name
@@ -235,12 +235,12 @@ class JSON::Builder
end
# :ditto:
- def scalar(value : Int | Float)
+ def scalar(value : Int | Float) : Nil
number(value)
end
# :ditto:
- def scalar(value : String)
+ def scalar(value : String) : Nil
string(value)
end
diff --git a/src/json/pull_parser.cr b/src/json/pull_parser.cr
index c8fe81538201..7258d6d958f0 100644
--- a/src/json/pull_parser.cr
+++ b/src/json/pull_parser.cr
@@ -103,30 +103,32 @@ class JSON::PullParser
next_token
case token.kind
- when .null?
+ in .null?
@kind = :null
- when .false?
+ in .false?
@kind = :bool
@bool_value = false
- when .true?
+ in .true?
@kind = :bool
@bool_value = true
- when .int?
+ in .int?
@kind = :int
@int_value = token.int_value
@raw_value = token.raw_value
- when .float?
+ in .float?
@kind = :float
@float_value = token.float_value
@raw_value = token.raw_value
- when .string?
+ in .string?
@kind = :string
@string_value = token.string_value
- when .begin_array?
+ in .begin_array?
begin_array
- when .begin_object?
+ in .begin_object?
begin_object
- else
+ in .eof?
+ @kind = :eof
+ in .end_array?, .end_object?, .comma?, .colon?
unexpected_token
end
end
@@ -263,7 +265,7 @@ class JSON::PullParser
# Reads the new value and fill the a JSON builder with it.
#
# Use this method with a `JSON::Builder` to read a JSON while building another one.
- def read_raw(json)
+ def read_raw(json) : Nil
case @kind
when .null?
read_next
@@ -556,7 +558,7 @@ class JSON::PullParser
#
# It skips the whole value, not only the next lexer's token.
# For example if the next value is an array, the whole array will be skipped.
- def skip
+ def skip : Nil
@lexer.skip = true
skip_internal
@lexer.skip = false
diff --git a/src/json/to_json.cr b/src/json/to_json.cr
index 0c0bcf482367..2b3224529e84 100644
--- a/src/json/to_json.cr
+++ b/src/json/to_json.cr
@@ -25,7 +25,7 @@ class Object
end
struct Nil
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.null
end
@@ -35,13 +35,13 @@ struct Nil
end
struct Bool
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.bool(self)
end
end
struct Int
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.number(self)
end
@@ -51,7 +51,7 @@ struct Int
end
struct Float
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.number(self)
end
@@ -61,7 +61,7 @@ struct Float
end
class String
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.string(self)
end
@@ -71,7 +71,7 @@ class String
end
struct Path
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
@name.to_json(json)
end
@@ -81,7 +81,7 @@ struct Path
end
struct Symbol
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.string(to_s)
end
@@ -91,7 +91,7 @@ struct Symbol
end
class Array
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.array do
each &.to_json(json)
end
@@ -99,7 +99,7 @@ class Array
end
class Deque
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.array do
each &.to_json(json)
end
@@ -107,7 +107,7 @@ class Deque
end
struct Set
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.array do
each &.to_json(json)
end
@@ -120,7 +120,7 @@ class Hash
# Keys are serialized by invoking `to_json_object_key` on them.
# Values are serialized with the usual `to_json(json : JSON::Builder)`
# method.
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.object do
each do |key, value|
json.field key.to_json_object_key do
@@ -132,7 +132,7 @@ class Hash
end
struct Tuple
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.array do
{% for i in 0...T.size %}
self[{{i}}].to_json(json)
@@ -154,7 +154,7 @@ struct NamedTuple
end
struct Time::Format
- def to_json(value : Time, json : JSON::Builder)
+ def to_json(value : Time, json : JSON::Builder) : Nil
format(value).to_json(json)
end
end
@@ -263,7 +263,7 @@ struct Time
# a time value.
#
# See `#from_json` for reference.
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.string(Time::Format::RFC_3339.format(self, fraction_digits: 0))
end
end
@@ -343,7 +343,7 @@ end
# person.to_json # => %({"birth_date":1459859781})
# ```
module Time::EpochConverter
- def self.to_json(value : Time, json : JSON::Builder)
+ def self.to_json(value : Time, json : JSON::Builder) : Nil
json.number(value.to_unix)
end
end
@@ -367,7 +367,7 @@ end
# timestamp.to_json # => %({"value":1459860483856})
# ```
module Time::EpochMillisConverter
- def self.to_json(value : Time, json : JSON::Builder)
+ def self.to_json(value : Time, json : JSON::Builder) : Nil
json.number(value.to_unix_ms)
end
end
@@ -394,7 +394,7 @@ end
# raw.to_json # => %({"value":123456789876543212345678987654321})
# ```
module String::RawConverter
- def self.to_json(value : String, json : JSON::Builder)
+ def self.to_json(value : String, json : JSON::Builder) : Nil
json.raw(value)
end
end
diff --git a/src/llvm/enums.cr b/src/llvm/enums.cr
index 275c8dd8f8a1..a604d1d7d7ce 100644
--- a/src/llvm/enums.cr
+++ b/src/llvm/enums.cr
@@ -60,6 +60,7 @@ module LLVM
ZExt
@@kind_ids = load_llvm_kinds_from_names.as(Hash(Attribute, UInt32))
+ @@typed_attrs = load_llvm_typed_attributes.as(Array(Attribute))
def each_kind(&block)
return if value == 0
@@ -137,6 +138,18 @@ module LLVM
kinds
end
+ private def self.load_llvm_typed_attributes
+ typed_attrs = [] of Attribute
+
+ unless LibLLVM::IS_LT_120
+ # LLVM 12 introduced mandatory type parameters for byval and sret
+ typed_attrs << ByVal
+ typed_attrs << StructRet
+ end
+
+ typed_attrs
+ end
+
def self.kind_for(member)
@@kind_ids[member]
end
@@ -144,6 +157,11 @@ module LLVM
def self.from_kind(kind)
@@kind_ids.key_for(kind)
end
+
+ def self.requires_type?(kind)
+ member = from_kind(kind)
+ @@typed_attrs.includes?(member)
+ end
end
{% else %}
@[Flags]
diff --git a/src/llvm/ext/llvm-versions.txt b/src/llvm/ext/llvm-versions.txt
index 2fdbdf9a1c98..7a8af33aa8b5 100644
--- a/src/llvm/ext/llvm-versions.txt
+++ b/src/llvm/ext/llvm-versions.txt
@@ -1 +1 @@
-11.1 11.0 10.0 9.0 8.0 7.1 6.0 5.0 4.0 3.9 3.8
+12.0 11.1 11.0 10.0 9.0 8.0 7.1 6.0 5.0 4.0 3.9 3.8
diff --git a/src/llvm/ext/llvm_ext.cc b/src/llvm/ext/llvm_ext.cc
index 4d2b13cf4193..bd82f564a903 100644
--- a/src/llvm/ext/llvm_ext.cc
+++ b/src/llvm/ext/llvm_ext.cc
@@ -351,11 +351,36 @@ void LLVMMetadataReplaceAllUsesWith2(
void LLVMExtSetCurrentDebugLocation(
LLVMBuilderRef Bref, unsigned Line, unsigned Col, LLVMMetadataRef Scope,
LLVMMetadataRef InlinedAt) {
+#if LLVM_VERSION_GE(12, 0)
+ if (!Scope)
+ unwrap(Bref)->SetCurrentDebugLocation(DebugLoc());
+ else
+ unwrap(Bref)->SetCurrentDebugLocation(
+ DILocation::get(unwrap(Scope)->getContext(), Line, Col,
+ unwrapDI(Scope),
+ unwrapDI(InlinedAt)));
+#else
unwrap(Bref)->SetCurrentDebugLocation(
DebugLoc::get(Line, Col, Scope ? unwrap(Scope) : nullptr,
InlinedAt ? unwrap(InlinedAt) : nullptr));
+#endif
}
+#if LLVM_VERSION_GE(3, 9)
+// A backported LLVMCreateTypeAttribute for LLVM < 13
+// from https://github.com/llvm/llvm-project/blob/bb8ce25e88218be60d2a4ea9c9b0b721809eff27/llvm/lib/IR/Core.cpp#L167
+LLVMAttributeRef LLVMExtCreateTypeAttribute(
+ LLVMContextRef C, unsigned KindID, LLVMTypeRef Ty) {
+ auto &Ctx = *unwrap(C);
+ auto AttrKind = (Attribute::AttrKind)KindID;
+#if LLVM_VERSION_GE(12, 0)
+ return wrap(Attribute::get(Ctx, AttrKind, unwrap(Ty)));
+#else
+ return wrap(Attribute::get(Ctx, AttrKind));
+#endif
+}
+#endif
+
LLVMValueRef LLVMExtBuildCmpxchg(
LLVMBuilderRef B, LLVMValueRef PTR, LLVMValueRef Cmp, LLVMValueRef New,
LLVMAtomicOrdering SuccessOrdering, LLVMAtomicOrdering FailureOrdering) {
diff --git a/src/llvm/function.cr b/src/llvm/function.cr
index 7ffa10cb688e..13d6af5ca5cd 100644
--- a/src/llvm/function.cr
+++ b/src/llvm/function.cr
@@ -19,12 +19,16 @@ struct LLVM::Function
LibLLVM.set_function_call_convention(self, cc)
end
- def add_attribute(attribute : Attribute, index = AttributeIndex::FunctionIndex)
+ def add_attribute(attribute : Attribute, index = AttributeIndex::FunctionIndex, type : Type? = nil)
return if attribute.value == 0
{% if LibLLVM.has_constant?(:AttributeRef) %}
context = LibLLVM.get_module_context(LibLLVM.get_global_parent(self))
attribute.each_kind do |kind|
- attribute_ref = LibLLVM.create_enum_attribute(context, kind, 0)
+ if type && LLVM::Attribute.requires_type?(kind)
+ attribute_ref = LibLLVMExt.create_type_attribute(context, kind, type)
+ else
+ attribute_ref = LibLLVM.create_enum_attribute(context, kind, 0)
+ end
LibLLVM.add_attribute_at_index(self, index, attribute_ref)
end
{% else %}
diff --git a/src/llvm/lib_llvm.cr b/src/llvm/lib_llvm.cr
index 857987d0a36e..694d1767a63a 100644
--- a/src/llvm/lib_llvm.cr
+++ b/src/llvm/lib_llvm.cr
@@ -19,6 +19,7 @@ end
{% begin %}
lib LibLLVM
+ IS_120 = {{LibLLVM::VERSION.starts_with?("12.0")}}
IS_110 = {{LibLLVM::VERSION.starts_with?("11.0")}}
IS_100 = {{LibLLVM::VERSION.starts_with?("10.0")}}
IS_90 = {{LibLLVM::VERSION.starts_with?("9.0")}}
@@ -33,7 +34,10 @@ end
IS_LT_70 = IS_38 || IS_39 || IS_40 || IS_50 || IS_60
IS_LT_80 = IS_LT_70 || IS_70 || IS_71
- IS_LT_110 = IS_LT_80 || IS_90 || IS_100
+ IS_LT_90 = IS_LT_80 || IS_80
+ IS_LT_100 = IS_LT_90 || IS_90
+ IS_LT_110 = IS_LT_100 || IS_100
+ IS_LT_120 = IS_LT_110 || IS_110
end
{% end %}
diff --git a/src/llvm/lib_llvm_ext.cr b/src/llvm/lib_llvm_ext.cr
index a9d0dd9c7eed..c14e6f3ebc97 100644
--- a/src/llvm/lib_llvm_ext.cr
+++ b/src/llvm/lib_llvm_ext.cr
@@ -165,4 +165,9 @@ lib LibLLVMExt
fun target_machine_enable_global_isel = LLVMExtTargetMachineEnableGlobalIsel(machine : LibLLVM::TargetMachineRef, enable : Bool)
fun create_mc_jit_compiler_for_module = LLVMExtCreateMCJITCompilerForModule(jit : LibLLVM::ExecutionEngineRef*, m : LibLLVM::ModuleRef, options : LibLLVM::JITCompilerOptions*, options_length : UInt32, enable_global_isel : Bool, error : UInt8**) : Int32
+
+ {% unless LibLLVM::IS_38 %}
+ # LLVMCreateTypeAttribute is implemented in LLVM 13, but needed in 12
+ fun create_type_attribute = LLVMExtCreateTypeAttribute(ctx : LibLLVM::ContextRef, kind_id : LibC::UInt, ty : LibLLVM::TypeRef) : LibLLVM::AttributeRef
+ {% end %}
end
diff --git a/src/llvm/value_methods.cr b/src/llvm/value_methods.cr
index bab4569638ba..30a2e2bb7df1 100644
--- a/src/llvm/value_methods.cr
+++ b/src/llvm/value_methods.cr
@@ -14,11 +14,16 @@ module LLVM::ValueMethods
LibLLVM.get_value_kind(self)
end
- def add_instruction_attribute(index : Int, attribute : LLVM::Attribute, context : LLVM::Context)
+ def add_instruction_attribute(index : Int, attribute : LLVM::Attribute, context : LLVM::Context, type : LLVM::Type? = nil)
return if attribute.value == 0
{% if LibLLVM.has_constant?(:AttributeRef) %}
attribute.each_kind do |kind|
- attribute_ref = LibLLVM.create_enum_attribute(context, kind, 0)
+ if type && LLVM::Attribute.requires_type?(kind)
+ attribute_ref = LibLLVMExt.create_type_attribute(context, kind, type)
+ else
+ attribute_ref = LibLLVM.create_enum_attribute(context, kind, 0)
+ end
+
LibLLVM.add_call_site_attribute(self, index, attribute_ref)
end
{% else %}
diff --git a/src/log/broadcast_backend.cr b/src/log/broadcast_backend.cr
index 8a942baa374f..b6b558164020 100644
--- a/src/log/broadcast_backend.cr
+++ b/src/log/broadcast_backend.cr
@@ -15,7 +15,7 @@ class Log::BroadcastBackend < Log::Backend
super(:direct)
end
- def append(backend : Log::Backend, level : Severity)
+ def append(backend : Log::Backend, level : Severity) : Nil
@backends[backend] = level
end
@@ -47,7 +47,7 @@ class Log::BroadcastBackend < Log::Backend
end
# :nodoc:
- def remove(backend : Log::Backend)
+ def remove(backend : Log::Backend) : Nil
@backends.delete(backend)
end
end
diff --git a/src/log/dispatch.cr b/src/log/dispatch.cr
index e62e548bafb1..ba7cd1b00f81 100644
--- a/src/log/dispatch.cr
+++ b/src/log/dispatch.cr
@@ -51,7 +51,7 @@ class Log
spawn write_logs
end
- def dispatch(entry : Entry, backend : Backend)
+ def dispatch(entry : Entry, backend : Backend) : Nil
@channel.send({entry, backend})
end
diff --git a/src/log/format.cr b/src/log/format.cr
index 0baebcf26f6a..7a26699d68d7 100644
--- a/src/log/format.cr
+++ b/src/log/format.cr
@@ -64,17 +64,17 @@ class Log
end
# Write the entry timestamp in RFC3339 format
- def timestamp
+ def timestamp : Nil
@entry.timestamp.to_rfc3339(@io, fraction_digits: 6)
end
# Write a fixed string
- def string(str)
+ def string(str) : Nil
@io << str
end
# Write the message of the entry
- def message
+ def message : Nil
@io << @entry.message
end
@@ -107,7 +107,7 @@ class Log
# It doesn't write any output if the entry data is empty.
# Parameters `before` and `after` can be provided to be written around
# the value.
- def data(*, before = nil, after = nil)
+ def data(*, before = nil, after = nil) : Nil
unless @entry.data.empty?
@io << before << @entry.data << after
end
@@ -130,7 +130,7 @@ class Log
# Parameters `before` and `after` can be provided to be written around
# the value. `before` defaults to `'\n'` so the exception is written
# on a separate line
- def exception(*, before = '\n', after = nil)
+ def exception(*, before = '\n', after = nil) : Nil
if ex = @entry.exception
@io << before
ex.inspect_with_backtrace(@io)
@@ -139,7 +139,7 @@ class Log
end
# Write the program name. See `Log.progname`.
- def progname
+ def progname : Nil
@io << Log.progname
end
@@ -149,7 +149,7 @@ class Log
end
# Write the `Log::Entry` to the `IO` using this pattern
- def self.format(entry, io)
+ def self.format(entry, io) : Nil
new(entry, io).run
end
diff --git a/src/log/io_backend.cr b/src/log/io_backend.cr
index b449444ba439..cc7e38458552 100644
--- a/src/log/io_backend.cr
+++ b/src/log/io_backend.cr
@@ -14,7 +14,7 @@ class Log::IOBackend < Log::Backend
end
{% end %}
- def write(entry : Entry)
+ def write(entry : Entry) : Nil
format(entry)
io.puts
io.flush
@@ -22,7 +22,7 @@ class Log::IOBackend < Log::Backend
# Emits the *entry* to the given *io*.
# It uses the `#formatter` to convert.
- def format(entry : Entry)
+ def format(entry : Entry) : Nil
@formatter.format(entry, io)
end
end
diff --git a/src/log/main.cr b/src/log/main.cr
index e3ea3ba65412..bfa27b870151 100644
--- a/src/log/main.cr
+++ b/src/log/main.cr
@@ -120,7 +120,7 @@ class Log
# Log.context.clear
# Log.info { "message with empty context" }
# ```
- def clear
+ def clear : Nil
Fiber.current.logging_context = @metadata = Log::Metadata.empty
end
@@ -142,7 +142,7 @@ class Log
end
# :ditto:
- def set(values)
+ def set(values) : Nil
extend_fiber_context(Fiber.current, values)
end
diff --git a/src/log/memory_backend.cr b/src/log/memory_backend.cr
index 483f9aae0e51..22f979fda566 100644
--- a/src/log/memory_backend.cr
+++ b/src/log/memory_backend.cr
@@ -7,7 +7,7 @@ class Log::MemoryBackend < Log::Backend
super(:direct)
end
- def write(entry : Log::Entry)
+ def write(entry : Log::Entry) : Nil
@entries << entry
end
end
diff --git a/src/math/libm.cr b/src/math/libm.cr
index 1840108f8d42..844e59f10528 100644
--- a/src/math/libm.cr
+++ b/src/math/libm.cr
@@ -94,6 +94,8 @@ lib LibM
fun log1p_f64 = log1p(value : Float64) : Float64
fun logb_f32 = logbf(value : Float32) : Float32
fun logb_f64 = logb(value : Float64) : Float64
+ fun nextafter_f32 = nextafterf(from : Float32, to : Float32) : Float32
+ fun nextafter_f64 = nextafter(from : Float64, to : Float64) : Float64
fun scalbln_f32 = scalblnf(value1 : Float32, value2 : Int64) : Float32
fun scalbln_f64 = scalbln(value1 : Float64, value2 : Int64) : Float64
fun scalbn_f32 = scalbnf(value1 : Float32, value2 : Int32) : Float32
diff --git a/src/mime/multipart/builder.cr b/src/mime/multipart/builder.cr
index e96d6fe121b1..416fc3aa5ded 100644
--- a/src/mime/multipart/builder.cr
+++ b/src/mime/multipart/builder.cr
@@ -41,7 +41,7 @@ module MIME::Multipart
# if `#body_part` is called before this method.
#
# Can be called multiple times to append to the preamble multiple times.
- def preamble(string : String)
+ def preamble(string : String) : Nil
preamble { |io| string.to_s(io) }
end
@@ -49,7 +49,7 @@ module MIME::Multipart
# if `#body_part` is called before this method.
#
# Can be called multiple times to append to the preamble multiple times.
- def preamble(data : Bytes)
+ def preamble(data : Bytes) : Nil
preamble { |io| io.write data }
end
@@ -57,7 +57,7 @@ module MIME::Multipart
# Throws if `#body_part` is called before this method.
#
# Can be called multiple times to append to the preamble multiple times.
- def preamble(preamble_io : IO)
+ def preamble(preamble_io : IO) : Nil
preamble { |io| IO.copy(preamble_io, io) }
end
@@ -74,21 +74,21 @@ module MIME::Multipart
# Appends a body part to the multipart message with the given *headers*
# and *string*. Throws if `#finish` or `#epilogue` is called before this
# method.
- def body_part(headers : HTTP::Headers, string : String)
+ def body_part(headers : HTTP::Headers, string : String) : Nil
body_part_impl(headers) { |io| string.to_s(io) }
end
# Appends a body part to the multipart message with the given *headers*
# and *data*. Throws if `#finish` or `#epilogue` is called before this
# method.
- def body_part(headers : HTTP::Headers, data : Bytes)
+ def body_part(headers : HTTP::Headers, data : Bytes) : Nil
body_part_impl(headers) { |io| io.write data }
end
# Appends a body part to the multipart message with the given *headers*
# and data from *body_io*. Throws if `#finish` or `#epilogue` is called
# before this method.
- def body_part(headers : HTTP::Headers, body_io : IO)
+ def body_part(headers : HTTP::Headers, body_io : IO) : Nil
body_part_impl(headers) { |io| IO.copy(body_io, io) }
end
@@ -102,7 +102,7 @@ module MIME::Multipart
# Appends a body part to the multipart message with the given *headers*
# and no body data. Throws is `#finish` or `#epilogue` is called before
# this method.
- def body_part(headers : HTTP::Headers)
+ def body_part(headers : HTTP::Headers) : Nil
body_part_impl(headers, empty: true) { }
end
@@ -131,7 +131,7 @@ module MIME::Multipart
# appended.
#
# Can be called multiple times to append to the epilogue multiple times.
- def epilogue(string : String)
+ def epilogue(string : String) : Nil
epilogue { |io| string.to_s(io) }
end
@@ -140,7 +140,7 @@ module MIME::Multipart
# appended.
#
# Can be called multiple times to append to the epilogue multiple times.
- def epilogue(data : Bytes)
+ def epilogue(data : Bytes) : Nil
epilogue { |io| io.write data }
end
@@ -149,7 +149,7 @@ module MIME::Multipart
# been appended.
#
# Can be called multiple times to append to the epilogue multiple times.
- def epilogue(epilogue_io : IO)
+ def epilogue(epilogue_io : IO) : Nil
epilogue { |io| IO.copy(epilogue_io, io) }
end
@@ -174,7 +174,7 @@ module MIME::Multipart
# Finalizes the multipart message, this method must be called to properly
# end the multipart message.
- def finish
+ def finish : Nil
fail "Cannot finish multipart: no body parts" if @state == :START || @state == :PREAMBLE
fail "Cannot finish multipart: already finished" if @state == :FINISHED
diff --git a/src/named_tuple.cr b/src/named_tuple.cr
index 32d723e2ffd3..22a9a55e92a2 100644
--- a/src/named_tuple.cr
+++ b/src/named_tuple.cr
@@ -498,12 +498,18 @@ struct NamedTuple
# tuple = {name: "Crystal", year: 2011}
# tuple.to_a # => [{:name, "Crystal"}, {:year, 2011}]
# ```
+ #
+ # NOTE: `to_a` on an empty named tuple produces an `Array(Tuple(Symbol, NoReturn))`
def to_a
- ary = Array({typeof(first_key_internal), typeof(first_value_internal)}).new(size)
- each do |key, value|
- ary << {key.as(typeof(first_key_internal)), value.as(typeof(first_value_internal))}
- end
- ary
+ {% if T.size == 0 %}
+ [] of {Symbol, NoReturn}
+ {% else %}
+ [
+ {% for key in T %}
+ { {{key.symbolize}}, self[{{key.symbolize}}] },
+ {% end %}
+ ]
+ {% end %}
end
# Returns a `Hash` with the keys and values in this named tuple.
@@ -512,9 +518,11 @@ struct NamedTuple
# tuple = {name: "Crystal", year: 2011}
# tuple.to_h # => {:name => "Crystal", :year => 2011}
# ```
+ #
+ # NOTE: `to_h` on an empty named tuple produces a `Hash(Symbol, NoReturn)`
def to_h
{% if T.size == 0 %}
- {} of NoReturn => NoReturn
+ {} of Symbol => NoReturn
{% else %}
{
{% for key in T %}
diff --git a/src/oauth/params.cr b/src/oauth/params.cr
index 34a50fa22b2a..9689d4ac479c 100644
--- a/src/oauth/params.cr
+++ b/src/oauth/params.cr
@@ -4,13 +4,13 @@ struct OAuth::Params
@params = [] of {String, String}
end
- def add(key, value)
+ def add(key, value) : Nil
if value
@params << {URI.encode_www_form(key, space_to_plus: false), URI.encode_www_form(value, space_to_plus: false)}
end
end
- def add_query(query)
+ def add_query(query) : Nil
URI::Params.parse(query) do |key, value|
add key, value
end
diff --git a/src/oauth2/access_token/bearer.cr b/src/oauth2/access_token/bearer.cr
index 9e5a5c0148d3..c586dbb2cd47 100644
--- a/src/oauth2/access_token/bearer.cr
+++ b/src/oauth2/access_token/bearer.cr
@@ -13,7 +13,7 @@ class OAuth2::AccessToken::Bearer < OAuth2::AccessToken
request.headers["Authorization"] = "Bearer #{access_token}"
end
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.object do
json.field "token_type", "bearer"
json.field "access_token", access_token
diff --git a/src/oauth2/access_token/mac.cr b/src/oauth2/access_token/mac.cr
index 670b57357662..6f7a8f44cbf4 100644
--- a/src/oauth2/access_token/mac.cr
+++ b/src/oauth2/access_token/mac.cr
@@ -45,7 +45,7 @@ class OAuth2::AccessToken::Mac < OAuth2::AccessToken
Base64.strict_encode OpenSSL::HMAC.digest(digest, mac_key, normalized_request_string)
end
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.object do
json.field "token_type", "mac"
json.field "access_token", access_token
diff --git a/src/oauth2/session.cr b/src/oauth2/session.cr
index a3b56f8373c6..1ba9ec088cee 100644
--- a/src/oauth2/session.cr
+++ b/src/oauth2/session.cr
@@ -18,7 +18,7 @@ class OAuth2::Session
# Authenticates an `HTTP::Client`, refreshing the access token if it is expired.
#
# Invoke this method on an `HTTP::Client` before executing an HTTP request.
- def authenticate(http_client)
+ def authenticate(http_client) : Nil
check_refresh_token
@access_token.authenticate http_client
end
diff --git a/src/openssl/ssl/socket.cr b/src/openssl/ssl/socket.cr
index 22cf85d24dd1..fa74d45f466d 100644
--- a/src/openssl/ssl/socket.cr
+++ b/src/openssl/ssl/socket.cr
@@ -151,7 +151,7 @@ abstract class OpenSSL::SSL::Socket < IO
end
end
- def unbuffered_flush
+ def unbuffered_flush : Nil
@bio.io.flush
end
diff --git a/src/option_parser.cr b/src/option_parser.cr
index a7d6727f2a21..ec3f891759e3 100644
--- a/src/option_parser.cr
+++ b/src/option_parser.cr
@@ -220,7 +220,7 @@ class OptionParser
# before, and the flags registered after the call.
#
# This way, you can group the different options in an easier to read way.
- def separator(message = "")
+ def separator(message = "") : Nil
@flags << message.to_s
end
@@ -259,7 +259,7 @@ class OptionParser
# Stops the current parse and returns immediately, leaving the remaining flags
# unparsed. This is treated identically to `--` being inserted *behind* the
# current parsed flag.
- def stop
+ def stop : Nil
@stop = true
end
diff --git a/src/prelude.cr b/src/prelude.cr
index f391f0386ac2..79b5f838b03b 100644
--- a/src/prelude.cr
+++ b/src/prelude.cr
@@ -28,6 +28,7 @@ require "number"
require "annotations"
require "array"
require "atomic"
+require "base64"
require "bool"
require "box"
require "char"
diff --git a/src/pretty_print.cr b/src/pretty_print.cr
index 7dbf4be6a7cf..038da9d3eb4a 100644
--- a/src/pretty_print.cr
+++ b/src/pretty_print.cr
@@ -63,7 +63,7 @@ class PrettyPrint
end
# Appends a text element.
- def text(obj)
+ def text(obj) : Nil
obj = obj.to_s
width = obj.size
return if width == 0
@@ -84,7 +84,7 @@ class PrettyPrint
end
# Appends an element that can turn into a newline if necessary.
- def breakable(sep = " ")
+ def breakable(sep = " ") : Nil
width = sep.size
group = @group_stack.last
if group.break?
@@ -102,7 +102,7 @@ class PrettyPrint
# Similar to `#breakable` except
# the decision to break or not is determined individually.
- def fill_breakable(sep = " ")
+ def fill_breakable(sep = " ") : Nil
group { breakable sep }
end
@@ -149,7 +149,7 @@ class PrettyPrint
# text ","
# breakable
# ```
- def comma
+ def comma : Nil
text ","
breakable
end
@@ -185,7 +185,7 @@ class PrettyPrint
end
# Outputs any buffered data.
- def flush
+ def flush : Nil
@buffer.each do |data|
@output_width = data.output(@output, @output_width)
end
@@ -249,7 +249,7 @@ class PrettyPrint
@break = false
end
- def break
+ def break : Nil
@break = true
end
end
diff --git a/src/slice.cr b/src/slice.cr
index e33c1e40b7ae..f4e518dbf77b 100644
--- a/src/slice.cr
+++ b/src/slice.cr
@@ -351,6 +351,53 @@ struct Slice(T)
Slice.new(size, read_only: read_only) { |i| yield @pointer[i], offset + i }
end
+ # Replaces every element in `self` with the given *value*. Returns `self`.
+ #
+ # ```
+ # slice = Slice[1, 2, 3, 4]
+ # slice.fill(2) # => Slice[2, 2, 2, 2]
+ # slice # => Slice[2, 2, 2, 2]
+ # ```
+ def fill(value : T) : self
+ check_writable
+
+ {% if T == UInt8 %}
+ Intrinsics.memset(to_unsafe.as(Void*), value, size, false)
+ self
+ {% else %}
+ {% if Number::Primitive.union_types.includes?(T) %}
+ if value == 0
+ to_unsafe.clear(size)
+ return self
+ end
+ {% end %}
+
+ fill { value }
+ {% end %}
+ end
+
+ # Yields each index of `self` to the given block and then assigns
+ # the block's value in that position. Returns `self`.
+ #
+ # Accepts an optional *offset* parameter, which tells the block to start
+ # counting from there.
+ #
+ # ```
+ # slice = Slice[2, 1, 1, 1]
+ # slice.fill { |i| i * i } # => Slice[0, 1, 4, 9]
+ # slice # => Slice[0, 1, 4, 9]
+ # slice.fill(offset: 3) { |i| i * i } # => Slice[9, 16, 25, 36]
+ # slice # => Slice[9, 16, 25, 36]
+ # ```
+ def fill(*, offset : Int = 0, & : Int32 -> T) : self
+ check_writable
+
+ size.times do |i|
+ to_unsafe[i] = yield offset + i
+ end
+ self
+ end
+
def copy_from(source : Pointer(T), count)
check_writable
check_size(count)
@@ -690,8 +737,16 @@ struct Slice(T)
# a.sort # => Slice[1, 2, 3]
# a # => Slice[3, 1, 2]
# ```
- def sort(*, stable : Bool = true) : Slice(T)
- dup.sort!(stable: stable)
+ def sort : Slice(T)
+ dup.sort!
+ end
+
+ # :ditto:
+ #
+ # This method does not guarantee stability between equally sorting elements.
+ # Which results in a performance advantage over stable sort.
+ def unstable_sort : Slice(T)
+ dup.unstable_sort!
end
# Returns a new slice with all elements sorted based on the comparator in the
@@ -708,12 +763,24 @@ struct Slice(T)
# b # => Slice[3, 2, 1]
# a # => Slice[3, 1, 2]
# ```
- def sort(*, stable : Bool = true, &block : T, T -> U) : Slice(T) forall U
+ def sort(&block : T, T -> U) : Slice(T) forall U
{% unless U <= Int32? %}
{% raise "expected block to return Int32 or Nil, not #{U}" %}
{% end %}
- dup.sort!(stable: stable, &block)
+ dup.sort! &block
+ end
+
+ # :ditto:
+ #
+ # This method does not guarantee stability between equally sorting elements.
+ # Which results in a performance advantage over stable sort.
+ def unstable_sort(&block : T, T -> U) : Slice(T) forall U
+ {% unless U <= Int32? %}
+ {% raise "expected block to return Int32 or Nil, not #{U}" %}
+ {% end %}
+
+ dup.unstable_sort!(&block)
end
# Modifies `self` by sorting all elements based on the return value of their
@@ -724,12 +791,19 @@ struct Slice(T)
# a.sort!
# a # => Slice[1, 2, 3]
# ```
- def sort!(*, stable : Bool = true) : Slice(T)
- if stable
- Slice.merge_sort!(self)
- else
- Slice.intro_sort!(to_unsafe, size)
- end
+ def sort! : Slice(T)
+ Slice.merge_sort!(self)
+
+ self
+ end
+
+ # :ditto:
+ #
+ # This method does not guarantee stability between equally sorting elements.
+ # Which results in a performance advantage over stable sort.
+ def unstable_sort! : Slice(T)
+ Slice.intro_sort!(to_unsafe, size)
+
self
end
@@ -746,16 +820,27 @@ struct Slice(T)
# a.sort! { |a, b| b <=> a }
# a # => Slice[3, 2, 1]
# ```
- def sort!(*, stable : Bool = true, &block : T, T -> U) : Slice(T) forall U
+ def sort!(&block : T, T -> U) : Slice(T) forall U
{% unless U <= Int32? %}
{% raise "expected block to return Int32 or Nil, not #{U}" %}
{% end %}
- if stable
- Slice.merge_sort!(self, block)
- else
- Slice.intro_sort!(to_unsafe, size, block)
- end
+ Slice.merge_sort!(self, block)
+
+ self
+ end
+
+ # :ditto:
+ #
+ # This method does not guarantee stability between equally sorting elements.
+ # Which results in a performance advantage over stable sort.
+ def unstable_sort!(&block : T, T -> U) : Slice(T) forall U
+ {% unless U <= Int32? %}
+ {% raise "expected block to return Int32 or Nil, not #{U}" %}
+ {% end %}
+
+ Slice.intro_sort!(to_unsafe, size, block)
+
self
end
@@ -769,8 +854,16 @@ struct Slice(T)
# b # => Slice["fig", "pear", "apple"]
# a # => Slice["apple", "pear", "fig"]
# ```
- def sort_by(*, stable : Bool = true, &block : T -> _) : Slice(T)
- dup.sort_by!(stable: stable) { |e| yield(e) }
+ def sort_by(&block : T -> _) : Slice(T)
+ dup.sort_by! { |e| yield(e) }
+ end
+
+ # :ditto:
+ #
+ # This method does not guarantee stability between equally sorting elements.
+ # Which results in a performance advantage over stable sort.
+ def unstable_sort_by(&block : T -> _) : Slice(T)
+ dup.unstable_sort_by! { |e| yield(e) }
end
# Modifies `self` by sorting all elements. The given block is called for
@@ -782,8 +875,20 @@ struct Slice(T)
# a.sort_by! { |word| word.size }
# a # => Slice["fig", "pear", "apple"]
# ```
- def sort_by!(*, stable : Bool = true, &block : T -> _) : Slice(T)
- sorted = map { |e| {e, yield(e)} }.sort!(stable: stable) { |x, y| x[1] <=> y[1] }
+ def sort_by!(&block : T -> _) : Slice(T)
+ sorted = map { |e| {e, yield(e)} }.sort! { |x, y| x[1] <=> y[1] }
+ size.times do |i|
+ to_unsafe[i] = sorted.to_unsafe[i][0]
+ end
+ self
+ end
+
+ # :ditto:
+ #
+ # This method does not guarantee stability between equally sorting elements.
+ # Which results in a performance advantage over stable sort.
+ def unstable_sort_by!(&block : T -> _) : Slice(T)
+ sorted = map { |e| {e, yield(e)} }.unstable_sort! { |x, y| x[1] <=> y[1] }
size.times do |i|
to_unsafe[i] = sorted.to_unsafe[i][0]
end
diff --git a/src/static_array.cr b/src/static_array.cr
index cec9f6d7f2c4..85b74cde53d7 100644
--- a/src/static_array.cr
+++ b/src/static_array.cr
@@ -168,14 +168,8 @@ struct StaticArray(T, N)
# array # => StaticArray[2, 2, 2]
# ```
def fill(value : T) : self
- {% if Number::Primitive.union_types.includes?(T) %}
- if value == 0
- to_unsafe.clear(size)
- return self
- end
- {% end %}
-
- fill { value }
+ to_slice.fill(value)
+ self
end
# Yields each index of `self` to the given block and then assigns
@@ -187,9 +181,7 @@ struct StaticArray(T, N)
# array # => StaticArray[0, 1, 4, 9]
# ```
def fill(& : Int32 -> T) : self
- size.times do |i|
- to_unsafe[i] = yield i
- end
+ to_slice.fill { |i| yield i }
self
end
diff --git a/src/string.cr b/src/string.cr
index caefdae1243b..c2f0749da5e3 100644
--- a/src/string.cr
+++ b/src/string.cr
@@ -4958,7 +4958,7 @@ class String
# Appends `self` to *io*.
def to_s(io : IO) : Nil
- io.write_utf8(to_slice)
+ io.write_string(to_slice)
end
# Returns the underlying bytes of this String.
diff --git a/src/string/builder.cr b/src/string/builder.cr
index 6719a2c3e149..1ccd8de10897 100644
--- a/src/string/builder.cr
+++ b/src/string/builder.cr
@@ -64,6 +64,16 @@ class String::Builder < IO
nil
end
+ def write_string(slice : Bytes) : Nil
+ write(slice)
+ end
+
+ def set_encoding(encoding : String, invalid : Symbol? = nil) : Nil
+ unless utf8_encoding?(encoding, invalid)
+ raise "Can't change encoding of String::Builder"
+ end
+ end
+
def buffer : Pointer(UInt8)
@buffer + String::HEADER_SIZE
end
diff --git a/src/string/formatter.cr b/src/string/formatter.cr
index 55b32c1b22e4..44d14d67ac2b 100644
--- a/src/string/formatter.cr
+++ b/src/string/formatter.cr
@@ -273,7 +273,7 @@ struct String::Formatter(A)
temp_buf = temp_buf(len)
LibC.snprintf(temp_buf, len, format_buf, float)
- @io.write_utf8 Slice.new(temp_buf, len - 1)
+ @io.write_string Slice.new(temp_buf, len - 1)
else
raise ArgumentError.new("Expected a float, not #{arg.inspect}")
end
@@ -323,7 +323,7 @@ struct String::Formatter(A)
pad size, flags
end
- def char(char)
+ def char(char) : Nil
@io << char
end
diff --git a/src/time.cr b/src/time.cr
index fd090773bebd..d85fe3f3ab03 100644
--- a/src/time.cr
+++ b/src/time.cr
@@ -1113,7 +1113,7 @@ struct Time
#
# Number of seconds decimals can be selected with *fraction_digits*.
# Values accepted are 0 (the default, no decimals), 3 (milliseconds), 6 (microseconds) or 9 (nanoseconds).
- def to_rfc3339(io : IO, *, fraction_digits : Int = 0)
+ def to_rfc3339(io : IO, *, fraction_digits : Int = 0) : Nil
Format::RFC_3339.format(to_utc, io, fraction_digits)
end
diff --git a/src/time/format/custom/iso_8601.cr b/src/time/format/custom/iso_8601.cr
index 6d1331e2ee08..3cdaa4dd33e7 100644
--- a/src/time/format/custom/iso_8601.cr
+++ b/src/time/format/custom/iso_8601.cr
@@ -1,19 +1,19 @@
struct Time::Format
module Pattern
- def date_time_iso_8601
+ def date_time_iso_8601 : Nil
year_month_day_iso_8601
char? 'T'
time_iso_8601
end
- def time_iso_8601
+ def time_iso_8601 : Nil
hour_minute_second_iso8601
time_zone_z_or_offset
end
end
struct Parser
- def year_month_day_iso_8601
+ def year_month_day_iso_8601 : Nil
year
extended_format = char? '-'
if current_char == 'W'
@@ -58,7 +58,7 @@ struct Time::Format
end
end
- def hour_minute_second_iso8601
+ def hour_minute_second_iso8601 : Nil
hour_24_zero_padded
decimal_seconds = Time::SECONDS_PER_HOUR
@@ -106,7 +106,7 @@ struct Time::Format
end
struct Formatter
- def year_month_day_iso_8601
+ def year_month_day_iso_8601 : Nil
year_month_day
end
diff --git a/src/time/format/formatter.cr b/src/time/format/formatter.cr
index 1abe28655104..3eafed806857 100644
--- a/src/time/format/formatter.cr
+++ b/src/time/format/formatter.cr
@@ -11,143 +11,143 @@ struct Time::Format
def initialize(@time : Time, @io : IO)
end
- def year
+ def year : Nil
pad4(time.year, '0')
end
- def year_modulo_100
+ def year_modulo_100 : Nil
pad2(time.year % 100, '0')
end
- def year_divided_by_100
+ def year_divided_by_100 : Nil
io << time.year // 100
end
- def full_or_short_year
+ def full_or_short_year : Nil
year
end
- def calendar_week_year
+ def calendar_week_year : Nil
pad4(time.calendar_week[0], '0')
end
- def calendar_week_year_modulo100
+ def calendar_week_year_modulo100 : Nil
pad2(time.calendar_week[0] % 100, '0')
end
- def month
+ def month : Nil
io << time.month
end
- def month_zero_padded
+ def month_zero_padded : Nil
pad2 time.month, '0'
end
- def month_blank_padded
+ def month_blank_padded : Nil
pad2 time.month, ' '
end
- def month_name
+ def month_name : Nil
io << get_month_name
end
- def month_name_upcase
+ def month_name_upcase : Nil
io << get_month_name.upcase
end
- def short_month_name
+ def short_month_name : Nil
io << get_short_month_name
end
- def short_month_name_upcase
+ def short_month_name_upcase : Nil
io << get_short_month_name.upcase
end
- def calendar_week_week
+ def calendar_week_week : Nil
pad2(time.calendar_week[1], '0')
end
- def day_of_month
+ def day_of_month : Nil
io << time.day
end
- def day_of_month_zero_padded
+ def day_of_month_zero_padded : Nil
pad2 time.day, '0'
end
- def day_of_month_blank_padded
+ def day_of_month_blank_padded : Nil
pad2 time.day, ' '
end
- def day_name
+ def day_name : Nil
io << get_day_name
end
- def day_name_upcase
+ def day_name_upcase : Nil
io << get_day_name.upcase
end
- def short_day_name
+ def short_day_name : Nil
io << get_short_day_name
end
- def short_day_name_upcase
+ def short_day_name_upcase : Nil
io << get_short_day_name.upcase
end
- def short_day_name_with_comma?
+ def short_day_name_with_comma? : Nil
short_day_name
char ','
whitespace
end
- def day_of_year_zero_padded
+ def day_of_year_zero_padded : Nil
pad3 time.day_of_year, '0'
end
- def hour_24_zero_padded
+ def hour_24_zero_padded : Nil
pad2 time.hour, '0'
end
- def hour_24_blank_padded
+ def hour_24_blank_padded : Nil
pad2 time.hour, ' '
end
- def hour_12_zero_padded
+ def hour_12_zero_padded : Nil
h = (time.hour % 12)
pad2 (h == 0 ? 12 : h), '0'
end
- def hour_12_blank_padded
+ def hour_12_blank_padded : Nil
h = (time.hour % 12)
pad2 (h == 0 ? 12 : h), ' '
end
- def minute
+ def minute : Nil
pad2 time.minute, '0'
end
- def second
+ def second : Nil
pad2 time.second, '0'
end
- def milliseconds
+ def milliseconds : Nil
pad3 time.millisecond, '0'
end
- def microseconds
+ def microseconds : Nil
pad6 time.nanosecond // 1000, '0'
end
- def nanoseconds
+ def nanoseconds : Nil
pad9 time.nanosecond, '0'
end
- def second_fraction
+ def second_fraction : Nil
nanoseconds
end
- def second_fraction?(fraction_digits : Int = 9)
+ def second_fraction?(fraction_digits : Int = 9) : Nil
case fraction_digits
when 0
when 3 then char '.'; milliseconds
@@ -158,31 +158,31 @@ struct Time::Format
end
end
- def am_pm
+ def am_pm : Nil
io << (time.hour < 12 ? "am" : "pm")
end
- def am_pm_upcase
+ def am_pm_upcase : Nil
io << (time.hour < 12 ? "AM" : "PM")
end
- def day_of_week_monday_1_7
+ def day_of_week_monday_1_7 : Nil
io << time.day_of_week.value
end
- def day_of_week_sunday_0_6
+ def day_of_week_sunday_0_6 : Nil
io << time.day_of_week.value % 7
end
- def unix_seconds
+ def unix_seconds : Nil
io << time.to_unix
end
- def time_zone(with_seconds = false)
+ def time_zone(with_seconds = false) : Nil
time_zone_offset(format_seconds: with_seconds)
end
- def time_zone_z_or_offset(**options)
+ def time_zone_z_or_offset(**options) : Nil
if time.utc?
io << 'Z'
else
@@ -194,23 +194,23 @@ struct Time::Format
time.zone.format(io, with_colon: force_colon, with_seconds: format_seconds)
end
- def time_zone_colon(with_seconds = false)
+ def time_zone_colon(with_seconds = false) : Nil
time_zone_offset(force_colon: true, format_seconds: with_seconds)
end
- def time_zone_colon_with_seconds
+ def time_zone_colon_with_seconds : Nil
time_zone_colon(with_seconds: true)
end
- def time_zone_gmt
+ def time_zone_gmt : Nil
io << "GMT"
end
- def time_zone_rfc2822
+ def time_zone_rfc2822 : Nil
time_zone_offset(allow_colon: false)
end
- def time_zone_gmt_or_rfc2822(**options)
+ def time_zone_gmt_or_rfc2822(**options) : Nil
if time.utc? || time.location.name == "UT" || time.location.name == "GMT"
time_zone_gmt
else
@@ -218,7 +218,7 @@ struct Time::Format
end
end
- def time_zone_name(zone = false)
+ def time_zone_name(zone = false) : Nil
if zone
io << time.zone.name
else
@@ -226,7 +226,7 @@ struct Time::Format
end
end
- def char(char, *alternatives)
+ def char(char, *alternatives) : Nil
io << char
end
@@ -234,7 +234,7 @@ struct Time::Format
char(char, *alternatives)
end
- def whitespace
+ def whitespace : Nil
io << ' '
end
@@ -254,28 +254,28 @@ struct Time::Format
get_day_name[0, 3]
end
- def pad2(value, padding)
+ def pad2(value, padding) : Nil
io.write_byte padding.ord.to_u8 if value < 10
io << value
end
- def pad3(value, padding)
+ def pad3(value, padding) : Nil
io.write_byte padding.ord.to_u8 if value < 100
pad2 value, padding
end
- def pad4(value, padding)
+ def pad4(value, padding) : Nil
io.write_byte padding.ord.to_u8 if value < 1000
pad3 value, padding
end
- def pad6(value, padding)
+ def pad6(value, padding) : Nil
io.write_byte padding.ord.to_u8 if value < 100000
io.write_byte padding.ord.to_u8 if value < 10000
pad4 value, padding
end
- def pad9(value, padding)
+ def pad9(value, padding) : Nil
io.write_byte padding.ord.to_u8 if value < 100000000
io.write_byte padding.ord.to_u8 if value < 10000000
io.write_byte padding.ord.to_u8 if value < 1000000
diff --git a/src/tuple.cr b/src/tuple.cr
index adff9a4d3827..ddf4e92e00e5 100644
--- a/src/tuple.cr
+++ b/src/tuple.cr
@@ -530,6 +530,34 @@ struct Tuple
nil
end
+ # :inherit:
+ def reduce
+ {% if T.empty? %}
+ raise Enumerable::EmptyError.new
+ {% else %}
+ memo = self[0]
+ {% for i in 1...T.size %}
+ memo = yield memo, self[{{ i }}]
+ {% end %}
+ memo
+ {% end %}
+ end
+
+ # :inherit:
+ def reduce(memo)
+ {% for i in 0...T.size %}
+ memo = yield memo, self[{{ i }}]
+ {% end %}
+ memo
+ end
+
+ # :inherit:
+ def reduce?
+ {% unless T.empty? %}
+ reduce { |memo, elem| yield memo, elem }
+ {% end %}
+ end
+
# Returns the first element of this tuple. Doesn't compile
# if the tuple is empty.
#
diff --git a/src/uuid/json.cr b/src/uuid/json.cr
index d9b56f7258ca..040668f4a6b8 100644
--- a/src/uuid/json.cr
+++ b/src/uuid/json.cr
@@ -32,7 +32,7 @@ struct UUID
# uuid = UUID.new("87b3042b-9b9a-41b7-8b15-a93d3f17025e")
# uuid.to_json # => "\"87b3042b-9b9a-41b7-8b15-a93d3f17025e\""
# ```
- def to_json(json : JSON::Builder)
+ def to_json(json : JSON::Builder) : Nil
json.string(to_s)
end
diff --git a/src/xml/builder.cr b/src/xml/builder.cr
index 742054bbccdf..e50bba52ca66 100644
--- a/src/xml/builder.cr
+++ b/src/xml/builder.cr
@@ -247,7 +247,7 @@ class XML::Builder
# Forces content written to this writer to be flushed to
# this writer's `IO`.
- def flush
+ def flush : Nil
call Flush
@io.flush
diff --git a/src/xml/node.cr b/src/xml/node.cr
index cac2abac2bdb..c3fa4d0dd26a 100644
--- a/src/xml/node.cr
+++ b/src/xml/node.cr
@@ -294,6 +294,19 @@ class XML::Node
end
end
+ # Returns namespaces defined on self element directly.
+ def namespace_definitions : Array(Namespace)
+ namespaces = [] of Namespace
+
+ ns = @node.value.ns_def
+ while ns
+ namespaces << Namespace.new(document, ns)
+ ns = ns.value.next
+ end
+
+ namespaces
+ end
+
# Returns namespaces in scope for self – those defined on self element
# directly or any ancestor node – as an `Array` of `XML::Namespace` objects.
#
@@ -304,13 +317,8 @@ class XML::Node
def namespace_scopes : Array(Namespace)
scopes = [] of Namespace
- ns_list = LibXML.xmlGetNsList(@node.value.doc, @node)
-
- if ns_list
- while ns_list.value
- scopes << Namespace.new(document, ns_list.value)
- ns_list += 1
- end
+ each_namespace do |namespace|
+ scopes << namespace
end
scopes
diff --git a/src/yaml/any.cr b/src/yaml/any.cr
index 880f0c75c330..71b6b2e2e379 100644
--- a/src/yaml/any.cr
+++ b/src/yaml/any.cr
@@ -312,7 +312,7 @@ struct YAML::Any
raw.to_yaml(io)
end
- def to_json(builder : JSON::Builder)
+ def to_json(builder : JSON::Builder) : Nil
if (raw = self.raw).is_a?(Slice)
raise "Can't serialize #{raw.class} to JSON"
else
diff --git a/src/yaml/builder.cr b/src/yaml/builder.cr
index 1e96dd5142a8..73ec669c25cf 100644
--- a/src/yaml/builder.cr
+++ b/src/yaml/builder.cr
@@ -61,7 +61,7 @@ class YAML::Builder
end
# Ends a YAML stream.
- def end_stream
+ def end_stream : Nil
emit stream_end
flush
end
@@ -96,14 +96,14 @@ class YAML::Builder
end
# Starts a sequence.
- def start_sequence(anchor : String? = nil, tag : String? = nil, style : YAML::SequenceStyle = YAML::SequenceStyle::ANY)
+ def start_sequence(anchor : String? = nil, tag : String? = nil, style : YAML::SequenceStyle = YAML::SequenceStyle::ANY) : Nil
implicit = tag ? 0 : 1
emit sequence_start, get_anchor(anchor), string_to_unsafe(tag), implicit, style
increase_nesting
end
# Ends a sequence.
- def end_sequence
+ def end_sequence : Nil
emit sequence_end
decrease_nesting
end
@@ -115,14 +115,14 @@ class YAML::Builder
end
# Starts a mapping.
- def start_mapping(anchor : String? = nil, tag : String? = nil, style : YAML::MappingStyle = YAML::MappingStyle::ANY)
+ def start_mapping(anchor : String? = nil, tag : String? = nil, style : YAML::MappingStyle = YAML::MappingStyle::ANY) : Nil
implicit = tag ? 0 : 1
emit mapping_start, get_anchor(anchor), string_to_unsafe(tag), implicit, style
increase_nesting
end
# Ends a mapping.
- def end_mapping
+ def end_mapping : Nil
emit mapping_end
decrease_nesting
end
@@ -185,7 +185,7 @@ class YAML::Builder
end
# Closes the builder, freeing up resources.
- def close
+ def close : Nil
finalize
@closed = true
end
diff --git a/src/yaml/nodes/parser.cr b/src/yaml/nodes/parser.cr
index 20fd0aed550b..d63cf093196c 100644
--- a/src/yaml/nodes/parser.cr
+++ b/src/yaml/nodes/parser.cr
@@ -46,7 +46,7 @@ class YAML::Nodes::Parser < YAML::Parser
node.start_column = @pull_parser.start_column.to_i
end
- def end_value(node)
+ def end_value(node) : Nil
node.end_line = @pull_parser.end_line.to_i
node.end_column = @pull_parser.end_column.to_i
end
@@ -72,15 +72,15 @@ class YAML::Nodes::Parser < YAML::Parser
documents << document
end
- def add_to_document(document, node)
+ def add_to_document(document, node) : Nil
document << node
end
- def add_to_sequence(sequence, node)
+ def add_to_sequence(sequence, node) : Nil
sequence << node
end
- def add_to_mapping(mapping, key, value)
+ def add_to_mapping(mapping, key, value) : Nil
mapping[key] = value
end
end
diff --git a/src/yaml/parser.cr b/src/yaml/parser.cr
index 547ff56a72e8..5b27cee2a3b9 100644
--- a/src/yaml/parser.cr
+++ b/src/yaml/parser.cr
@@ -157,7 +157,7 @@ abstract class YAML::Parser
end
# Closes this parser, freeing up resources.
- def close
+ def close : Nil
@pull_parser.close
end
diff --git a/src/yaml/pull_parser.cr b/src/yaml/pull_parser.cr
index f24a8a5182a8..1cdfa8131d92 100644
--- a/src/yaml/pull_parser.cr
+++ b/src/yaml/pull_parser.cr
@@ -260,24 +260,24 @@ class YAML::PullParser
# Note: YAML starts counting from 0, we want to count from 1
- def location
+ def location : {Int32, Int32}
{start_line, start_column}
end
- def start_line : Int
- @event.start_mark.line + 1
+ def start_line : Int32
+ @event.start_mark.line.to_i32 + 1
end
- def start_column : Int
- @event.start_mark.column + 1
+ def start_column : Int32
+ @event.start_mark.column.to_i32 + 1
end
- def end_line : Int
- @event.end_mark.line + 1
+ def end_line : Int32
+ @event.end_mark.line.to_i32 + 1
end
- def end_column : Int
- @event.end_mark.column + 1
+ def end_column : Int32
+ @event.end_mark.column.to_i32 + 1
end
private def problem_line_number
@@ -321,7 +321,7 @@ class YAML::PullParser
LibYAML.yaml_event_delete(pointerof(@event))
end
- def close
+ def close : Nil
finalize
@closed = true
end
diff --git a/src/yaml/schema/core/parser.cr b/src/yaml/schema/core/parser.cr
index 0b4402b853a7..bc17ef63856d 100644
--- a/src/yaml/schema/core/parser.cr
+++ b/src/yaml/schema/core/parser.cr
@@ -36,15 +36,15 @@ class YAML::Schema::Core::Parser < YAML::Parser
Any.new(Core.parse_scalar(@pull_parser))
end
- def add_to_documents(documents, document)
+ def add_to_documents(documents, document) : Nil
documents << document
end
- def add_to_document(document, node)
+ def add_to_document(document, node) : Nil
document.as_a << node
end
- def add_to_sequence(sequence, node)
+ def add_to_sequence(sequence, node) : Nil
sequence.as_a << node
end
diff --git a/src/yaml/schema/fail_safe.cr b/src/yaml/schema/fail_safe.cr
index f309537f67b8..2518f104c447 100644
--- a/src/yaml/schema/fail_safe.cr
+++ b/src/yaml/schema/fail_safe.cr
@@ -50,19 +50,19 @@ module YAML::Schema::FailSafe
Any.new(@pull_parser.value)
end
- def add_to_documents(documents, document)
+ def add_to_documents(documents, document) : Nil
documents << document
end
- def add_to_document(document, node)
+ def add_to_document(document, node) : Nil
document.as_a << node
end
- def add_to_sequence(sequence, node)
+ def add_to_sequence(sequence, node) : Nil
sequence.as_a << node
end
- def add_to_mapping(mapping, key, value)
+ def add_to_mapping(mapping, key, value) : Nil
mapping.as_h[key] = value
end
end
