From 395b0b45946e9f2d328b8fbb2e33de12842a33b9 Mon Sep 17 00:00:00 2001 From: Code Ass Date: Sun, 5 Nov 2017 00:07:30 +0900 Subject: [PATCH 1/4] Set frozen_string_literal: true --- lib/rdoc.rb | 2 +- lib/rdoc/alias.rb | 2 +- lib/rdoc/anon_class.rb | 2 +- lib/rdoc/any_method.rb | 2 +- lib/rdoc/attr.rb | 2 +- lib/rdoc/class_module.rb | 2 +- lib/rdoc/code_object.rb | 2 +- lib/rdoc/code_objects.rb | 2 +- lib/rdoc/comment.rb | 2 +- lib/rdoc/constant.rb | 2 +- lib/rdoc/context.rb | 2 +- lib/rdoc/context/section.rb | 2 +- lib/rdoc/cross_reference.rb | 2 +- lib/rdoc/encoding.rb | 2 +- lib/rdoc/erb_partial.rb | 2 +- lib/rdoc/erbio.rb | 2 +- lib/rdoc/extend.rb | 2 +- lib/rdoc/generator.rb | 2 +- lib/rdoc/generator/darkfish.rb | 2 +- lib/rdoc/generator/json_index.rb | 2 +- lib/rdoc/generator/markup.rb | 2 +- lib/rdoc/generator/pot.rb | 2 +- lib/rdoc/generator/pot/message_extractor.rb | 2 +- lib/rdoc/generator/pot/po.rb | 2 +- lib/rdoc/generator/pot/po_entry.rb | 2 +- lib/rdoc/generator/ri.rb | 2 +- lib/rdoc/ghost_method.rb | 2 +- lib/rdoc/i18n.rb | 2 +- lib/rdoc/i18n/locale.rb | 2 +- lib/rdoc/i18n/text.rb | 2 +- lib/rdoc/include.rb | 2 +- lib/rdoc/known_classes.rb | 2 +- lib/rdoc/markdown/entities.rb | 2 +- lib/rdoc/markup.rb | 2 +- lib/rdoc/markup/attr_changer.rb | 2 +- lib/rdoc/markup/attr_span.rb | 2 +- lib/rdoc/markup/attribute_manager.rb | 2 +- lib/rdoc/markup/attributes.rb | 2 +- lib/rdoc/markup/blank_line.rb | 2 +- lib/rdoc/markup/block_quote.rb | 2 +- lib/rdoc/markup/document.rb | 2 +- lib/rdoc/markup/formatter.rb | 2 +- lib/rdoc/markup/formatter_test_case.rb | 2 +- lib/rdoc/markup/hard_break.rb | 2 +- lib/rdoc/markup/heading.rb | 2 +- lib/rdoc/markup/include.rb | 2 +- lib/rdoc/markup/indented_paragraph.rb | 2 +- lib/rdoc/markup/inline.rb | 2 +- lib/rdoc/markup/list.rb | 2 +- lib/rdoc/markup/list_item.rb | 2 +- lib/rdoc/markup/paragraph.rb | 2 +- lib/rdoc/markup/parser.rb | 2 +- lib/rdoc/markup/pre_process.rb | 2 +- lib/rdoc/markup/raw.rb | 2 +- lib/rdoc/markup/rule.rb | 2 +- lib/rdoc/markup/special.rb | 2 +- lib/rdoc/markup/text_formatter_test_case.rb | 2 +- lib/rdoc/markup/to_ansi.rb | 2 +- lib/rdoc/markup/to_bs.rb | 2 +- lib/rdoc/markup/to_html.rb | 2 +- lib/rdoc/markup/to_html_crossref.rb | 2 +- lib/rdoc/markup/to_html_snippet.rb | 2 +- lib/rdoc/markup/to_joined_paragraph.rb | 2 +- lib/rdoc/markup/to_label.rb | 2 +- lib/rdoc/markup/to_markdown.rb | 2 +- lib/rdoc/markup/to_rdoc.rb | 2 +- lib/rdoc/markup/to_table_of_contents.rb | 2 +- lib/rdoc/markup/to_test.rb | 2 +- lib/rdoc/markup/to_tt_only.rb | 2 +- lib/rdoc/markup/verbatim.rb | 2 +- lib/rdoc/meta_method.rb | 2 +- lib/rdoc/method_attr.rb | 2 +- lib/rdoc/mixin.rb | 2 +- lib/rdoc/normal_class.rb | 2 +- lib/rdoc/normal_module.rb | 2 +- lib/rdoc/options.rb | 2 +- lib/rdoc/parser.rb | 2 +- lib/rdoc/parser/c.rb | 2 +- lib/rdoc/parser/changelog.rb | 2 +- lib/rdoc/parser/markdown.rb | 2 +- lib/rdoc/parser/rd.rb | 2 +- lib/rdoc/parser/ruby.rb | 2 +- lib/rdoc/parser/ruby_tools.rb | 2 +- lib/rdoc/parser/simple.rb | 2 +- lib/rdoc/parser/text.rb | 2 +- lib/rdoc/rd.rb | 2 +- lib/rdoc/rd/inline.rb | 2 +- lib/rdoc/rdoc.rb | 2 +- lib/rdoc/require.rb | 2 +- lib/rdoc/ri.rb | 2 +- lib/rdoc/ri/driver.rb | 2 +- lib/rdoc/ri/formatter.rb | 2 +- lib/rdoc/ri/paths.rb | 2 +- lib/rdoc/ri/store.rb | 2 +- lib/rdoc/ri/task.rb | 2 +- lib/rdoc/rubygems_hook.rb | 2 +- lib/rdoc/servlet.rb | 2 +- lib/rdoc/single_class.rb | 2 +- lib/rdoc/stats.rb | 2 +- lib/rdoc/stats/normal.rb | 2 +- lib/rdoc/stats/quiet.rb | 2 +- lib/rdoc/stats/verbose.rb | 2 +- lib/rdoc/store.rb | 2 +- lib/rdoc/task.rb | 2 +- lib/rdoc/test_case.rb | 2 +- lib/rdoc/text.rb | 2 +- lib/rdoc/token_stream.rb | 2 +- lib/rdoc/tom_doc.rb | 2 +- lib/rdoc/top_level.rb | 2 +- test/test_rdoc_alias.rb | 2 +- test/test_rdoc_any_method.rb | 2 +- test/test_rdoc_attr.rb | 2 +- test/test_rdoc_class_module.rb | 2 +- test/test_rdoc_code_object.rb | 2 +- test/test_rdoc_comment.rb | 2 +- test/test_rdoc_constant.rb | 2 +- test/test_rdoc_context.rb | 2 +- test/test_rdoc_context_section.rb | 2 +- test/test_rdoc_cross_reference.rb | 2 +- test/test_rdoc_encoding.rb | 2 +- test/test_rdoc_extend.rb | 2 +- test/test_rdoc_generator_darkfish.rb | 2 +- test/test_rdoc_generator_json_index.rb | 2 +- test/test_rdoc_generator_markup.rb | 2 +- test/test_rdoc_generator_pot.rb | 2 +- test/test_rdoc_generator_pot_po.rb | 2 +- test/test_rdoc_generator_pot_po_entry.rb | 2 +- test/test_rdoc_generator_ri.rb | 2 +- test/test_rdoc_i18n_locale.rb | 2 +- test/test_rdoc_i18n_text.rb | 2 +- test/test_rdoc_include.rb | 2 +- test/test_rdoc_markdown.rb | 2 +- test/test_rdoc_markdown_test.rb | 2 +- test/test_rdoc_markup.rb | 2 +- test/test_rdoc_markup_attribute_manager.rb | 2 +- test/test_rdoc_markup_attributes.rb | 2 +- test/test_rdoc_markup_document.rb | 2 +- test/test_rdoc_markup_formatter.rb | 2 +- test/test_rdoc_markup_hard_break.rb | 2 +- test/test_rdoc_markup_heading.rb | 2 +- test/test_rdoc_markup_include.rb | 2 +- test/test_rdoc_markup_indented_paragraph.rb | 2 +- test/test_rdoc_markup_paragraph.rb | 2 +- test/test_rdoc_markup_parser.rb | 2 +- test/test_rdoc_markup_pre_process.rb | 2 +- test/test_rdoc_markup_raw.rb | 2 +- test/test_rdoc_markup_to_ansi.rb | 2 +- test/test_rdoc_markup_to_bs.rb | 2 +- test/test_rdoc_markup_to_html.rb | 2 +- test/test_rdoc_markup_to_html_crossref.rb | 2 +- test/test_rdoc_markup_to_html_snippet.rb | 2 +- test/test_rdoc_markup_to_joined_paragraph.rb | 2 +- test/test_rdoc_markup_to_label.rb | 2 +- test/test_rdoc_markup_to_markdown.rb | 2 +- test/test_rdoc_markup_to_rdoc.rb | 2 +- test/test_rdoc_markup_to_table_of_contents.rb | 2 +- test/test_rdoc_markup_to_tt_only.rb | 2 +- test/test_rdoc_markup_verbatim.rb | 2 +- test/test_rdoc_method_attr.rb | 2 +- test/test_rdoc_normal_class.rb | 2 +- test/test_rdoc_normal_module.rb | 2 +- test/test_rdoc_options.rb | 2 +- test/test_rdoc_parser.rb | 2 +- test/test_rdoc_parser_c.rb | 2 +- test/test_rdoc_parser_changelog.rb | 2 +- test/test_rdoc_parser_markdown.rb | 2 +- test/test_rdoc_parser_rd.rb | 2 +- test/test_rdoc_parser_ruby.rb | 2 +- test/test_rdoc_parser_simple.rb | 2 +- test/test_rdoc_rd.rb | 2 +- test/test_rdoc_rd_block_parser.rb | 2 +- test/test_rdoc_rd_inline.rb | 2 +- test/test_rdoc_rd_inline_parser.rb | 2 +- test/test_rdoc_rdoc.rb | 2 +- test/test_rdoc_require.rb | 2 +- test/test_rdoc_ri_driver.rb | 2 +- test/test_rdoc_ri_paths.rb | 2 +- test/test_rdoc_rubygems_hook.rb | 2 +- test/test_rdoc_servlet.rb | 2 +- test/test_rdoc_single_class.rb | 2 +- test/test_rdoc_stats.rb | 2 +- test/test_rdoc_store.rb | 2 +- test/test_rdoc_task.rb | 2 +- test/test_rdoc_text.rb | 2 +- test/test_rdoc_token_stream.rb | 2 +- test/test_rdoc_tom_doc.rb | 2 +- test/test_rdoc_top_level.rb | 2 +- test/xref_data.rb | 2 +- test/xref_test_case.rb | 2 +- 189 files changed, 189 insertions(+), 189 deletions(-) diff --git a/lib/rdoc.rb b/lib/rdoc.rb index af05b57116..ee448e661d 100644 --- a/lib/rdoc.rb +++ b/lib/rdoc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true $DEBUG_RDOC = nil # :main: README.rdoc diff --git a/lib/rdoc/alias.rb b/lib/rdoc/alias.rb index 1e06fb96e5..858e053049 100644 --- a/lib/rdoc/alias.rb +++ b/lib/rdoc/alias.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Represent an alias, which is an old_name/new_name pair associated with a # particular context diff --git a/lib/rdoc/anon_class.rb b/lib/rdoc/anon_class.rb index 098bfdfcf9..d02a38c2cf 100644 --- a/lib/rdoc/anon_class.rb +++ b/lib/rdoc/anon_class.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An anonymous class like: # diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb index 5dbdf9e0ef..e61f263cdc 100644 --- a/lib/rdoc/any_method.rb +++ b/lib/rdoc/any_method.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # AnyMethod is the base class for objects representing methods diff --git a/lib/rdoc/attr.rb b/lib/rdoc/attr.rb index f77a5c04a7..f780b3b976 100644 --- a/lib/rdoc/attr.rb +++ b/lib/rdoc/attr.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An attribute created by \#attr, \#attr_reader, \#attr_writer or # \#attr_accessor diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb index 33a8baa6a6..fdd56e236b 100644 --- a/lib/rdoc/class_module.rb +++ b/lib/rdoc/class_module.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # ClassModule is the base class for objects representing either a class or a # module. diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb index 11c682b7fa..48a6761b87 100644 --- a/lib/rdoc/code_object.rb +++ b/lib/rdoc/code_object.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Base class for the RDoc code tree. # diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb index 564849e1d1..434a25ac7f 100644 --- a/lib/rdoc/code_objects.rb +++ b/lib/rdoc/code_objects.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true # This file was used to load all the RDoc::CodeObject subclasses at once. Now # autoload handles this. diff --git a/lib/rdoc/comment.rb b/lib/rdoc/comment.rb index c655763b3e..f8482e2754 100644 --- a/lib/rdoc/comment.rb +++ b/lib/rdoc/comment.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A comment holds the text comment for a RDoc::CodeObject and provides a # unified way of cleaning it up and parsing it into an RDoc::Markup::Document. diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb index 7e1e10da72..0c3d7505a1 100644 --- a/lib/rdoc/constant.rb +++ b/lib/rdoc/constant.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A constant diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb index 3294b2561c..52f01be809 100644 --- a/lib/rdoc/context.rb +++ b/lib/rdoc/context.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'cgi' ## diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb index 7c3c8c603d..64877f944c 100644 --- a/lib/rdoc/context/section.rb +++ b/lib/rdoc/context/section.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A section of documentation like: # diff --git a/lib/rdoc/cross_reference.rb b/lib/rdoc/cross_reference.rb index 0e40d23159..d76ebaf2d0 100644 --- a/lib/rdoc/cross_reference.rb +++ b/lib/rdoc/cross_reference.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # RDoc::CrossReference is a reusable way to create cross references for names. diff --git a/lib/rdoc/encoding.rb b/lib/rdoc/encoding.rb index 44881d043c..150865b623 100644 --- a/lib/rdoc/encoding.rb +++ b/lib/rdoc/encoding.rb @@ -1,5 +1,5 @@ # coding: US-ASCII -# frozen_string_literal: false +# frozen_string_literal: true ## # This class is a wrapper around File IO and Encoding that helps RDoc load diff --git a/lib/rdoc/erb_partial.rb b/lib/rdoc/erb_partial.rb index d17dda20a9..8dc2c46013 100644 --- a/lib/rdoc/erb_partial.rb +++ b/lib/rdoc/erb_partial.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Allows an ERB template to be rendered in the context (binding) of an # existing ERB template evaluation. diff --git a/lib/rdoc/erbio.rb b/lib/rdoc/erbio.rb index a2aaa90e67..42ce895fb3 100644 --- a/lib/rdoc/erbio.rb +++ b/lib/rdoc/erbio.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'erb' ## diff --git a/lib/rdoc/extend.rb b/lib/rdoc/extend.rb index 30b51a1dbd..e1b182902e 100644 --- a/lib/rdoc/extend.rb +++ b/lib/rdoc/extend.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A Module extension to a class with \#extend # diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb index 6efc5e4474..340dcbf7ae 100644 --- a/lib/rdoc/generator.rb +++ b/lib/rdoc/generator.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # RDoc uses generators to turn parsed source code in the form of an # RDoc::CodeObject tree into some form of output. RDoc comes with the HTML diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb index 6cf2896189..bf4eb1f530 100644 --- a/lib/rdoc/generator/darkfish.rb +++ b/lib/rdoc/generator/darkfish.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true # -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*- require 'erb' diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb index ea9384e6d3..2a9db9bfc4 100644 --- a/lib/rdoc/generator/json_index.rb +++ b/lib/rdoc/generator/json_index.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'json' begin require 'zlib' diff --git a/lib/rdoc/generator/markup.rb b/lib/rdoc/generator/markup.rb index 3ca423bb69..fef982d378 100644 --- a/lib/rdoc/generator/markup.rb +++ b/lib/rdoc/generator/markup.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Handle common RDoc::Markup tasks for various CodeObjects # diff --git a/lib/rdoc/generator/pot.rb b/lib/rdoc/generator/pot.rb index e2cf22d730..8a1e0b4bd0 100644 --- a/lib/rdoc/generator/pot.rb +++ b/lib/rdoc/generator/pot.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Generates a POT file. # diff --git a/lib/rdoc/generator/pot/message_extractor.rb b/lib/rdoc/generator/pot/message_extractor.rb index 0dd2497c26..313dfd2dc7 100644 --- a/lib/rdoc/generator/pot/message_extractor.rb +++ b/lib/rdoc/generator/pot/message_extractor.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Extracts message from RDoc::Store diff --git a/lib/rdoc/generator/pot/po.rb b/lib/rdoc/generator/pot/po.rb index 60e14db831..8cb61b8a1c 100644 --- a/lib/rdoc/generator/pot/po.rb +++ b/lib/rdoc/generator/pot/po.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Generates a PO format text diff --git a/lib/rdoc/generator/pot/po_entry.rb b/lib/rdoc/generator/pot/po_entry.rb index 515d02b48d..d537cb85e3 100644 --- a/lib/rdoc/generator/pot/po_entry.rb +++ b/lib/rdoc/generator/pot/po_entry.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A PO entry in PO diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb index 830777e587..0eef1d03f5 100644 --- a/lib/rdoc/generator/ri.rb +++ b/lib/rdoc/generator/ri.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Generates ri data files diff --git a/lib/rdoc/ghost_method.rb b/lib/rdoc/ghost_method.rb index a1f75bfe4b..2488feb9d7 100644 --- a/lib/rdoc/ghost_method.rb +++ b/lib/rdoc/ghost_method.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # GhostMethod represents a method referenced only by a comment diff --git a/lib/rdoc/i18n.rb b/lib/rdoc/i18n.rb index 14a3739c1c..4cb5986155 100644 --- a/lib/rdoc/i18n.rb +++ b/lib/rdoc/i18n.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # This module provides i18n related features. diff --git a/lib/rdoc/i18n/locale.rb b/lib/rdoc/i18n/locale.rb index 4d55f6965d..6a70d6c986 100644 --- a/lib/rdoc/i18n/locale.rb +++ b/lib/rdoc/i18n/locale.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A message container for a locale. # diff --git a/lib/rdoc/i18n/text.rb b/lib/rdoc/i18n/text.rb index fcfe7611bc..517abf1540 100644 --- a/lib/rdoc/i18n/text.rb +++ b/lib/rdoc/i18n/text.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An i18n supported text. # diff --git a/lib/rdoc/include.rb b/lib/rdoc/include.rb index efce43bffb..b3ad610649 100644 --- a/lib/rdoc/include.rb +++ b/lib/rdoc/include.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A Module included in a class with \#include # diff --git a/lib/rdoc/known_classes.rb b/lib/rdoc/known_classes.rb index 8d9421255b..4d7f4aa995 100644 --- a/lib/rdoc/known_classes.rb +++ b/lib/rdoc/known_classes.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true module RDoc ## diff --git a/lib/rdoc/markdown/entities.rb b/lib/rdoc/markdown/entities.rb index d32ae51053..d2cf610293 100644 --- a/lib/rdoc/markdown/entities.rb +++ b/lib/rdoc/markdown/entities.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # HTML entity name map for RDoc::Markdown diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb index 982bc13e88..08ecc6f7df 100644 --- a/lib/rdoc/markup.rb +++ b/lib/rdoc/markup.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # RDoc::Markup parses plain text documents and attempts to decompose them into # their constituent parts. Some of these parts are high-level: paragraphs, diff --git a/lib/rdoc/markup/attr_changer.rb b/lib/rdoc/markup/attr_changer.rb index 9a1a9c8c66..4c4bc6479e 100644 --- a/lib/rdoc/markup/attr_changer.rb +++ b/lib/rdoc/markup/attr_changer.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true class RDoc::Markup AttrChanger = Struct.new :turn_on, :turn_off # :nodoc: diff --git a/lib/rdoc/markup/attr_span.rb b/lib/rdoc/markup/attr_span.rb index 4d9e5b0217..63aace60d2 100644 --- a/lib/rdoc/markup/attr_span.rb +++ b/lib/rdoc/markup/attr_span.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An array of attributes which parallels the characters in a string. diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb index 6edb30b867..a10f731615 100644 --- a/lib/rdoc/markup/attribute_manager.rb +++ b/lib/rdoc/markup/attribute_manager.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Manages changes of attributes in a block of text diff --git a/lib/rdoc/markup/attributes.rb b/lib/rdoc/markup/attributes.rb index 8776c4ed29..ec30160d3d 100644 --- a/lib/rdoc/markup/attributes.rb +++ b/lib/rdoc/markup/attributes.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # We manage a set of attributes. Each attribute has a symbol name and a bit # value. diff --git a/lib/rdoc/markup/blank_line.rb b/lib/rdoc/markup/blank_line.rb index 2b1ab91b47..3129ab5e7f 100644 --- a/lib/rdoc/markup/blank_line.rb +++ b/lib/rdoc/markup/blank_line.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An empty line. This class is a singleton. diff --git a/lib/rdoc/markup/block_quote.rb b/lib/rdoc/markup/block_quote.rb index 3be022f9dd..7a4b3e36b0 100644 --- a/lib/rdoc/markup/block_quote.rb +++ b/lib/rdoc/markup/block_quote.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A quoted section which contains markup items. diff --git a/lib/rdoc/markup/document.rb b/lib/rdoc/markup/document.rb index 0692c3522f..f3a5de1fc3 100644 --- a/lib/rdoc/markup/document.rb +++ b/lib/rdoc/markup/document.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A Document containing lists, headings, paragraphs, etc. diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb index 197ff003e3..5dc71d2242 100644 --- a/lib/rdoc/markup/formatter.rb +++ b/lib/rdoc/markup/formatter.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Base class for RDoc markup formatters # diff --git a/lib/rdoc/markup/formatter_test_case.rb b/lib/rdoc/markup/formatter_test_case.rb index a5b4933de4..076b7c81bb 100644 --- a/lib/rdoc/markup/formatter_test_case.rb +++ b/lib/rdoc/markup/formatter_test_case.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'minitest/unit' ## diff --git a/lib/rdoc/markup/hard_break.rb b/lib/rdoc/markup/hard_break.rb index 5898bfb644..046068d5c2 100644 --- a/lib/rdoc/markup/hard_break.rb +++ b/lib/rdoc/markup/hard_break.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A hard-break in the middle of a paragraph. diff --git a/lib/rdoc/markup/heading.rb b/lib/rdoc/markup/heading.rb index 5229287d5b..233774c5c4 100644 --- a/lib/rdoc/markup/heading.rb +++ b/lib/rdoc/markup/heading.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A heading with a level (1-6) and text diff --git a/lib/rdoc/markup/include.rb b/lib/rdoc/markup/include.rb index 891be71b85..ad7c4a9640 100644 --- a/lib/rdoc/markup/include.rb +++ b/lib/rdoc/markup/include.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A file included at generation time. Objects of this class are created by # RDoc::RD for an extension-less include. diff --git a/lib/rdoc/markup/indented_paragraph.rb b/lib/rdoc/markup/indented_paragraph.rb index 56a96bd3c9..d42b2e52b8 100644 --- a/lib/rdoc/markup/indented_paragraph.rb +++ b/lib/rdoc/markup/indented_paragraph.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An Indented Paragraph of text diff --git a/lib/rdoc/markup/inline.rb b/lib/rdoc/markup/inline.rb index 58072fef06..aba7ec21ce 100644 --- a/lib/rdoc/markup/inline.rb +++ b/lib/rdoc/markup/inline.rb @@ -1,2 +1,2 @@ -# frozen_string_literal: false +# frozen_string_literal: true warn "requiring rdoc/markup/inline is deprecated and will be removed in RDoc 4." if $-w diff --git a/lib/rdoc/markup/list.rb b/lib/rdoc/markup/list.rb index bcaea7d7c1..05c3609202 100644 --- a/lib/rdoc/markup/list.rb +++ b/lib/rdoc/markup/list.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A List is a homogeneous set of ListItems. # diff --git a/lib/rdoc/markup/list_item.rb b/lib/rdoc/markup/list_item.rb index 115ec0412c..d22554ee73 100644 --- a/lib/rdoc/markup/list_item.rb +++ b/lib/rdoc/markup/list_item.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # An item within a List that contains paragraphs, headings, etc. # diff --git a/lib/rdoc/markup/paragraph.rb b/lib/rdoc/markup/paragraph.rb index fefa12f9ef..a2e45ef009 100644 --- a/lib/rdoc/markup/paragraph.rb +++ b/lib/rdoc/markup/paragraph.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A Paragraph of text diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb index 22cca20420..9e6505da9d 100644 --- a/lib/rdoc/markup/parser.rb +++ b/lib/rdoc/markup/parser.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'strscan' ## diff --git a/lib/rdoc/markup/pre_process.rb b/lib/rdoc/markup/pre_process.rb index e2115f0c56..c3c51b765c 100644 --- a/lib/rdoc/markup/pre_process.rb +++ b/lib/rdoc/markup/pre_process.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Handle common directives that can occur in a block of text: # diff --git a/lib/rdoc/markup/raw.rb b/lib/rdoc/markup/raw.rb index 8012d2cea6..85e2c8b825 100644 --- a/lib/rdoc/markup/raw.rb +++ b/lib/rdoc/markup/raw.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A section of text that is added to the output document as-is diff --git a/lib/rdoc/markup/rule.rb b/lib/rdoc/markup/rule.rb index b96d4fb293..38c1dc7f56 100644 --- a/lib/rdoc/markup/rule.rb +++ b/lib/rdoc/markup/rule.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A horizontal rule with a weight diff --git a/lib/rdoc/markup/special.rb b/lib/rdoc/markup/special.rb index 4d834b9e37..57261b44a7 100644 --- a/lib/rdoc/markup/special.rb +++ b/lib/rdoc/markup/special.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Hold details of a special sequence diff --git a/lib/rdoc/markup/text_formatter_test_case.rb b/lib/rdoc/markup/text_formatter_test_case.rb index 1c8882aa36..22a762b5f0 100644 --- a/lib/rdoc/markup/text_formatter_test_case.rb +++ b/lib/rdoc/markup/text_formatter_test_case.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Test case for creating new plain-text RDoc::Markup formatters. See also # RDoc::Markup::FormatterTestCase diff --git a/lib/rdoc/markup/to_ansi.rb b/lib/rdoc/markup/to_ansi.rb index 56cd1fe446..6cc3b70e93 100644 --- a/lib/rdoc/markup/to_ansi.rb +++ b/lib/rdoc/markup/to_ansi.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Outputs RDoc markup with vibrant ANSI color! diff --git a/lib/rdoc/markup/to_bs.rb b/lib/rdoc/markup/to_bs.rb index 9a1c7c6ccd..fea017e89d 100644 --- a/lib/rdoc/markup/to_bs.rb +++ b/lib/rdoc/markup/to_bs.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Outputs RDoc markup with hot backspace action! You will probably need a # pager to use this output format. diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb index d2c9a23a79..c5e1f073f8 100644 --- a/lib/rdoc/markup/to_html.rb +++ b/lib/rdoc/markup/to_html.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'cgi' ## diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb index 3f03c65898..2911aee954 100644 --- a/lib/rdoc/markup/to_html_crossref.rb +++ b/lib/rdoc/markup/to_html_crossref.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Subclass of the RDoc::Markup::ToHtml class that supports looking up method # names, classes, etc to create links. RDoc::CrossReference is used to diff --git a/lib/rdoc/markup/to_html_snippet.rb b/lib/rdoc/markup/to_html_snippet.rb index 75c1df94d9..24aa1d32d9 100644 --- a/lib/rdoc/markup/to_html_snippet.rb +++ b/lib/rdoc/markup/to_html_snippet.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Outputs RDoc markup as paragraphs with inline markup only. diff --git a/lib/rdoc/markup/to_joined_paragraph.rb b/lib/rdoc/markup/to_joined_paragraph.rb index 3cc35e51d4..795f3f62ee 100644 --- a/lib/rdoc/markup/to_joined_paragraph.rb +++ b/lib/rdoc/markup/to_joined_paragraph.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Joins the parts of an RDoc::Markup::Paragraph into a single String. # diff --git a/lib/rdoc/markup/to_label.rb b/lib/rdoc/markup/to_label.rb index bdf08b7aee..9f179013f2 100644 --- a/lib/rdoc/markup/to_label.rb +++ b/lib/rdoc/markup/to_label.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'cgi' ## diff --git a/lib/rdoc/markup/to_markdown.rb b/lib/rdoc/markup/to_markdown.rb index 9074547b4c..d471032f9f 100644 --- a/lib/rdoc/markup/to_markdown.rb +++ b/lib/rdoc/markup/to_markdown.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true # :markup: markdown ## diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb index a40c09859f..1cb4d6bab2 100644 --- a/lib/rdoc/markup/to_rdoc.rb +++ b/lib/rdoc/markup/to_rdoc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Outputs RDoc markup as RDoc markup! (mostly) diff --git a/lib/rdoc/markup/to_table_of_contents.rb b/lib/rdoc/markup/to_table_of_contents.rb index eae7c59d94..f68b90bcf6 100644 --- a/lib/rdoc/markup/to_table_of_contents.rb +++ b/lib/rdoc/markup/to_table_of_contents.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Extracts just the RDoc::Markup::Heading elements from a # RDoc::Markup::Document to help build a table of contents diff --git a/lib/rdoc/markup/to_test.rb b/lib/rdoc/markup/to_test.rb index 7b1fa8c630..61d3cffaf0 100644 --- a/lib/rdoc/markup/to_test.rb +++ b/lib/rdoc/markup/to_test.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # This Markup outputter is used for testing purposes. diff --git a/lib/rdoc/markup/to_tt_only.rb b/lib/rdoc/markup/to_tt_only.rb index ba20fcdd00..4f43546e3d 100644 --- a/lib/rdoc/markup/to_tt_only.rb +++ b/lib/rdoc/markup/to_tt_only.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Extracts sections of text enclosed in plus, tt or code. Used to discover # undocumented parameters. diff --git a/lib/rdoc/markup/verbatim.rb b/lib/rdoc/markup/verbatim.rb index a0b1d05928..7f1bc29a09 100644 --- a/lib/rdoc/markup/verbatim.rb +++ b/lib/rdoc/markup/verbatim.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A section of verbatim text diff --git a/lib/rdoc/meta_method.rb b/lib/rdoc/meta_method.rb index 408c089dd1..7927a9ce9c 100644 --- a/lib/rdoc/meta_method.rb +++ b/lib/rdoc/meta_method.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # MetaMethod represents a meta-programmed method diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb index 50eab141be..a1625a8872 100644 --- a/lib/rdoc/method_attr.rb +++ b/lib/rdoc/method_attr.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Abstract class representing either a method or an attribute. diff --git a/lib/rdoc/mixin.rb b/lib/rdoc/mixin.rb index 14f04c15e7..379d7cc526 100644 --- a/lib/rdoc/mixin.rb +++ b/lib/rdoc/mixin.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A Mixin adds features from a module into another context. RDoc::Include and # RDoc::Extend are both mixins. diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb index eb53e964dd..9278011778 100644 --- a/lib/rdoc/normal_class.rb +++ b/lib/rdoc/normal_class.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A normal class, neither singleton nor anonymous diff --git a/lib/rdoc/normal_module.rb b/lib/rdoc/normal_module.rb index d046c8cbfe..8f364be41c 100644 --- a/lib/rdoc/normal_module.rb +++ b/lib/rdoc/normal_module.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A normal module, like NormalClass diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index 60cfb5e553..e4fe4f75e9 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'optparse' require 'pathname' diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb index 823a6d014c..2b826d9284 100644 --- a/lib/rdoc/parser.rb +++ b/lib/rdoc/parser.rb @@ -1,5 +1,5 @@ # -*- coding: us-ascii -*- -# frozen_string_literal: false +# frozen_string_literal: true ## # A parser is simple a class that subclasses RDoc::Parser and implements #scan diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb index 5c940ab28e..10061bfc7d 100644 --- a/lib/rdoc/parser/c.rb +++ b/lib/rdoc/parser/c.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'tsort' ## diff --git a/lib/rdoc/parser/changelog.rb b/lib/rdoc/parser/changelog.rb index c6c2d2bb23..f460321d3a 100644 --- a/lib/rdoc/parser/changelog.rb +++ b/lib/rdoc/parser/changelog.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'time' ## diff --git a/lib/rdoc/parser/markdown.rb b/lib/rdoc/parser/markdown.rb index feffb26ced..9ff478f872 100644 --- a/lib/rdoc/parser/markdown.rb +++ b/lib/rdoc/parser/markdown.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Parse a Markdown format file. The parsed RDoc::Markup::Document is attached # as a file comment. diff --git a/lib/rdoc/parser/rd.rb b/lib/rdoc/parser/rd.rb index e6693b9ac8..25f5711731 100644 --- a/lib/rdoc/parser/rd.rb +++ b/lib/rdoc/parser/rd.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Parse a RD format file. The parsed RDoc::Markup::Document is attached as a # file comment. diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index 97c0511eda..9d0344283b 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # This file contains stuff stolen outright from: # diff --git a/lib/rdoc/parser/ruby_tools.rb b/lib/rdoc/parser/ruby_tools.rb index ecd7065e4f..1f621cd32e 100644 --- a/lib/rdoc/parser/ruby_tools.rb +++ b/lib/rdoc/parser/ruby_tools.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Collection of methods for writing parsers diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb index f2ab27a92e..bef6da177f 100644 --- a/lib/rdoc/parser/simple.rb +++ b/lib/rdoc/parser/simple.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Parse a non-source file. We basically take the whole thing as one big # comment. diff --git a/lib/rdoc/parser/text.rb b/lib/rdoc/parser/text.rb index 1a13fd1186..01de0cc595 100644 --- a/lib/rdoc/parser/text.rb +++ b/lib/rdoc/parser/text.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Indicates this parser is text and doesn't contain code constructs. # diff --git a/lib/rdoc/rd.rb b/lib/rdoc/rd.rb index 39af3294f5..0d3d3cea85 100644 --- a/lib/rdoc/rd.rb +++ b/lib/rdoc/rd.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # RDoc::RD implements the RD format from the rdtool gem. # diff --git a/lib/rdoc/rd/inline.rb b/lib/rdoc/rd/inline.rb index 011ec67e33..cf37ed9f05 100644 --- a/lib/rdoc/rd/inline.rb +++ b/lib/rdoc/rd/inline.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Inline keeps track of markup and labels to create proper links. diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index adcb65b13b..48c2d099b6 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc' require 'find' diff --git a/lib/rdoc/require.rb b/lib/rdoc/require.rb index f565ffad78..91f9c24e5d 100644 --- a/lib/rdoc/require.rb +++ b/lib/rdoc/require.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A file loaded by \#require diff --git a/lib/rdoc/ri.rb b/lib/rdoc/ri.rb index 388cb12c70..c798c1fc49 100644 --- a/lib/rdoc/ri.rb +++ b/lib/rdoc/ri.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc' ## diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb index 51d633be58..fa0e040a42 100644 --- a/lib/rdoc/ri/driver.rb +++ b/lib/rdoc/ri/driver.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'abbrev' require 'optparse' diff --git a/lib/rdoc/ri/formatter.rb b/lib/rdoc/ri/formatter.rb index d0c85dbe6b..832a101e6c 100644 --- a/lib/rdoc/ri/formatter.rb +++ b/lib/rdoc/ri/formatter.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # For RubyGems backwards compatibility diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index 94db2216a2..d41e610591 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/ri' ## diff --git a/lib/rdoc/ri/store.rb b/lib/rdoc/ri/store.rb index 66e234f521..9f4b03734a 100644 --- a/lib/rdoc/ri/store.rb +++ b/lib/rdoc/ri/store.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true module RDoc::RI Store = RDoc::Store # :nodoc: diff --git a/lib/rdoc/ri/task.rb b/lib/rdoc/ri/task.rb index cc0a85d4b7..6a6ea572bf 100644 --- a/lib/rdoc/ri/task.rb +++ b/lib/rdoc/ri/task.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true begin gem 'rdoc' rescue Gem::LoadError diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb index e9351b7280..90b0541fcf 100644 --- a/lib/rdoc/rubygems_hook.rb +++ b/lib/rdoc/rubygems_hook.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rubygems/user_interaction' require 'fileutils' require 'rdoc' diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb index dfc71436b8..89f26553ac 100644 --- a/lib/rdoc/servlet.rb +++ b/lib/rdoc/servlet.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc' require 'time' require 'json' diff --git a/lib/rdoc/single_class.rb b/lib/rdoc/single_class.rb index 7affa027e1..6a7b67deb3 100644 --- a/lib/rdoc/single_class.rb +++ b/lib/rdoc/single_class.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A singleton class diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb index 354e904b19..bd6c0ef23a 100644 --- a/lib/rdoc/stats.rb +++ b/lib/rdoc/stats.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # RDoc statistics collector which prints a summary and report of a project's # documentation totals. diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb index 9f7ca59c34..9ab878e7e8 100644 --- a/lib/rdoc/stats/normal.rb +++ b/lib/rdoc/stats/normal.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true begin require 'io/console/size' rescue LoadError diff --git a/lib/rdoc/stats/quiet.rb b/lib/rdoc/stats/quiet.rb index 561c272ef7..bc4161b2d4 100644 --- a/lib/rdoc/stats/quiet.rb +++ b/lib/rdoc/stats/quiet.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Stats printer that prints nothing diff --git a/lib/rdoc/stats/verbose.rb b/lib/rdoc/stats/verbose.rb index e04edade52..6ace8937a2 100644 --- a/lib/rdoc/stats/verbose.rb +++ b/lib/rdoc/stats/verbose.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Stats printer that prints everything documented, including the documented # status diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb index aaefff8f13..999aa76f92 100644 --- a/lib/rdoc/store.rb +++ b/lib/rdoc/store.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'fileutils' ## diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb index 1074de0197..323d00eabc 100644 --- a/lib/rdoc/task.rb +++ b/lib/rdoc/task.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true #-- # Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel # diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb index 594fb31272..501f5c3b8b 100644 --- a/lib/rdoc/test_case.rb +++ b/lib/rdoc/test_case.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true begin gem 'minitest', '~> 4.0' unless defined?(Test::Unit) rescue NoMethodError, Gem::LoadError diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb index 88ff255f01..2890d1901f 100644 --- a/lib/rdoc/text.rb +++ b/lib/rdoc/text.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # For RDoc::Text#to_html diff --git a/lib/rdoc/token_stream.rb b/lib/rdoc/token_stream.rb index 3e6a71e089..05fb46e89a 100644 --- a/lib/rdoc/token_stream.rb +++ b/lib/rdoc/token_stream.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A TokenStream is a list of tokens, gathered during the parse of some entity # (say a method). Entities populate these streams by being registered with the diff --git a/lib/rdoc/tom_doc.rb b/lib/rdoc/tom_doc.rb index d760849938..66a5ae7a33 100644 --- a/lib/rdoc/tom_doc.rb +++ b/lib/rdoc/tom_doc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true # :markup: tomdoc # A parser for TomDoc based on TomDoc 1.0.0-rc1 (02adef9b5a) diff --git a/lib/rdoc/top_level.rb b/lib/rdoc/top_level.rb index 38be646ad0..6186722772 100644 --- a/lib/rdoc/top_level.rb +++ b/lib/rdoc/top_level.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # A TopLevel context is a representation of the contents of a single file diff --git a/test/test_rdoc_alias.rb b/test/test_rdoc_alias.rb index fa0ab0f366..89ae2d5a56 100644 --- a/test/test_rdoc_alias.rb +++ b/test/test_rdoc_alias.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocAlias < XrefTestCase diff --git a/test/test_rdoc_any_method.rb b/test/test_rdoc_any_method.rb index 20d041bd7e..55793255ba 100644 --- a/test/test_rdoc_any_method.rb +++ b/test/test_rdoc_any_method.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocAnyMethod < XrefTestCase diff --git a/test/test_rdoc_attr.rb b/test/test_rdoc_attr.rb index e4062d1807..ae702ac702 100644 --- a/test/test_rdoc_attr.rb +++ b/test/test_rdoc_attr.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocAttr < RDoc::TestCase diff --git a/test/test_rdoc_class_module.rb b/test/test_rdoc_class_module.rb index 503492fca5..273a21120f 100644 --- a/test/test_rdoc_class_module.rb +++ b/test/test_rdoc_class_module.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocClassModule < XrefTestCase diff --git a/test/test_rdoc_code_object.rb b/test/test_rdoc_code_object.rb index be4ca268e4..bdf6d8ae85 100644 --- a/test/test_rdoc_code_object.rb +++ b/test/test_rdoc_code_object.rb @@ -1,5 +1,5 @@ # coding: US-ASCII -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ diff --git a/test/test_rdoc_comment.rb b/test/test_rdoc_comment.rb index 3b0927212f..9eba298017 100644 --- a/test/test_rdoc_comment.rb +++ b/test/test_rdoc_comment.rb @@ -1,5 +1,5 @@ # coding: us-ascii -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_constant.rb b/test/test_rdoc_constant.rb index a03ab97a7d..e715131579 100644 --- a/test/test_rdoc_constant.rb +++ b/test/test_rdoc_constant.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocConstant < XrefTestCase diff --git a/test/test_rdoc_context.rb b/test/test_rdoc_context.rb index ceac14ac90..a7d6a58716 100644 --- a/test/test_rdoc_context.rb +++ b/test/test_rdoc_context.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocContext < XrefTestCase diff --git a/test/test_rdoc_context_section.rb b/test/test_rdoc_context_section.rb index b008c60c57..ff88b9b66a 100644 --- a/test/test_rdoc_context_section.rb +++ b/test/test_rdoc_context_section.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocContextSection < RDoc::TestCase diff --git a/test/test_rdoc_cross_reference.rb b/test/test_rdoc_cross_reference.rb index c39d6ad356..a294553704 100644 --- a/test/test_rdoc_cross_reference.rb +++ b/test/test_rdoc_cross_reference.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocCrossReference < XrefTestCase diff --git a/test/test_rdoc_encoding.rb b/test/test_rdoc_encoding.rb index e579fd5cc7..d9298880d7 100644 --- a/test/test_rdoc_encoding.rb +++ b/test/test_rdoc_encoding.rb @@ -1,5 +1,5 @@ # coding: US-ASCII -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_extend.rb b/test/test_rdoc_extend.rb index bc50a657ac..f4c8425864 100644 --- a/test/test_rdoc_extend.rb +++ b/test/test_rdoc_extend.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocExtend < XrefTestCase diff --git a/test/test_rdoc_generator_darkfish.rb b/test/test_rdoc_generator_darkfish.rb index bbe351c0f6..c004bb271e 100644 --- a/test/test_rdoc_generator_darkfish.rb +++ b/test/test_rdoc_generator_darkfish.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocGeneratorDarkfish < RDoc::TestCase diff --git a/test/test_rdoc_generator_json_index.rb b/test/test_rdoc_generator_json_index.rb index 52c35a564d..154dfe7c4b 100644 --- a/test/test_rdoc_generator_json_index.rb +++ b/test/test_rdoc_generator_json_index.rb @@ -1,5 +1,5 @@ # coding: US-ASCII -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_generator_markup.rb b/test/test_rdoc_generator_markup.rb index d546c2f87f..d13f5119be 100644 --- a/test/test_rdoc_generator_markup.rb +++ b/test/test_rdoc_generator_markup.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocGeneratorMarkup < RDoc::TestCase diff --git a/test/test_rdoc_generator_pot.rb b/test/test_rdoc_generator_pot.rb index 3f1bee70c9..5675f96b75 100644 --- a/test/test_rdoc_generator_pot.rb +++ b/test/test_rdoc_generator_pot.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocGeneratorPOT < RDoc::TestCase diff --git a/test/test_rdoc_generator_pot_po.rb b/test/test_rdoc_generator_pot_po.rb index ae60ff004e..8786f632c0 100644 --- a/test/test_rdoc_generator_pot_po.rb +++ b/test/test_rdoc_generator_pot_po.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocGeneratorPOTPO < RDoc::TestCase diff --git a/test/test_rdoc_generator_pot_po_entry.rb b/test/test_rdoc_generator_pot_po_entry.rb index 36b85df864..5c24c2d70d 100644 --- a/test/test_rdoc_generator_pot_po_entry.rb +++ b/test/test_rdoc_generator_pot_po_entry.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocGeneratorPOTPOEntry < RDoc::TestCase diff --git a/test/test_rdoc_generator_ri.rb b/test/test_rdoc_generator_ri.rb index d9f7b7ebc6..02bcee8904 100644 --- a/test/test_rdoc_generator_ri.rb +++ b/test/test_rdoc_generator_ri.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocGeneratorRI < RDoc::TestCase diff --git a/test/test_rdoc_i18n_locale.rb b/test/test_rdoc_i18n_locale.rb index e9dce78472..ff9836f9a6 100644 --- a/test/test_rdoc_i18n_locale.rb +++ b/test/test_rdoc_i18n_locale.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocI18nLocale < RDoc::TestCase diff --git a/test/test_rdoc_i18n_text.rb b/test/test_rdoc_i18n_text.rb index 4169b92079..be5ff581f5 100644 --- a/test/test_rdoc_i18n_text.rb +++ b/test/test_rdoc_i18n_text.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocI18nText < RDoc::TestCase diff --git a/test/test_rdoc_include.rb b/test/test_rdoc_include.rb index 6a34f5d4b8..67d3dfd88e 100644 --- a/test/test_rdoc_include.rb +++ b/test/test_rdoc_include.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocInclude < XrefTestCase diff --git a/test/test_rdoc_markdown.rb b/test/test_rdoc_markdown.rb index e6c63ffb13..99f8abf5ab 100644 --- a/test/test_rdoc_markdown.rb +++ b/test/test_rdoc_markdown.rb @@ -1,5 +1,5 @@ # coding: UTF-8 -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' require 'rdoc/markup/block_quote' diff --git a/test/test_rdoc_markdown_test.rb b/test/test_rdoc_markdown_test.rb index e738832fed..8664ac45a0 100644 --- a/test/test_rdoc_markdown_test.rb +++ b/test/test_rdoc_markdown_test.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'minitest/autorun' require 'pp' diff --git a/test/test_rdoc_markup.rb b/test/test_rdoc_markup.rb index ad13211f7b..8e4e8b968e 100644 --- a/test/test_rdoc_markup.rb +++ b/test/test_rdoc_markup.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkup < RDoc::TestCase diff --git a/test/test_rdoc_markup_attribute_manager.rb b/test/test_rdoc_markup_attribute_manager.rb index b51e422474..9389e4cf64 100644 --- a/test/test_rdoc_markup_attribute_manager.rb +++ b/test/test_rdoc_markup_attribute_manager.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupAttributeManager < RDoc::TestCase diff --git a/test/test_rdoc_markup_attributes.rb b/test/test_rdoc_markup_attributes.rb index 077b6a5474..1fad62208c 100644 --- a/test/test_rdoc_markup_attributes.rb +++ b/test/test_rdoc_markup_attributes.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupAttributes < RDoc::TestCase diff --git a/test/test_rdoc_markup_document.rb b/test/test_rdoc_markup_document.rb index e5a61daea5..d817f1b9aa 100644 --- a/test/test_rdoc_markup_document.rb +++ b/test/test_rdoc_markup_document.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupDocument < RDoc::TestCase diff --git a/test/test_rdoc_markup_formatter.rb b/test/test_rdoc_markup_formatter.rb index 02a6844a3a..1b0a011e6f 100644 --- a/test/test_rdoc_markup_formatter.rb +++ b/test/test_rdoc_markup_formatter.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupFormatter < RDoc::TestCase diff --git a/test/test_rdoc_markup_hard_break.rb b/test/test_rdoc_markup_hard_break.rb index 5d2d359646..d93d52eeda 100644 --- a/test/test_rdoc_markup_hard_break.rb +++ b/test/test_rdoc_markup_hard_break.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupHardBreak < RDoc::TestCase diff --git a/test/test_rdoc_markup_heading.rb b/test/test_rdoc_markup_heading.rb index 463df7ef43..33e29e90e6 100644 --- a/test/test_rdoc_markup_heading.rb +++ b/test/test_rdoc_markup_heading.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupHeading < RDoc::TestCase diff --git a/test/test_rdoc_markup_include.rb b/test/test_rdoc_markup_include.rb index e72a0ac1bb..28712fa7ed 100644 --- a/test/test_rdoc_markup_include.rb +++ b/test/test_rdoc_markup_include.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupInclude < RDoc::TestCase diff --git a/test/test_rdoc_markup_indented_paragraph.rb b/test/test_rdoc_markup_indented_paragraph.rb index efcd840453..53d44dcec2 100644 --- a/test/test_rdoc_markup_indented_paragraph.rb +++ b/test/test_rdoc_markup_indented_paragraph.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupIndentedParagraph < RDoc::TestCase diff --git a/test/test_rdoc_markup_paragraph.rb b/test/test_rdoc_markup_paragraph.rb index 6da6658c6f..dce3ed8efd 100644 --- a/test/test_rdoc_markup_paragraph.rb +++ b/test/test_rdoc_markup_paragraph.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupParagraph < RDoc::TestCase diff --git a/test/test_rdoc_markup_parser.rb b/test/test_rdoc_markup_parser.rb index 849d19f8c7..fa4730a06f 100644 --- a/test/test_rdoc_markup_parser.rb +++ b/test/test_rdoc_markup_parser.rb @@ -1,5 +1,5 @@ # coding: utf-8 -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_markup_pre_process.rb b/test/test_rdoc_markup_pre_process.rb index be3fdcbef3..13e3ec13c0 100644 --- a/test/test_rdoc_markup_pre_process.rb +++ b/test/test_rdoc_markup_pre_process.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_markup_raw.rb b/test/test_rdoc_markup_raw.rb index 1453333b9e..aaf4e48439 100644 --- a/test/test_rdoc_markup_raw.rb +++ b/test/test_rdoc_markup_raw.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupRaw < RDoc::TestCase diff --git a/test/test_rdoc_markup_to_ansi.rb b/test/test_rdoc_markup_to_ansi.rb index 8bd49271c1..d06ad98fa3 100644 --- a/test/test_rdoc_markup_to_ansi.rb +++ b/test/test_rdoc_markup_to_ansi.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase diff --git a/test/test_rdoc_markup_to_bs.rb b/test/test_rdoc_markup_to_bs.rb index 153a121d78..9b798c92b3 100644 --- a/test/test_rdoc_markup_to_bs.rb +++ b/test/test_rdoc_markup_to_bs.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase diff --git a/test/test_rdoc_markup_to_html.rb b/test/test_rdoc_markup_to_html.rb index 6fdb0222db..fa5828a007 100644 --- a/test/test_rdoc_markup_to_html.rb +++ b/test/test_rdoc_markup_to_html.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase diff --git a/test/test_rdoc_markup_to_html_crossref.rb b/test/test_rdoc_markup_to_html_crossref.rb index b9b5629554..73b76de4d9 100644 --- a/test/test_rdoc_markup_to_html_crossref.rb +++ b/test/test_rdoc_markup_to_html_crossref.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocMarkupToHtmlCrossref < XrefTestCase diff --git a/test/test_rdoc_markup_to_html_snippet.rb b/test/test_rdoc_markup_to_html_snippet.rb index 19c534863e..fa59de434f 100644 --- a/test/test_rdoc_markup_to_html_snippet.rb +++ b/test/test_rdoc_markup_to_html_snippet.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToHtmlSnippet < RDoc::Markup::FormatterTestCase diff --git a/test/test_rdoc_markup_to_joined_paragraph.rb b/test/test_rdoc_markup_to_joined_paragraph.rb index 414b7d3732..0a6a864bfa 100644 --- a/test/test_rdoc_markup_to_joined_paragraph.rb +++ b/test/test_rdoc_markup_to_joined_paragraph.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToJoinedParagraph < RDoc::TestCase diff --git a/test/test_rdoc_markup_to_label.rb b/test/test_rdoc_markup_to_label.rb index 35df69c2ac..23ab8cbfab 100644 --- a/test/test_rdoc_markup_to_label.rb +++ b/test/test_rdoc_markup_to_label.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToLabel < RDoc::Markup::FormatterTestCase diff --git a/test/test_rdoc_markup_to_markdown.rb b/test/test_rdoc_markup_to_markdown.rb index a72f30ee01..f5ea8d05da 100644 --- a/test/test_rdoc_markup_to_markdown.rb +++ b/test/test_rdoc_markup_to_markdown.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToMarkdown < RDoc::Markup::TextFormatterTestCase diff --git a/test/test_rdoc_markup_to_rdoc.rb b/test/test_rdoc_markup_to_rdoc.rb index 0dce0a0d5a..31761eb44d 100644 --- a/test/test_rdoc_markup_to_rdoc.rb +++ b/test/test_rdoc_markup_to_rdoc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase diff --git a/test/test_rdoc_markup_to_table_of_contents.rb b/test/test_rdoc_markup_to_table_of_contents.rb index acfa807948..f21dbfe748 100644 --- a/test/test_rdoc_markup_to_table_of_contents.rb +++ b/test/test_rdoc_markup_to_table_of_contents.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToTableOfContents < RDoc::Markup::FormatterTestCase diff --git a/test/test_rdoc_markup_to_tt_only.rb b/test/test_rdoc_markup_to_tt_only.rb index a7918c90ab..b08362cd0b 100644 --- a/test/test_rdoc_markup_to_tt_only.rb +++ b/test/test_rdoc_markup_to_tt_only.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupToTtOnly < RDoc::Markup::FormatterTestCase diff --git a/test/test_rdoc_markup_verbatim.rb b/test/test_rdoc_markup_verbatim.rb index 6fdf8fde28..3b05100a33 100644 --- a/test/test_rdoc_markup_verbatim.rb +++ b/test/test_rdoc_markup_verbatim.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocMarkupVerbatim < RDoc::TestCase diff --git a/test/test_rdoc_method_attr.rb b/test/test_rdoc_method_attr.rb index 70f129ef32..68a9d6cc21 100644 --- a/test/test_rdoc_method_attr.rb +++ b/test/test_rdoc_method_attr.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocMethodAttr < XrefTestCase diff --git a/test/test_rdoc_normal_class.rb b/test/test_rdoc_normal_class.rb index 9153bdc839..874eaaa88c 100644 --- a/test/test_rdoc_normal_class.rb +++ b/test/test_rdoc_normal_class.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocNormalClass < XrefTestCase diff --git a/test/test_rdoc_normal_module.rb b/test/test_rdoc_normal_module.rb index d92a72e7bf..68e776c41f 100644 --- a/test/test_rdoc_normal_module.rb +++ b/test/test_rdoc_normal_module.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocNormalModule < XrefTestCase diff --git a/test/test_rdoc_options.rb b/test/test_rdoc_options.rb index eef37b44b4..760cf9db55 100644 --- a/test/test_rdoc_options.rb +++ b/test/test_rdoc_options.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocOptions < RDoc::TestCase diff --git a/test/test_rdoc_parser.rb b/test/test_rdoc_parser.rb index b71d89b064..5d4da7e425 100644 --- a/test/test_rdoc_parser.rb +++ b/test/test_rdoc_parser.rb @@ -1,5 +1,5 @@ # -*- coding: us-ascii -*- -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_parser_c.rb b/test/test_rdoc_parser_c.rb index 3b26e4d51c..2cc8ddf79a 100644 --- a/test/test_rdoc_parser_c.rb +++ b/test/test_rdoc_parser_c.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' =begin diff --git a/test/test_rdoc_parser_changelog.rb b/test/test_rdoc_parser_changelog.rb index 0135d26d87..46cbb0d9a3 100644 --- a/test/test_rdoc_parser_changelog.rb +++ b/test/test_rdoc_parser_changelog.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocParserChangeLog < RDoc::TestCase diff --git a/test/test_rdoc_parser_markdown.rb b/test/test_rdoc_parser_markdown.rb index a8a8402946..50893ecf99 100644 --- a/test/test_rdoc_parser_markdown.rb +++ b/test/test_rdoc_parser_markdown.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocParserMarkdown < RDoc::TestCase diff --git a/test/test_rdoc_parser_rd.rb b/test/test_rdoc_parser_rd.rb index 481d190ffe..e8f4250284 100644 --- a/test/test_rdoc_parser_rd.rb +++ b/test/test_rdoc_parser_rd.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocParserRd < RDoc::TestCase diff --git a/test/test_rdoc_parser_ruby.rb b/test/test_rdoc_parser_ruby.rb index f846dc592a..e28112fbee 100644 --- a/test/test_rdoc_parser_ruby.rb +++ b/test/test_rdoc_parser_ruby.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_parser_simple.rb b/test/test_rdoc_parser_simple.rb index 0e2cf0d9a9..cdbcd7929d 100644 --- a/test/test_rdoc_parser_simple.rb +++ b/test/test_rdoc_parser_simple.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocParserSimple < RDoc::TestCase diff --git a/test/test_rdoc_rd.rb b/test/test_rdoc_rd.rb index 938c5569f9..ed67ae2caa 100644 --- a/test/test_rdoc_rd.rb +++ b/test/test_rdoc_rd.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRd < RDoc::TestCase diff --git a/test/test_rdoc_rd_block_parser.rb b/test/test_rdoc_rd_block_parser.rb index 18ec30db0f..a73c206508 100644 --- a/test/test_rdoc_rd_block_parser.rb +++ b/test/test_rdoc_rd_block_parser.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRdBlockParser < RDoc::TestCase diff --git a/test/test_rdoc_rd_inline.rb b/test/test_rdoc_rd_inline.rb index d4448e4397..2869681c6e 100644 --- a/test/test_rdoc_rd_inline.rb +++ b/test/test_rdoc_rd_inline.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRdInline < RDoc::TestCase diff --git a/test/test_rdoc_rd_inline_parser.rb b/test/test_rdoc_rd_inline_parser.rb index eb022b240f..b4394019b3 100644 --- a/test/test_rdoc_rd_inline_parser.rb +++ b/test/test_rdoc_rd_inline_parser.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRdInlineParser < RDoc::TestCase diff --git a/test/test_rdoc_rdoc.rb b/test/test_rdoc_rdoc.rb index be7a90c236..32c5a44bbe 100644 --- a/test/test_rdoc_rdoc.rb +++ b/test/test_rdoc_rdoc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRDoc < RDoc::TestCase diff --git a/test/test_rdoc_require.rb b/test/test_rdoc_require.rb index cfbdac7a57..46c225299a 100644 --- a/test/test_rdoc_require.rb +++ b/test/test_rdoc_require.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocRequire < XrefTestCase diff --git a/test/test_rdoc_ri_driver.rb b/test/test_rdoc_ri_driver.rb index 81c8469e25..687d0968df 100644 --- a/test/test_rdoc_ri_driver.rb +++ b/test/test_rdoc_ri_driver.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRIDriver < RDoc::TestCase diff --git a/test/test_rdoc_ri_paths.rb b/test/test_rdoc_ri_paths.rb index 06968b5510..b0f368353a 100644 --- a/test/test_rdoc_ri_paths.rb +++ b/test/test_rdoc_ri_paths.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocRIPaths < RDoc::TestCase diff --git a/test/test_rdoc_rubygems_hook.rb b/test/test_rdoc_rubygems_hook.rb index ee16f3d95c..2fb79ff577 100644 --- a/test/test_rdoc_rubygems_hook.rb +++ b/test/test_rdoc_rubygems_hook.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rubygems/test_case' require 'rdoc/rubygems_hook' diff --git a/test/test_rdoc_servlet.rb b/test/test_rdoc_servlet.rb index 947d8c896c..4dd1f08ddd 100644 --- a/test/test_rdoc_servlet.rb +++ b/test/test_rdoc_servlet.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocServlet < RDoc::TestCase diff --git a/test/test_rdoc_single_class.rb b/test/test_rdoc_single_class.rb index 85a99d2229..5761bfef4d 100644 --- a/test/test_rdoc_single_class.rb +++ b/test/test_rdoc_single_class.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocSingleClass < RDoc::TestCase diff --git a/test/test_rdoc_stats.rb b/test/test_rdoc_stats.rb index 34e1417783..19fc2365b3 100644 --- a/test/test_rdoc_stats.rb +++ b/test/test_rdoc_stats.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocStats < RDoc::TestCase diff --git a/test/test_rdoc_store.rb b/test/test_rdoc_store.rb index d32eab3ec1..4a4cf3ac0f 100644 --- a/test/test_rdoc_store.rb +++ b/test/test_rdoc_store.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocStore < XrefTestCase diff --git a/test/test_rdoc_task.rb b/test/test_rdoc_task.rb index bb5d2ae134..ac3512f42a 100644 --- a/test/test_rdoc_task.rb +++ b/test/test_rdoc_task.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' begin require 'rake' diff --git a/test/test_rdoc_text.rb b/test/test_rdoc_text.rb index 7a125854b5..8d638bbc38 100644 --- a/test/test_rdoc_text.rb +++ b/test/test_rdoc_text.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' diff --git a/test/test_rdoc_token_stream.rb b/test/test_rdoc_token_stream.rb index 95c3ffd13e..abf1469bbc 100644 --- a/test/test_rdoc_token_stream.rb +++ b/test/test_rdoc_token_stream.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocTokenStream < RDoc::TestCase diff --git a/test/test_rdoc_tom_doc.rb b/test/test_rdoc_tom_doc.rb index 7076edfa72..6e60e67726 100644 --- a/test/test_rdoc_tom_doc.rb +++ b/test/test_rdoc_tom_doc.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require 'rdoc/test_case' class TestRDocTomDoc < RDoc::TestCase diff --git a/test/test_rdoc_top_level.rb b/test/test_rdoc_top_level.rb index b8145e3f9d..00fc7a1bd5 100644 --- a/test/test_rdoc_top_level.rb +++ b/test/test_rdoc_top_level.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true require File.expand_path '../xref_test_case', __FILE__ class TestRDocTopLevel < XrefTestCase diff --git a/test/xref_data.rb b/test/xref_data.rb index c712ab8891..bc20d8ed91 100644 --- a/test/xref_data.rb +++ b/test/xref_data.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true XREF_DATA = <<-XREF_DATA class C1 diff --git a/test/xref_test_case.rb b/test/xref_test_case.rb index 9b2f876e5a..9f709964c6 100644 --- a/test/xref_test_case.rb +++ b/test/xref_test_case.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ENV['RDOC_TEST'] = 'yes' require 'rdoc' From 4592938ce0622523fd811b547ea5525db0ecb251 Mon Sep 17 00:00:00 2001 From: Code Ass Date: Sun, 5 Nov 2017 00:16:05 +0900 Subject: [PATCH 2/4] Use normal method instead of ban ver. for String Ruby 2.2 or earlier only has String#force_encoding for changing character encoding set without encode byte sequence, it changes receiver itself. Ruby 2.3 or later has frozen_striing_literal magic comment and String#new can take encoding keyword parameter for character encoding set without encode byte sequence. So implements RDoc::Encoding.change_encoding and RDoc::Comment#encode! to disguise difference between #force_encoding and encoding keyword parameter of #new on String. --- lib/rdoc/any_method.rb | 8 ++-- lib/rdoc/code_object.rb | 2 +- lib/rdoc/comment.rb | 28 +++++++---- lib/rdoc/context.rb | 4 +- lib/rdoc/context/section.rb | 2 +- lib/rdoc/encoding.rb | 56 +++++++++++++++------- lib/rdoc/generator/pot/po.rb | 4 +- lib/rdoc/generator/pot/po_entry.rb | 20 ++++---- lib/rdoc/i18n/text.rb | 8 ++-- lib/rdoc/markup/parser.rb | 4 +- lib/rdoc/markup/pre_process.rb | 10 ++-- lib/rdoc/method_attr.rb | 2 +- lib/rdoc/normal_class.rb | 4 +- lib/rdoc/options.rb | 10 ++-- lib/rdoc/parser/c.rb | 10 ++-- lib/rdoc/parser/changelog.rb | 8 ++-- lib/rdoc/parser/ruby.rb | 42 ++++++++-------- lib/rdoc/parser/simple.rb | 4 +- lib/rdoc/rd/inline.rb | 8 ++-- lib/rdoc/servlet.rb | 2 +- lib/rdoc/stats/normal.rb | 2 +- lib/rdoc/test_case.rb | 5 +- lib/rdoc/text.rb | 12 ++--- lib/rdoc/tom_doc.rb | 2 +- test/test_rdoc_code_object.rb | 4 +- test/test_rdoc_comment.rb | 8 ++-- test/test_rdoc_encoding.rb | 30 ++++++------ test/test_rdoc_generator_json_index.rb | 4 +- test/test_rdoc_markup_attribute_manager.rb | 12 ++--- test/test_rdoc_markup_formatter.rb | 2 +- test/test_rdoc_markup_pre_process.rb | 12 ++--- test/test_rdoc_markup_to_html_snippet.rb | 2 +- test/test_rdoc_parser_changelog.rb | 4 +- test/test_rdoc_text.rb | 12 ++--- test/test_rdoc_tom_doc.rb | 4 +- 35 files changed, 192 insertions(+), 159 deletions(-) diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb index e61f263cdc..9b0d309653 100644 --- a/lib/rdoc/any_method.rb +++ b/lib/rdoc/any_method.rb @@ -244,9 +244,9 @@ def param_list if @block_params then # If this method has explicit block parameters, remove any explicit # &block - params.sub!(/,?\s*&\w+/, '') + params = params.sub(/,?\s*&\w+/, '') else - params.sub!(/\&(\w+)/, '\1') + params = params.sub(/\&(\w+)/, '\1') end params = params.gsub(/\s+/, '').split(',').reject(&:empty?) @@ -274,11 +274,11 @@ def param_seq if @block_params then # If this method has explicit block parameters, remove any explicit # &block - params.sub!(/,?\s*&\w+/, '') + params = params.sub(/,?\s*&\w+/, '') block = @block_params.tr_s("\n ", " ") if block[0] == ?( - block.sub!(/^\(/, '').sub!(/\)/, '') + block = block.sub(/^\(/, '').sub(/\)/, '') end params << " { |#{block}| ... }" end diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb index 48a6761b87..aeb4b4762e 100644 --- a/lib/rdoc/code_object.rb +++ b/lib/rdoc/code_object.rb @@ -144,7 +144,7 @@ def comment=(comment) # HACK correct fix is to have #initialize create @comment # with the correct encoding if String === @comment and @comment.empty? then - @comment.force_encoding comment.encoding + @comment = RDoc::Encoding.change_encoding @comment, comment.encoding end @comment end diff --git a/lib/rdoc/comment.rb b/lib/rdoc/comment.rb index f8482e2754..134f6440a0 100644 --- a/lib/rdoc/comment.rb +++ b/lib/rdoc/comment.rb @@ -45,7 +45,7 @@ class RDoc::Comment def initialize text = nil, location = nil @location = location - @text = text + @text = text.nil? ? nil : text.dup @document = nil @format = 'rdoc' @@ -114,10 +114,14 @@ def extract_call_seq method method.call_seq = seq.chomp - elsif @text.sub!(/^\s*:?call-seq:(.*?)(^\s*$|\z)/m, '') then - seq = $1 - seq.gsub!(/^\s*/, '') - method.call_seq = seq + else + regexp = /^\s*:?call-seq:(.*?)(^\s*$|\z)/m + if regexp =~ @text then + @text = @text.sub(regexp, '') + seq = $1 + seq.gsub!(/^\s*/, '') + method.call_seq = seq + end end method @@ -133,8 +137,14 @@ def empty? ## # HACK dubious - def force_encoding encoding - @text.force_encoding encoding + def encode! encoding + # TODO: Remove this condition after Ruby 2.2 EOL + if RUBY_VERSION < '2.3.0' + @text = @text.force_encoding encoding + else + @text = String.new @text, encoding: encoding + end + self end ## @@ -200,7 +210,7 @@ def parse def remove_private # Workaround for gsub encoding for Ruby 1.9.2 and earlier empty = '' - empty.force_encoding @text.encoding + empty = RDoc::Encoding.change_encoding empty, @text.encoding @text = @text.gsub(%r%^\s*([#*]?)--.*?^\s*(\1)\+\+\n?%m, empty) @text = @text.sub(%r%^\s*[#*]?--.*%m, '') @@ -216,7 +226,7 @@ def text= text @text.nil? and @document @document = nil - @text = text + @text = text.nil? ? nil : text.dup end ## diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb index 52f01be809..58b1c54269 100644 --- a/lib/rdoc/context.rb +++ b/lib/rdoc/context.rb @@ -239,7 +239,7 @@ def add_attribute attribute if known then known.comment = attribute.comment if known.comment.empty? - elsif registered = @methods_hash[attribute.pretty_name << '='] and + elsif registered = @methods_hash[attribute.pretty_name + '='] and RDoc::Attr === registered then registered.rw = 'RW' else @@ -249,7 +249,7 @@ def add_attribute attribute end if attribute.rw.index 'W' then - key = attribute.pretty_name << '=' + key = attribute.pretty_name + '=' known = @methods_hash[key] if known then diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb index 64877f944c..11f9ceaf87 100644 --- a/lib/rdoc/context/section.rb +++ b/lib/rdoc/context/section.rb @@ -43,7 +43,7 @@ def initialize parent, title, comment @parent = parent @title = title ? title.strip : title - @@sequence.succ! + @@sequence = @@sequence.succ @sequence = @@sequence.dup @comments = [] diff --git a/lib/rdoc/encoding.rb b/lib/rdoc/encoding.rb index 150865b623..54ecd89816 100644 --- a/lib/rdoc/encoding.rb +++ b/lib/rdoc/encoding.rb @@ -23,26 +23,26 @@ def self.read_file filename, encoding, force_transcode = false utf8 = content.sub!(/\A\xef\xbb\xbf/, '') - RDoc::Encoding.set_encoding content + content = RDoc::Encoding.set_encoding content begin encoding ||= Encoding.default_external orig_encoding = content.encoding if not orig_encoding.ascii_compatible? then - content.encode! encoding + content = content.encode encoding elsif utf8 then - content.force_encoding Encoding::UTF_8 - content.encode! encoding + content = RDoc::Encoding.change_encoding content, Encoding::UTF_8 + content = content.encode encoding else # assume the content is in our output encoding - content.force_encoding encoding + content = RDoc::Encoding.change_encoding content, encoding end unless content.valid_encoding? then # revert and try to transcode - content.force_encoding orig_encoding - content.encode! encoding + content = RDoc::Encoding.change_encoding content, orig_encoding + content = content.encode encoding end unless content.valid_encoding? then @@ -52,10 +52,11 @@ def self.read_file filename, encoding, force_transcode = false rescue Encoding::InvalidByteSequenceError, Encoding::UndefinedConversionError => e if force_transcode then - content.force_encoding orig_encoding - content.encode!(encoding, - :invalid => :replace, :undef => :replace, - :replace => '?') + content = RDoc::Encoding.change_encoding content, orig_encoding + content = content.encode(encoding, + :invalid => :replace, + :undef => :replace, + :replace => '?') return content else warn "unable to convert #{e.message} for #{filename}, skipping" @@ -77,15 +78,17 @@ def self.remove_frozen_string_literal string first_line = $1 if first_line =~ /\A# +frozen[-_]string[-_]literal[=:].+$/i - string.sub! first_line, '' + string = string.sub first_line, '' end + + string end ## # Sets the encoding of +string+ based on the magic comment def self.set_encoding string - remove_frozen_string_literal string + string = remove_frozen_string_literal string string =~ /\A(?:#!.*\n)?(.*\n)/ @@ -94,15 +97,34 @@ def self.set_encoding string name = case first_line when /^<\?xml[^?]*encoding=(["'])(.*?)\1/ then $2 when /\b(?:en)?coding[=:]\s*([^\s;]+)/i then $1 - else return + else return string end - string.sub! first_line, '' + string = string.sub first_line, '' - remove_frozen_string_literal string + string = remove_frozen_string_literal string enc = Encoding.find name - string.force_encoding enc if enc + string = RDoc::Encoding.change_encoding string, enc if enc + + string + end + + ## + # Changes encoding based on +encoding+ without converting and returns new + # string + + def self.change_encoding text, encoding + if text.kind_of? RDoc::Comment + text.encode! encoding + else + # TODO: Remove this condition after Ruby 2.2 EOL + if RUBY_VERSION < '2.3.0' + text.force_encoding encoding + else + String.new text, encoding: encoding + end + end end end diff --git a/lib/rdoc/generator/pot/po.rb b/lib/rdoc/generator/pot/po.rb index 8cb61b8a1c..37d45e5258 100644 --- a/lib/rdoc/generator/pot/po.rb +++ b/lib/rdoc/generator/pot/po.rb @@ -29,8 +29,8 @@ def add entry def to_s po = '' sort_entries.each do |entry| - po << "\n" unless po.empty? - po << entry.to_s + po += "\n" unless po.empty? + po += entry.to_s end po end diff --git a/lib/rdoc/generator/pot/po_entry.rb b/lib/rdoc/generator/pot/po_entry.rb index d537cb85e3..3c278826f4 100644 --- a/lib/rdoc/generator/pot/po_entry.rb +++ b/lib/rdoc/generator/pot/po_entry.rb @@ -40,11 +40,11 @@ def initialize msgid, options = {} def to_s entry = '' - entry << format_translator_comment - entry << format_extracted_comment - entry << format_references - entry << format_flags - entry << <<-ENTRY + entry += format_translator_comment + entry += format_extracted_comment + entry += format_references + entry += format_flags + entry += <<-ENTRY msgid #{format_message(@msgid)} msgstr #{format_message(@msgstr)} ENTRY @@ -75,9 +75,9 @@ def format_comment mark, comment formatted_comment = '' comment.each_line do |line| - formatted_comment << "#{mark} #{line}" + formatted_comment += "#{mark} #{line}" end - formatted_comment << "\n" unless formatted_comment.end_with?("\n") + formatted_comment += "\n" unless formatted_comment.end_with?("\n") formatted_comment end @@ -94,7 +94,7 @@ def format_references formatted_references = '' @references.sort.each do |file, line| - formatted_references << "\#: #{file}:#{line}\n" + formatted_references += "\#: #{file}:#{line}\n" end formatted_references end @@ -111,8 +111,8 @@ def format_message message formatted_message = '""' message.each_line do |line| - formatted_message << "\n" - formatted_message << "\"#{escape(line)}\"" + formatted_message += "\n" + formatted_message += "\"#{escape(line)}\"" end formatted_message end diff --git a/lib/rdoc/i18n/text.rb b/lib/rdoc/i18n/text.rb index 517abf1540..7ea6664442 100644 --- a/lib/rdoc/i18n/text.rb +++ b/lib/rdoc/i18n/text.rb @@ -46,9 +46,9 @@ def translate(locale) parse do |part| case part[:type] when :paragraph - translated_text << locale.translate(part[:paragraph]) + translated_text += locale.translate(part[:paragraph]) when :empty_line - translated_text << part[:line] + translated_text += part[:line] else raise "should not reach here: unexpected type: #{type}" end @@ -69,14 +69,14 @@ def parse(&block) if paragraph.empty? emit_empty_line_event(line, line_no, &block) else - paragraph << line + paragraph += line emit_paragraph_event(paragraph, paragraph_start_line, line_no, &block) paragraph = '' end else paragraph_start_line = line_no if paragraph.empty? - paragraph << line + paragraph += line end end diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb index 9e6505da9d..f08587e676 100644 --- a/lib/rdoc/markup/parser.rb +++ b/lib/rdoc/markup/parser.rb @@ -249,7 +249,7 @@ def build_verbatim margin min_indent = nil generate_leading_spaces = true - line = '' + line = ''.dup until @tokens.empty? do type, data, column, = get @@ -257,7 +257,7 @@ def build_verbatim margin if type == :NEWLINE then line << data verbatim << line - line = '' + line = ''.dup generate_leading_spaces = true next end diff --git a/lib/rdoc/markup/pre_process.rb b/lib/rdoc/markup/pre_process.rb index c3c51b765c..0ac7a41934 100644 --- a/lib/rdoc/markup/pre_process.rb +++ b/lib/rdoc/markup/pre_process.rb @@ -105,7 +105,7 @@ def handle text, code_object = nil, &block # regexp helper (square brackets for optional) # $1 $2 $3 $4 $5 # [prefix][\]:directive:[spaces][param]newline - text.gsub!(/^([ \t]*(?:#|\/?\*)?[ \t]*)(\\?):(\w+):([ \t]*)(.+)?(\r?\n|$)/) do + text = text.gsub(/^([ \t]*(?:#|\/?\*)?[ \t]*)(\\?):(\w+):([ \t]*)(.+)?(\r?\n|$)/) do # skip something like ':toto::' next $& if $4.empty? and $5 and $5[0, 1] == ':' @@ -123,7 +123,11 @@ def handle text, code_object = nil, &block handle_directive $1, $3, $5, code_object, text.encoding, &block end - comment = text unless comment + if comment then + comment.text = text + else + comment = text + end self.class.post_processors.each do |handler| handler.call comment, code_object @@ -212,7 +216,7 @@ def handle_directive prefix, directive, param, code_object = nil, when 'yield', 'yields' then return blankline unless code_object # remove parameter &block - code_object.params.sub!(/,?\s*&\w+/, '') if code_object.params + code_object.params = code_object.params.sub(/,?\s*&\w+/, '') if code_object.params code_object.block_params = param diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb index a1625a8872..3cef78c4a5 100644 --- a/lib/rdoc/method_attr.rb +++ b/lib/rdoc/method_attr.rb @@ -188,7 +188,7 @@ def find_method_or_attribute name # :nodoc: next if String === ancestor next if parent == ancestor - other = ancestor.find_method_named('#' << name) || + other = ancestor.find_method_named('#' + name) || ancestor.find_attribute_named(name) return other if other diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb index 9278011778..6729b18448 100644 --- a/lib/rdoc/normal_class.rb +++ b/lib/rdoc/normal_class.rb @@ -47,9 +47,9 @@ def inspect # :nodoc: def to_s # :nodoc: display = "#{self.class.name} #{self.full_name}" if superclass - display << ' < ' << (superclass.is_a?(String) ? superclass : superclass.full_name) + display += ' < ' + (superclass.is_a?(String) ? superclass : superclass.full_name) end - display << ' -> ' << is_alias_for.to_s if is_alias_for + display += ' -> ' + is_alias_for.to_s if is_alias_for display end diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index e4fe4f75e9..17bbca81fe 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -624,16 +624,16 @@ def parse argv end parsers.sort.each do |parser, regexp| - opt.banner << " - #{parser}: #{regexp.join ', '}\n" + opt.banner += " - #{parser}: #{regexp.join ', '}\n" end - opt.banner << " - TomDoc: Only in ruby files\n" + opt.banner += " - TomDoc: Only in ruby files\n" - opt.banner << "\n The following options are deprecated:\n\n" + opt.banner += "\n The following options are deprecated:\n\n" name_length = DEPRECATED.keys.sort_by { |k| k.length }.last.length DEPRECATED.sort_by { |k,| k }.each do |name, reason| - opt.banner << " %*1$2$s %3$s\n" % [-name_length, name, reason] + opt.banner += " %*1$2$s %3$s\n" % [-name_length, name, reason] end opt.accept Template do |template| @@ -1087,7 +1087,7 @@ def parse argv unless quiet then deprecated.each do |opt| - $stderr.puts 'option ' << opt << ' is deprecated: ' << DEPRECATED[opt] + $stderr.puts 'option ' + opt + ' is deprecated: ' + DEPRECATED[opt] end end diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb index 10061bfc7d..183538d54b 100644 --- a/lib/rdoc/parser/c.rb +++ b/lib/rdoc/parser/c.rb @@ -865,8 +865,8 @@ def find_override_comment class_name, meth_obj def handle_attr(var_name, attr_name, read, write) rw = '' - rw << 'R' if '1' == read - rw << 'W' if '1' == write + rw += 'R' if '1' == read + rw += 'W' if '1' == write class_name = @known_classes[var_name] @@ -982,8 +982,8 @@ def handle_constants(type, var_name, const_name, definition) if new_definition.empty? then # Default to literal C definition new_definition = definition else - new_definition.gsub!("\:", ":") - new_definition.gsub!("\\", '\\') + new_definition = new_definition.gsub("\:", ":") + new_definition = new_definition.gsub("\\", '\\') end new_definition.sub!(/\A(\s+)/, '') @@ -1237,7 +1237,7 @@ def rb_scan_args method_body # when scanning for classes and methods def remove_commented_out_lines - @content.gsub!(%r%//.*rb_define_%, '//') + @content = @content.gsub(%r%//.*rb_define_%, '//') end ## diff --git a/lib/rdoc/parser/changelog.rb b/lib/rdoc/parser/changelog.rb index f460321d3a..167892f543 100644 --- a/lib/rdoc/parser/changelog.rb +++ b/lib/rdoc/parser/changelog.rb @@ -29,13 +29,13 @@ def continue_entry_body entry_body, continuation if last =~ /\)\s*\z/ and continuation =~ /\A\(/ then last.sub!(/\)\s*\z/, ',') - continuation.sub!(/\A\(/, '') + continuation = continuation.sub(/\A\(/, '') end if last =~ /\s\z/ then last << continuation else - last << ' ' << continuation + last << ' ' + continuation end end @@ -162,12 +162,12 @@ def parse_entries entry_body = [] when /^(\t| {8})?\*\s*(.*)/ then # "\t* file.c (func): ..." - entry_body << $2 + entry_body << $2.dup when /^(\t| {8})?\s*(\(.*)/ then # "\t(func): ..." entry = $2 if entry_body.last =~ /:/ then - entry_body << entry + entry_body << entry.dup else continue_entry_body entry_body, entry end diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index 9d0344283b..f1856acce8 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -239,8 +239,8 @@ def get_visibility_information tk, single # :nodoc: def collect_first_comment skip_tkspace - comment = '' - comment.force_encoding @encoding if @encoding + comment = ''.dup + comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding first_line = true first_comment_tk_kind = nil @@ -341,7 +341,7 @@ def get_bool def get_class_or_module container, ignore_constants = false skip_tkspace name_t = get_tk - given_name = '' + given_name = ''.dup # class ::A -> A is in the top level if :on_op == name_t[:kind] and '::' == name_t[:text] then # bug @@ -378,7 +378,7 @@ def get_class_or_module container, ignore_constants = false if prev_container == container and !ignore_constants given_name = name_t[:text] else - given_name << '::' << name_t[:text] + given_name << '::' + name_t[:text] end end @@ -594,7 +594,7 @@ def look_for_directives_in container, comment # Adds useful info about the parser to +message+ def make_message message - prefix = "#{@file_name}:" + prefix = "#{@file_name}:".dup tk = peek_tk prefix << "#{tk[:line_no]}:#{tk[:char_no]}:" if tk @@ -913,7 +913,7 @@ def parse_constant container, tk, comment, ignore_constants = false return unless body - value.replace body + con.value = body record_location con con.line = line_no read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS @@ -928,7 +928,7 @@ def parse_constant container, tk, comment, ignore_constants = false def parse_constant_body container, constant, is_array_or_hash # :nodoc: nest = 0 - rhs_name = '' + rhs_name = ''.dup get_tkread @@ -990,14 +990,13 @@ def parse_comment container, tk, comment column = tk[:char_no] line_no = tk[:line_no] - text = comment.text - - singleton = !!text.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3') + comment.text = comment.text.sub(/(^# +:?)(singleton-)(method:)/, '\1\3') + singleton = !!$~ co = - if text.sub!(/^# +:?method: *(\S*).*?\n/i, '') then - parse_comment_ghost container, text, $1, column, line_no, comment - elsif text.sub!(/# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then + if (comment.text = comment.text.sub(/^# +:?method: *(\S*).*?\n/i, '')) && !!$~ then + parse_comment_ghost container, comment.text, $1, column, line_no, comment + elsif (comment.text = comment.text.sub(/# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '')) && !!$~ then parse_comment_attr container, $1, $3, comment end @@ -1194,7 +1193,9 @@ def parse_meta_attr(context, single, tk, comment) tmp = RDoc::CodeObject.new read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS - if comment.text.sub!(/^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then + regexp = /^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i + if regexp =~ comment.text then + comment.text = comment.text.sub(regexp, '') rw = case $1 when 'attr_reader' then 'R' when 'attr_writer' then 'W' @@ -1227,7 +1228,8 @@ def parse_meta_method(container, single, tk, comment) skip_tkspace false - singleton = !!comment.text.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3') + comment.text = comment.text.sub(/(^# +:?)(singleton-)(method:)/, '\1\3') + singleton = !!$~ name = parse_meta_method_name comment, tk @@ -1643,7 +1645,7 @@ def parse_rescue def parse_statements(container, single = NORMAL, current_method = nil, comment = new_comment('')) raise 'no' unless RDoc::Comment === comment - comment.force_encoding @encoding if @encoding + comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding nest = 1 save_visibility = container.visibility @@ -1686,12 +1688,12 @@ def parse_statements(container, single = NORMAL, current_method = nil, comment.empty? comment = '' - comment.force_encoding @encoding if @encoding + comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding end while tk and (:on_comment == tk[:kind] or :on_embdoc == tk[:kind]) do - comment << tk[:text] - comment << "\n" unless "\n" == tk[:text].chars.to_a.last + comment += tk[:text] + comment += "\n" unless "\n" == tk[:text].chars.to_a.last if tk[:text].size > 1 && "\n" == tk[:text].chars.to_a.last then skip_tkspace false # leading spaces @@ -1810,7 +1812,7 @@ def parse_statements(container, single = NORMAL, current_method = nil, unless keep_comment then comment = new_comment '' - comment.force_encoding @encoding if @encoding + comment = RDoc::Encoding.change_encoding comment, @encoding if @encoding container.params = nil container.block_params = nil end diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb index bef6da177f..b1dabad0f8 100644 --- a/lib/rdoc/parser/simple.rb +++ b/lib/rdoc/parser/simple.rb @@ -19,7 +19,7 @@ def initialize(top_level, file_name, content, options, stats) preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include - preprocess.handle @content, @top_level + @content = preprocess.handle @content, @top_level end ## @@ -52,7 +52,7 @@ def remove_coding_comment text def remove_private_comment comment # Workaround for gsub encoding for Ruby 1.9.2 and earlier empty = '' - empty.force_encoding comment.encoding + empty = RDoc::Encoding.change_encoding empty, comment.encoding comment = comment.gsub(%r%^--\n.*?^\+\+\n?%m, empty) comment.sub(%r%^--\n.*%m, empty) diff --git a/lib/rdoc/rd/inline.rb b/lib/rdoc/rd/inline.rb index cf37ed9f05..e5cb545728 100644 --- a/lib/rdoc/rd/inline.rb +++ b/lib/rdoc/rd/inline.rb @@ -50,11 +50,11 @@ def == other # :nodoc: def append more case more when String then - @reference << more - @rdoc << more + @reference += more + @rdoc += more when RDoc::RD::Inline then - @reference << more.reference - @rdoc << more.rdoc + @reference += more.reference + @rdoc += more.rdoc else raise "unknown thingy #{more}" end diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb index 89f26553ac..f2d6dd5adc 100644 --- a/lib/rdoc/servlet.rb +++ b/lib/rdoc/servlet.rb @@ -111,7 +111,7 @@ def asset generator_name, req, res # GET request entry point. Fills in +res+ for the path, etc. in +req+. def do_GET req, res - req.path.sub!(/^#{Regexp.escape @mount_path}/o, '') if @mount_path + req.path = req.path.sub(/^#{Regexp.escape @mount_path}/o, '') if @mount_path case req.path when '/' then diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb index 9ab878e7e8..a3a6ff377e 100644 --- a/lib/rdoc/stats/normal.rb +++ b/lib/rdoc/stats/normal.rb @@ -42,7 +42,7 @@ def print_file files_so_far, filename if $stdout.tty? # Clean the line with whitespaces so that leftover output from the # previous line doesn't show up. - $stdout.print("\r" << (" " * @last_width) << ("\b" * @last_width) << "\r") if @last_width && @last_width > 0 + $stdout.print("\r" + (" " * @last_width) + ("\b" * @last_width) + "\r") if @last_width && @last_width > 0 @last_width = line.size $stdout.print("#{line}\r") else diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb index 501f5c3b8b..22d3f14219 100644 --- a/lib/rdoc/test_case.rb +++ b/lib/rdoc/test_case.rb @@ -139,9 +139,8 @@ def list type = nil, *items # Enables pretty-print output def mu_pp obj # :nodoc: - s = '' - s = PP.pp obj, s - s = s.force_encoding Encoding.default_external + s = obj.pretty_inspect + s = RDoc::Encoding.change_encoding s, Encoding.default_external s.chomp end diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb index 2890d1901f..7e714be0ad 100644 --- a/lib/rdoc/text.rb +++ b/lib/rdoc/text.rb @@ -60,7 +60,7 @@ def expand_tabs text text.each_line do |line| nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do r = "#{$1}#{$2}#{' ' * (8 - $2.size)}" - r.force_encoding text.encoding + r = RDoc::Encoding.change_encoding r, text.encoding r end @@ -82,7 +82,7 @@ def flush_left text end empty = '' - empty.force_encoding text.encoding + empty = RDoc::Encoding.change_encoding empty, text.encoding text.gsub(/^ {0,#{indent}}/, empty) end @@ -149,7 +149,7 @@ def strip_hashes text return text if text =~ /^(?>\s*)[^\#]/ empty = '' - empty.force_encoding text.encoding + empty = RDoc::Encoding.change_encoding empty, text.encoding text.gsub(/^\s*(#+)/) { $1.tr '#', ' ' }.gsub(/^\s+$/, empty) end @@ -172,14 +172,14 @@ def strip_stars text text = text.gsub %r%Document-method:\s+[\w:.#=!?]+%, '' space = ' ' - space.force_encoding encoding if encoding + space = RDoc::Encoding.change_encoding space, encoding if encoding text.sub! %r%/\*+% do space * $&.length end text.sub! %r%\*+/% do space * $&.length end text.gsub! %r%^[ \t]*\*%m do space * $&.length end empty = '' - empty.force_encoding encoding if encoding + empty = RDoc::Encoding.change_encoding empty, encoding if encoding text.gsub(/^\s+$/, empty) end @@ -188,7 +188,7 @@ def strip_stars text # trademark symbols in +text+ to properly encoded characters. def to_html text - html = ''.encode text.encoding + html = (''.encode text.encoding).dup encoded = RDoc::Text::TO_HTML_CHARACTERS[text.encoding] diff --git a/lib/rdoc/tom_doc.rb b/lib/rdoc/tom_doc.rb index 66a5ae7a33..2b594b7d84 100644 --- a/lib/rdoc/tom_doc.rb +++ b/lib/rdoc/tom_doc.rb @@ -222,7 +222,7 @@ def parse_text parent, indent # :nodoc: # Returns self. def tokenize text - text.sub!(/\A(Public|Internal|Deprecated):\s+/, '') + text = text.sub(/\A(Public|Internal|Deprecated):\s+/, '') setup_scanner text diff --git a/test/test_rdoc_code_object.rb b/test/test_rdoc_code_object.rb index bdf6d8ae85..d189ac1c4b 100644 --- a/test/test_rdoc_code_object.rb +++ b/test/test_rdoc_code_object.rb @@ -53,7 +53,7 @@ def test_comment_equals_encoding refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check' input = 'text' - input.force_encoding Encoding::UTF_8 + input = RDoc::Encoding.change_encoding input, Encoding::UTF_8 @co.comment = input @@ -65,7 +65,7 @@ def test_comment_equals_encoding_blank refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check' input = '' - input.force_encoding Encoding::UTF_8 + input = RDoc::Encoding.change_encoding input, Encoding::UTF_8 @co.comment = input diff --git a/test/test_rdoc_comment.rb b/test/test_rdoc_comment.rb index 9eba298017..567daae51c 100644 --- a/test/test_rdoc_comment.rb +++ b/test/test_rdoc_comment.rb @@ -207,7 +207,7 @@ def test_extract_call_seq_c_separator end def test_force_encoding - @comment.force_encoding Encoding::UTF_8 + @comment = RDoc::Encoding.change_encoding @comment, Encoding::UTF_8 assert_equal Encoding::UTF_8, @comment.text.encoding end @@ -347,7 +347,7 @@ def test_remove_private_encoding # this is private EOS - comment.force_encoding Encoding::IBM437 + comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437 comment.remove_private @@ -471,7 +471,7 @@ def test_remove_private_toggle_encoding # This is text again. EOS - comment.force_encoding Encoding::IBM437 + comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437 comment.remove_private @@ -486,7 +486,7 @@ def test_remove_private_toggle_encoding_ruby_bug? # This is text again. EOS - comment.force_encoding Encoding::IBM437 + comment = RDoc::Encoding.change_encoding comment, Encoding::IBM437 comment.remove_private diff --git a/test/test_rdoc_encoding.rb b/test/test_rdoc_encoding.rb index d9298880d7..9d9ded4bbd 100644 --- a/test/test_rdoc_encoding.rb +++ b/test/test_rdoc_encoding.rb @@ -37,7 +37,7 @@ def test_class_read_file_encoding def test_class_read_file_encoding_convert content = "" - content.encode! 'ISO-8859-1' + content = RDoc::Encoding.change_encoding content, 'ISO-8859-1' content << "# coding: ISO-8859-1\nhi \xE9verybody" @tempfile.write content @@ -65,7 +65,7 @@ def test_class_read_file_encoding_fail def test_class_read_file_encoding_fancy expected = "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody" - expected.encode! Encoding::UTF_8 + exptected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8 @tempfile.write expected @tempfile.flush @@ -125,7 +125,7 @@ def test_class_read_file_encoding_iso_2022_jp contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8 expected = ":\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89:" - expected.force_encoding Encoding::UTF_8 + expected = RDoc::Encoding.change_encoding expected, Encoding::UTF_8 assert_equal expected, contents assert_equal Encoding::UTF_8, contents.encoding @@ -133,24 +133,24 @@ def test_class_read_file_encoding_iso_2022_jp def test_class_set_encoding s = "# coding: UTF-8\n" - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s # sanity check for 1.8 assert_equal Encoding::UTF_8, s.encoding s = "#!/bin/ruby\n# coding: UTF-8\n" - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal Encoding::UTF_8, s.encoding s = "\n" - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal Encoding::UTF_8, s.encoding s = "\n" - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal Encoding::UTF_8, s.encoding end @@ -158,13 +158,13 @@ def test_class_set_encoding def test_class_set_encoding_strip s = "# coding: UTF-8\n# more comments" - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal "# more comments", s s = "#!/bin/ruby\n# coding: UTF-8\n# more comments" - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal "#!/bin/ruby\n# more comments", s end @@ -172,29 +172,29 @@ def test_class_set_encoding_strip def test_class_set_encoding_bad s = "" expected = s.encoding - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal expected, s.encoding s = "# vim:set fileencoding=utf-8:\n" expected = s.encoding - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal expected, s.encoding s = "# vim:set fileencoding=utf-8:\n" expected = s.encoding - RDoc::Encoding.set_encoding s + s = RDoc::Encoding.set_encoding s assert_equal expected, s.encoding assert_raises ArgumentError do - RDoc::Encoding.set_encoding "# -*- encoding: undecided -*-\n" + s = RDoc::Encoding.set_encoding "# -*- encoding: undecided -*-\n" end end def test_skip_frozen_string_literal - expected = "# frozen_string_literal: false\nhi everybody" + expected = "# frozen_string_literal: true\nhi everybody" @tempfile.write expected @tempfile.flush @@ -216,7 +216,7 @@ def test_skip_frozen_string_literal_after_coding end def test_skip_frozen_string_literal_before_coding - expected = "# frozen_string_literal: false\n# coding: utf-8\nhi everybody" + expected = "# frozen_string_literal: true\n# coding: utf-8\nhi everybody" @tempfile.write expected @tempfile.flush diff --git a/test/test_rdoc_generator_json_index.rb b/test/test_rdoc_generator_json_index.rb index 154dfe7c4b..6cb5463d29 100644 --- a/test/test_rdoc_generator_json_index.rb +++ b/test/test_rdoc_generator_json_index.rb @@ -199,7 +199,7 @@ def test_generate_gzipped def test_generate_utf_8 text = "5\xB0" - text.force_encoding Encoding::ISO_8859_1 + text = RDoc::Encoding.change_encoding text, Encoding::ISO_8859_1 @klass.add_comment comment(text), @top_level @g.generate @@ -215,7 +215,7 @@ def test_generate_utf_8 klass_record = @klass.search_record[2..-1] klass_record[-1] = "

5\xc2\xb0\n" - klass_record.last.force_encoding Encoding::UTF_8 + klass_record[-1] = RDoc::Encoding.change_encoding klass_record[-1], Encoding::UTF_8 info = [ klass_record, diff --git a/test/test_rdoc_markup_attribute_manager.rb b/test/test_rdoc_markup_attribute_manager.rb index 9389e4cf64..a939623e01 100644 --- a/test/test_rdoc_markup_attribute_manager.rb +++ b/test/test_rdoc_markup_attribute_manager.rb @@ -171,21 +171,21 @@ def test_combined end def test_convert_attrs - str = '+foo+' + str = '+foo+'.dup attrs = RDoc::Markup::AttrSpan.new str.length @am.convert_attrs str, attrs assert_equal "\000foo\000", str - str = '+:foo:+' + str = '+:foo:+'.dup attrs = RDoc::Markup::AttrSpan.new str.length @am.convert_attrs str, attrs assert_equal "\000:foo:\000", str - str = '+x-y+' + str = '+x-y+'.dup attrs = RDoc::Markup::AttrSpan.new str.length @am.convert_attrs str, attrs @@ -299,17 +299,17 @@ def test_mask_protected_sequence def @am.str() @str end def @am.str=(str) @str = str end - @am.str = 'foo' + @am.str = 'foo'.dup @am.mask_protected_sequences assert_equal "foo", @am.str - @am.str = 'foo\\' + @am.str = 'foo\\'.dup @am.mask_protected_sequences assert_equal "foo<\x04/code>", @am.str, 'escaped close' - @am.str = 'foo\\\\' + @am.str = 'foo\\\\'.dup @am.mask_protected_sequences assert_equal "foo\\", @am.str, 'escaped backslash' diff --git a/test/test_rdoc_markup_formatter.rb b/test/test_rdoc_markup_formatter.rb index 1b0a011e6f..0e7f72fb16 100644 --- a/test/test_rdoc_markup_formatter.rb +++ b/test/test_rdoc_markup_formatter.rb @@ -12,7 +12,7 @@ def initialize markup end def accept_paragraph paragraph - @res << attributes(paragraph.text) + @res += attributes(paragraph.text) end def attributes text diff --git a/test/test_rdoc_markup_pre_process.rb b/test/test_rdoc_markup_pre_process.rb index 13e3ec13c0..3e0e505b0b 100644 --- a/test/test_rdoc_markup_pre_process.rb +++ b/test/test_rdoc_markup_pre_process.rb @@ -86,8 +86,7 @@ def test_handle text = "# :main: M\n" out = @pp.handle text - assert_same out, text - assert_equal "#\n", text + assert_equal "#\n", out end def test_handle_comment @@ -96,8 +95,7 @@ def test_handle_comment out = @pp.handle c - assert_same out, text - assert_equal "#\n", text + assert_equal "#\n", out end def test_handle_markup @@ -129,8 +127,7 @@ def test_handle_post_process out = @pp.handle text, cd - assert_same out, text - assert_equal "# a b c\n", text + assert_equal "# a b c\n", out assert_equal "# a b c\n", cd.metadata[:stuff] end @@ -138,8 +135,7 @@ def test_handle_unregistered text = "# :x: y\n" out = @pp.handle text - assert_same out, text - assert_equal "# :x: y\n", text + assert_equal text, out end def test_handle_directive_blankline diff --git a/test/test_rdoc_markup_to_html_snippet.rb b/test/test_rdoc_markup_to_html_snippet.rb index fa59de434f..d7ce211999 100644 --- a/test/test_rdoc_markup_to_html_snippet.rb +++ b/test/test_rdoc_markup_to_html_snippet.rb @@ -604,7 +604,7 @@ def test_convert_limit_over rdoc = "* text\n" * 2 expected = "

text\n" - expected.chomp! + expected = expected.chomp expected << " #{@ellipsis}\n" actual = @to.convert rdoc diff --git a/test/test_rdoc_parser_changelog.rb b/test/test_rdoc_parser_changelog.rb index 46cbb0d9a3..06c3ff206e 100644 --- a/test/test_rdoc_parser_changelog.rb +++ b/test/test_rdoc_parser_changelog.rb @@ -33,7 +33,7 @@ def test_class_can_parse def test_continue_entry_body parser = util_parser - entry_body = ['a'] + entry_body = ['a'.dup] parser.continue_entry_body entry_body, 'b' @@ -53,7 +53,7 @@ def test_continue_entry_body_empty def test_continue_entry_body_function parser = util_parser - entry_body = ['file: (func1)'] + entry_body = ['file: (func1)'.dup] parser.continue_entry_body entry_body, '(func2): blah' diff --git a/test/test_rdoc_text.rb b/test/test_rdoc_text.rb index 8d638bbc38..9f0e9480d3 100644 --- a/test/test_rdoc_text.rb +++ b/test/test_rdoc_text.rb @@ -61,7 +61,7 @@ def test_expand_tabs def test_expand_tabs_encoding inn = "hello\ns\tdave" - inn.force_encoding Encoding::BINARY + inn = RDoc::Encoding.change_encoding inn, Encoding::BINARY out = expand_tabs inn @@ -95,7 +95,7 @@ def test_flush_left_encoding The comments associated with TEXT - text.force_encoding Encoding::US_ASCII + text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII expected = <<-EXPECTED @@ -303,7 +303,7 @@ def test_strip_hashes_encoding # The comments associated with TEXT - text.force_encoding Encoding::CP852 + text = RDoc::Encoding.change_encoding text, Encoding::CP852 expected = <<-EXPECTED @@ -332,7 +332,7 @@ def test_strip_newlines_encoding assert_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check' text = " \n" - text.force_encoding Encoding::US_ASCII + text = RDoc::Encoding.change_encoding text, Encoding::US_ASCII stripped = strip_newlines text @@ -386,7 +386,7 @@ def test_strip_stars_encoding */ TEXT - text.force_encoding Encoding::CP852 + text = RDoc::Encoding.change_encoding text, Encoding::CP852 expected = <<-EXPECTED @@ -410,7 +410,7 @@ def test_strip_stars_encoding2 */ TEXT - text.force_encoding Encoding::BINARY + text = RDoc::Encoding.change_encoding text, Encoding::BINARY expected = <<-EXPECTED diff --git a/test/test_rdoc_tom_doc.rb b/test/test_rdoc_tom_doc.rb index 6e60e67726..15bbd9b32d 100644 --- a/test/test_rdoc_tom_doc.rb +++ b/test/test_rdoc_tom_doc.rb @@ -131,7 +131,7 @@ def test_parse_paragraph def test_parse_multiline_paragraph text = "Public: Do some stuff\n" - text << "On a new line\n" + text += "On a new line\n" expected = doc( @@ -353,7 +353,7 @@ def test_tokenize_paragraph def test_tokenize_multiline_paragraph text = "Public: Do some stuff\n" - text << "On a new line\n" + text += "On a new line\n" @td.tokenize text From 9815e3773856ece435e63f9a588169898ab70779 Mon Sep 17 00:00:00 2001 From: aycabta Date: Thu, 16 Nov 2017 06:58:29 +0900 Subject: [PATCH 3/4] Add frozen_string_literal to files by Racc --- Rakefile | 5 +++++ lib/rdoc/rd/block_parser.ry | 4 ++-- lib/rdoc/rd/inline_parser.ry | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 2dd5d21bd5..4375af0b99 100644 --- a/Rakefile +++ b/Rakefile @@ -63,6 +63,11 @@ parsed_files = PARSER_FILES.map do |parser_file| racc = Gem.bin_path 'racc', 'racc' rb_file = parser_file.gsub(/\.ry\z/, ".rb") ruby "#{racc} -l -o #{rb_file} #{parser_file}" + open(rb_file, 'r+') do |f| + newtext = "# frozen_string_literal: true\n#{f.read}" + f.rewind + f.write newtext + end elsif parser_file =~ /\.kpeg\z/ # need kpeg kpeg = Gem.bin_path 'kpeg', 'kpeg' rb_file = parser_file.gsub(/\.kpeg\z/, ".rb") diff --git a/lib/rdoc/rd/block_parser.ry b/lib/rdoc/rd/block_parser.ry index e9b30a6231..675d437208 100644 --- a/lib/rdoc/rd/block_parser.ry +++ b/lib/rdoc/rd/block_parser.ry @@ -420,7 +420,7 @@ def next_token # :nodoc: if @in_verbatim [:STRINGLINE, line] else - @indent_stack.push("\s" << newIndent) + @indent_stack.push("\s" + newIndent) [:ITEMLISTLINE, rest] end end @@ -432,7 +432,7 @@ def next_token # :nodoc: if @in_verbatim [:STRINGLINE, line] else - @indent_stack.push("\s" * mark.size << newIndent) + @indent_stack.push("\s" * mark.size + newIndent) [:ENUMLISTLINE, rest] end end diff --git a/lib/rdoc/rd/inline_parser.ry b/lib/rdoc/rd/inline_parser.ry index 4e9721816f..c7345013bf 100644 --- a/lib/rdoc/rd/inline_parser.ry +++ b/lib/rdoc/rd/inline_parser.ry @@ -436,7 +436,7 @@ end def parse inline @inline = inline @src = StringScanner.new inline - @pre = "" + @pre = "".dup @yydebug = true do_parse.to_s end From 8ffc114b5eb6ee37e7b5fc93558e1f22bbb462b2 Mon Sep 17 00:00:00 2001 From: aycabta Date: Thu, 16 Nov 2017 07:54:30 +0900 Subject: [PATCH 4/4] Add frozen_string_literal to files by KPeg --- lib/rdoc/markdown.kpeg | 1 + lib/rdoc/markdown/literals.kpeg | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/rdoc/markdown.kpeg b/lib/rdoc/markdown.kpeg index 4148b06c3e..a81e92fef5 100644 --- a/lib/rdoc/markdown.kpeg +++ b/lib/rdoc/markdown.kpeg @@ -2,6 +2,7 @@ %% header { # coding: UTF-8 +# frozen_string_literal: true # :markup: markdown ## diff --git a/lib/rdoc/markdown/literals.kpeg b/lib/rdoc/markdown/literals.kpeg index 1f807dcf83..952263b4ae 100644 --- a/lib/rdoc/markdown/literals.kpeg +++ b/lib/rdoc/markdown/literals.kpeg @@ -2,6 +2,7 @@ %% header { # coding: UTF-8 +# frozen_string_literal: true # :markup: markdown ##