at_coder_friends 0.6.8 → 0.7.0

data/lib/at_coder_friends/generator/ruby_builtin.rb

@@ -4,182 +4,29 @@ module AtCoderFriends
   module Generator
     # generates Ruby source from problem description
     class RubyBuiltin < Base
+      include ConstFragmentMixin
+      include DeclFragmentMixin
+
       ACF_HOME = File.realpath(File.join(__dir__, '..', '..', '..'))
       TMPL_DIR = File.join(ACF_HOME, 'templates')
-      DEFAULT_TMPL = File.join(TMPL_DIR, 'ruby_builtin.rb.erb')
-      ATTRS = Attributes.new(:rb, DEFAULT_TMPL)
+      TEMPLATE = File.join(TMPL_DIR, 'ruby_builtin.rb.erb')
+      FRAGMENTS = File.realpath(File.join(TMPL_DIR, 'ruby_builtin_fragments.yml'))
+      ATTRS = Attributes.new(:rb, TEMPLATE, FRAGMENTS)
 
       def attrs
         ATTRS
       end
 
-      def render(src)
-        src = embed_lines(src, '### CONSTS ###', gen_consts)
-        src = embed_lines(src, '### DCLS ###', gen_decls)
-        src
-      end
-
-      def gen_consts(constants = pbm.constants)
-        constants
+      def gen_consts
+        pbm.constants
           .select { |c| c.type == :mod }
-          .map { |c| gen_mod(c) }
-      end
-
-      def gen_mod(c)
-        v = c.value.gsub('^', '**').gsub(',', '_')
-        "MOD = #{v}"
-      end
-
-      def gen_decls(inpdefs = pbm.formats)
-        inpdefs.map { |inpdef| gen_decl(inpdef) }.flatten
+          .map { |c| gen_const(c) }
       end
 
-      def gen_decl(inpdef)
-        case inpdef.container
-        when :single
-          gen_single_decl(inpdef)
-        when :harray
-          gen_harray_decl(inpdef)
-        when :varray
-          gen_varray_decl(inpdef)
-        when :matrix
-          gen_matrix_decl(inpdef)
-        when :varray_matrix, :matrix_varray
-          gen_cmb_decl(inpdef)
-        when :vmatrix
-          gen_vmatrix_decl(inpdef)
-        when :hmatrix
-          gen_hmatrix_decl(inpdef)
-        end
-      end
-
-      def gen_single_decl(inpdef)
-        names = inpdef.names
-        dcl = names.join(', ')
-        expr = gen_expr(inpdef, names.size > 1)
-        "#{dcl} = #{expr}"
-      end
-
-      def gen_harray_decl(inpdef)
-        v = inpdef.names[0]
-        dcl = "#{v}s"
-        expr = gen_expr(inpdef, true)
-        "#{dcl} = #{expr}"
-      end
-
-      def gen_varray_decl(inpdef)
-        if inpdef.names.size == 1
-          gen_varray_1_decl(inpdef)
-        else
-          gen_varray_n_decl(inpdef)
-        end
-      end
-
-      def gen_varray_1_decl(inpdef)
-        v = inpdef.names[0]
-        sz = inpdef.size[0]
-        dcl = "#{v}s"
-        expr = gen_expr(inpdef, false)
-        "#{dcl} = Array.new(#{sz}) { #{expr} }"
-      end
-
-      def gen_varray_n_decl(inpdef)
-        names = inpdef.names
-        sz = inpdef.size[0]
-        dcl = names.map { |v| "#{v}s[i]" }.join(', ')
-        expr = gen_expr(inpdef, true)
-        ret = []
-        ret += names.map { |v| "#{v}s = Array.new(#{sz})" }
-        ret << "#{sz}.times do |i|"
-        ret << "  #{dcl} = #{expr}"
-        ret << 'end'
-        ret
-      end
-
-      def gen_matrix_decl(inpdef)
-        v = inpdef.names[0]
-        sz = inpdef.size[0]
-        decl = "#{v}ss"
-        expr = gen_expr(inpdef, true)
-        "#{decl} = Array.new(#{sz}) { #{expr} }"
-      end
-
-      def gen_cmb_decl(inpdef)
-        mx = inpdef.container == :varray_matrix ? -1 : 0
-        vs = inpdef.names.map { |v| "#{v}s" }
-        vs[mx] += 's'
-        sz = inpdef.size[0]
-        dcls = vs.map { |v| "#{v}[i]" }
-        dcls[mx] = '*' + dcls[mx] unless inpdef.item == :char
-        dcl = dcls.join(', ')
-        expr = gen_cmb_expr(inpdef)
-        ret = []
-        ret += vs.map { |v| "#{v} = Array.new(#{sz})" }
-        ret << "#{sz}.times do |i|"
-        ret << "  #{dcl} = #{expr}"
-        ret << 'end'
-        ret
-      end
-
-      def gen_vmatrix_decl(inpdef)
-        names = inpdef.names
-        sz1, sz2 = inpdef.size
-        dcl = names.map { |v| "#{v}ss[i][j]" }.join(', ')
-        expr = gen_expr(inpdef, true)
-        ret = []
-        ret += names.map do |v|
-          "#{v}ss = Array.new(#{sz1}) { Array.new(#{sz2}) }"
-        end
-        ret << "#{sz1}.times do |i|"
-        ret << "  #{sz2}.times do |j|"
-        ret << "    #{dcl} = #{expr}"
-        ret << '  end'
-        ret << 'end'
-        ret
-      end
-
-      def gen_hmatrix_decl(inpdef)
-        names = inpdef.names
-        sz = inpdef.size[0]
-        dcl = names.map { |v| "#{v}ss[i]" }.join(', ')
-        expr = gen_expr(inpdef, true)
-        ret = []
-        ret += names.map { |v| "#{v}ss = Array.new(#{sz})" }
-        ret << "#{sz}.times do |i|"
-        ret << "  #{dcl} = #{expr}.each_slice(#{names.size}).to_a.transpose"
-        ret << 'end'
-        ret
-      end
-
-      def gen_expr(inpdef, split)
-        read = gen_read(inpdef.delim)
-        case inpdef.item
-        when :number
-          split ? "#{read}.split.map(&:to_i)" : "#{read}.to_i"
-        when :decimal
-          split ? "#{read}.split.map(&:to_f)" : "#{read}.to_f"
-        when :string
-          split ? "#{read}.chomp.split" : "#{read}.chomp"
-        when :char
-          'gets.chomp'
-        end
-      end
-
-      def gen_cmb_expr(inpdef)
-        read = gen_read(inpdef.delim)
-        case inpdef.item
-        when :number
-          "#{read}.split.map(&:to_i)"
-        when :decimal
-          "#{read}.split.map(&:to_f)"
-        when :string, :char
-          "#{read}.chomp.split"
-        end
-      end
-
-      def gen_read(delim)
-        sub = delim.chars.map { |d| ".gsub('#{d}', ' ')" }.join
-        "gets#{sub}"
+      # deprecated, use ERB syntax
+      def render(src)
+        src = embed_lines(src, '### CONSTS ###', gen_consts)
+        embed_lines(src, '### DCLS ###', gen_decls)
       end
     end
   end

data/lib/at_coder_friends/parser/binary.rb

@@ -8,17 +8,16 @@ module AtCoderFriends
 
       def process(pbm)
         vs = exp_values(pbm)
-        return unless vs.size == 2
-        return if vs.any? { |v| v.include?("\n") }
-        return if vs.any? { |v| v =~ /\A[0-9\s]*\z/ }
+        return unless binary_values?(vs)
 
         out_fmt = output_format(pbm)
         re1, re2 = vs.map { |v| Regexp.escape(v) }
 
         pbm.options.binary_values =
-          if out_fmt =~ /#{re1}.+#{re2}/m
+          case out_fmt
+          when /#{re1}.+#{re2}/m
             vs
-          elsif out_fmt =~ /#{re2}.+#{re1}/m
+          when /#{re2}.+#{re1}/m
             vs.reverse
           end
       end
@@ -31,6 +30,14 @@ module AtCoderFriends
           .uniq
       end
 
+      def binary_values?(vs)
+        return false unless vs.size == 2
+        return false if vs.any? { |v| v.include?("\n") }
+        return false if vs.any? { |v| v =~ /\A[0-9\s]*\z/ }
+
+        true
+      end
+
       def output_format(pbm)
         pbm.sections[Problem::SECTION_OUT_FMT]&.content || ''
       end

data/lib/at_coder_friends/parser/constraints.rb

@@ -34,14 +34,14 @@ module AtCoderFriends
 
       def parse(str)
         str = normalize_content(str)
-        str
-          .scan(MAX_PATTERN)
-          .map(&:compact)
-          .map { |k, v| [normalize_names(k), normalize_value(v)] }
-          .select { |_, v| v && !v.empty? }
-          .flat_map { |ks, v| ks.map { |k| [k, v] } }
-          .uniq
-          .map { |k, v| Problem::Constant.new(k, :max, v) }
+        pats = str.scan(MAX_PATTERN).map(&:compact)
+        pairs = pats.each_with_object([]) do |(k, v), result|
+          value = normalize_value(v)
+          next unless value && !value.empty?
+
+          normalize_names(k).each { |name| result << [name, value] }
+        end
+        pairs.uniq.map { |k, v| Problem::Constant.new(k, :max, v) }
       end
 
       def normalize_content(s)

data/lib/at_coder_friends/parser/input_format.rb

@@ -56,16 +56,20 @@ module AtCoderFriends
           .gsub('>', '>')
           .gsub('&lt;', '<')
           .gsub('\\ ', ' ')
-          .gsub(/\\hspace\{\d+pt\}/, ' ')
           .gsub('\\(', '')
           .gsub('\\)', '')
           .gsub('\\lvert', '|')
           .gsub('\\rvert', '|')
-          .gsub('\\mathit', '')
-          .gsub('\\mathrm', '')
           .gsub('\\times', '*')
           .gsub(/\\begin(\{[^{}]*\})*/, '')
           .gsub(/\\end(\{[^{}]*\})*/, '')
+          .gsub(/\\hspace(\{[^{}]*\})*/, ' ')
+          .gsub(/\\mathrm\{([^{}]*)\}/, '\1')
+          .gsub(/\\mathit\{([^{}]*)\}/, '\1')
+          .gsub(/\\textrm\{([^{}]*)\}/, '\1')
+          .gsub(/\\text\{([^{}]*)\}/, '\1')
+          .gsub(/\\rm\{([^{}]*)\}/, '\1')
+          .gsub('\\rm ', ' ')
           .gsub(/\\[cdlv]?dots/, '..')
           .gsub(/\{\}/, ' ')
           .gsub('−', '-') # full width hyphen
@@ -140,7 +144,7 @@ module AtCoderFriends
         sz = str.split('_')
         return sz if sz.size == 2
 
-        [str[0] || '_', str[1..-1] || '_']
+        [str[0] || '_', str[1..] || '_']
       end
     end
 
@@ -148,8 +152,8 @@ module AtCoderFriends
     class InputFormatMatcher
       include InputFormatUtils
 
-      attr_reader :container, :item, :pat, :gen_names, :gen_pat2
-      attr_reader :names, :pat2, :size, :delim, :ix0
+      attr_reader :container, :item, :pat, :gen_names, :gen_pat2,
+                  :names, :pat2, :size, :delim, :ix0
 
       def initialize(
         container: nil, item: nil,
@@ -168,8 +172,8 @@ module AtCoderFriends
 
         @names = gen_names.call(m1)
         @pat2 = gen_pat2&.call(names)
-        @size = m1.names.include?('sz') && m1['sz'] || ''
-        @ix0 = m1.names.include?('ix0') && m1['ix0'] || size
+        @size = (m1.names.include?('sz') && m1['sz']) || ''
+        @ix0 = (m1.names.include?('ix0') && m1['ix0']) || size
         @delim = dlm
         true
       end
@@ -339,7 +343,7 @@ module AtCoderFriends
         gen_pat2:
           lambda { |vs|
             m = vs[0]
-            ws = vs[1..-1].map { |v| v + RE_IX.source }.join('\s+')
+            ws = vs[1..].map { |v| v + RE_IX.source }.join('\s+')
             /
               \A
               #{m}#{RE_IX}
@@ -363,7 +367,7 @@ module AtCoderFriends
           lambda { |vs|
             ws = [
               vs[0] + RE_SZ.source,
-              *vs[1..-1]&.map { |v| v + RE_IX.source }
+              *vs[1..]&.map { |v| v + RE_IX.source }
             ].join('\s+')
             /\A#{ws}\z/
           }
@@ -385,7 +389,7 @@ module AtCoderFriends
             ws1 = vs.map { |v| v + RE_IX.source }.join('\s+')
             ws2 = [
               vs[0] + RE_SZ.source,
-              *vs[1..-1]&.map { |v| v + RE_IX.source }
+              *vs[1..]&.map { |v| v + RE_IX.source }
             ].join('\s+')
             /
               \A
@@ -408,7 +412,7 @@ module AtCoderFriends
           lambda { |vs|
             ws = [
               vs[0] + RE_SZ.source,
-              *vs[1..-1]&.map { |v| v + RE_IX.source }
+              *vs[1..]&.map { |v| v + RE_IX.source }
             ].join('\s+')
             /\A#{ws}\z/
           }
@@ -416,7 +420,7 @@ module AtCoderFriends
       SINGLE_MATCHER = InputFormatMatcher.new(
         container: :single,
         pat: /\A(.*\s)?#{RE_SINGLE}(\s.*)?\z/,
-        gen_names: ->(m) { m[0].split.select { |w| w =~ /\A#{RE_SINGLE}\z/ } }
+        gen_names: ->(m) { m[0].split.grep(/\A#{RE_SINGLE}\z/) }
       )
       MATCHERS = [
         MATRIX_MATCHER,
@@ -469,8 +473,8 @@ module AtCoderFriends
 
             ret << matcher.to_inpdef
           end
-          if (matcher = MATCHERS.find { |m| m.match(line) })
-          elsif !line.empty?
+          matcher = MATCHERS.find { |m| m.match(line) }
+          if !line.empty? && matcher.nil?
             puts "unknown format: #{line}"
             ret << unknown_fmt(line)
           end

data/lib/at_coder_friends/parser/modulo.rb

@@ -6,7 +6,6 @@ module AtCoderFriends
     module Modulo
       module_function
 
-      # rubocop:disable Style/AsciiComments
       SECTIONS = [
         Problem::SECTION_OUT_FMT,
         Problem::SECTION_STATEMENT,
@@ -18,6 +17,7 @@ module AtCoderFriends
       VALUE_PATTERN = %r{
         (?:
           <var>([^<>]+)</var>
+          |\(([^()]+)\)
           |\\\(([^()]+)\\\)
           |\$([^$]+)\$
           |\{([^{}]+)\}
@@ -29,10 +29,9 @@ module AtCoderFriends
       MOD_PATTERN = /
         (?:
           #{VALUE_PATTERN}\s*(?:\([^()]+\)\s*)?で割った(?:剰余|余り|あまり)
-          |(?:modulo|mod|divided\s*by|dividing\s*by)\s*#{VALUE_PATTERN}
+          |(?:modulo|mod|divid(?:ed|ing)\s*by)\s*#{VALUE_PATTERN}
         )
       /xi.freeze
-      # rubocop:enable Style/AsciiComments
 
       def process(pbm)
         mods = []
@@ -59,10 +58,9 @@ module AtCoderFriends
         s
           .tr('０-９Ａ-Ｚａ-ｚ', '0-9A-Za-z')
           .gsub(/[[:space:]]/, ' ')
-          .gsub(%r{[^一-龠_ぁ-ん_ァ-ヶーa-zA-Z0-9 -/:-@\[-`\{-~]}, '')
-          .gsub(/{\\rm\s*mod\s*}\\?/i, 'mod') # {\rm mod} -> mod
-          .gsub(/\\rm\s*{\s*mod\s*}\\?/i, 'mod') # \rm{mod}\ -> mod
-          .gsub(/\\mbox\s*{\s*mod\s*}/i, 'mod') # \mbox{mod} -> mod
+          .gsub(%r{[^一-龠_ぁ-んァ-ヶーa-zA-Z0-9 -/:-@\[-`\{-~]}, '')
+          .gsub(/{\\[a-z]+\s*mod\s*}\\?/i, 'mod') # {\rm mod}, {\bmod} -> mod
+          .gsub(/\\[a-z]+\s*{\s*mod\s*}\\?/i, 'mod') # \text{mod} -> mod
           .gsub(%r{<var>\s*mod\s*</var>}i, 'mod') # <var>mod</var> -> mod
       end
 

data/lib/at_coder_friends/parser/section_wrapper.rb

@@ -23,15 +23,13 @@ module AtCoderFriends
       end
 
       def content
-        @content ||= begin
+        @content ||=
           siblings.reduce('') { |m, node| m + node.content }.gsub("\r\n", "\n")
-        end
       end
 
       def html
-        @html ||= begin
+        @html ||=
           siblings.reduce('') { |m, node| m + node.to_html }.gsub("\r\n", "\n")
-        end
       end
 
       def find_element(tags)
@@ -54,7 +52,7 @@ module AtCoderFriends
 
       def code_block(mtd)
         elem = find_element(%w[pre blockquote])
-        elem && elem.send(mtd).lstrip.gsub("\r\n", "\n") || ''
+        (elem && elem.send(mtd).lstrip.gsub("\r\n", "\n")) || ''
       end
     end
   end

data/lib/at_coder_friends/parser/sections.rb

@@ -129,7 +129,7 @@ module AtCoderFriends
         key = nil
         SECTION_DEFS.any? do |grp|
           if (m = title.match(grp[:pattern]))
-            no = m.names.include?('no') && m['no'] || '1'
+            no = (m.names.include?('no') && m['no']) || '1'
             key = format(grp[:key], no: no)
           end
         end
@@ -140,7 +140,7 @@ module AtCoderFriends
         s
           .tr('０-９Ａ-Ｚａ-ｚ', '0-9A-Za-z')
           .gsub(/[[:space:]]/, ' ') # &npsp; full-width space
-          .gsub(/[^一-龠_ぁ-ん_ァ-ヶーa-zA-Z0-9 ]/, '')
+          .gsub(/[^一-龠_ぁ-んァ-ヶーa-zA-Z0-9 ]/, '')
           .strip
       end
     end

data/lib/at_coder_friends/path_util.rb

@@ -4,7 +4,7 @@ module AtCoderFriends
   # Common methods and behaviors for dealing with paths.
   module PathUtil
     def makedirs_unless(dir)
-      FileUtils.makedirs(dir) unless Dir.exist?(dir)
+      FileUtils.makedirs(dir)
     end
   end
 end

data/lib/at_coder_friends/problem.rb

@@ -54,7 +54,7 @@ module AtCoderFriends
       end
 
       def vars
-        tmp = @item && [@item] || cols
+        tmp = (@item && [@item]) || cols
         names.zip(tmp).map { |(name, col)| [name, col || :number] }
       end
 
@@ -77,8 +77,8 @@ module AtCoderFriends
           ),
           self.class.new(
             container: :matrix, item: @item,
-            names: names[-1..-1], size: size,
-            delim: delim, cols: cols[-1..-1] || []
+            names: names[-1..], size: size,
+            delim: delim, cols: cols[-1..] || []
           )
         ]
       end
@@ -92,8 +92,8 @@ module AtCoderFriends
           ),
           self.class.new(
             container: :varray,
-            names: names[1..-1], size: size[0..0],
-            delim: delim, cols: cols[1..-1] || []
+            names: names[1..], size: size[0..0],
+            delim: delim, cols: cols[1..] || []
           )
         ]
       end

data/lib/at_coder_friends/scraping/agent.rb

@@ -23,7 +23,7 @@ module AtCoderFriends
         @agent = Mechanize.new
         agent.user_agent = "AtCoderFriends/#{VERSION} (#{CONTACT})"
         agent.pre_connect_hooks << proc { sleep 0.1 }
-        agent.log = Logger.new(STDERR) if ctx.options[:debug]
+        agent.log = Logger.new($stderr) if ctx.options[:debug]
         load_session
       end
 

data/lib/at_coder_friends/scraping/authentication.rb

@@ -25,7 +25,7 @@ module AtCoderFriends
           raise e if username_link(e.page)
         end
 
-        agent.get(common_url('login') + '?continue=' + CGI.escape(url))
+        agent.get("#{common_url('login')}?continue=#{CGI.escape(url)}")
       end
 
       def post_login(page)
@@ -40,13 +40,13 @@ module AtCoderFriends
         user = ctx.config['user'].to_s
         if user.empty?
           print('enter username:')
-          user = STDIN.gets.chomp
+          user = $stdin.gets.chomp
         end
 
         pass = ctx.config['password'].to_s
         if pass.empty?
           print("enter password for #{user}:")
-          pass = STDIN.noecho(&:gets).chomp
+          pass = $stdin.noecho(&:gets).chomp
           puts
         end
         [user, pass]

data/lib/at_coder_friends/scraping/session.rb

@@ -14,7 +14,7 @@ module AtCoderFriends
 
       def save_session
         dir = File.dirname(session_store)
-        Dir.mkdir(dir) unless Dir.exist?(dir)
+        FileUtils.mkdir_p(dir)
         agent.cookie_jar.save_as(session_store)
       end
 

data/lib/at_coder_friends/scraping/tasks.rb

@@ -7,14 +7,12 @@ module AtCoderFriends
       def fetch_all
         puts "***** fetch_all #{contest} *****"
         fetch_assignments.map do |q, url|
-          begin
-            pbm = fetch_problem(q, url)
-            yield pbm if block_given?
-            pbm
-          rescue StandardError => e
-            puts e.to_s
-            puts e.backtrace
-          end
+          pbm = fetch_problem(q, url)
+          yield pbm if block_given?
+          pbm
+        rescue StandardError => e
+          puts e
+          puts e.backtrace
         end
       end
 

data/lib/at_coder_friends/test_runner/base.rb

@@ -121,7 +121,7 @@ module AtCoderFriends
       end
 
       def which_os
-        @which_os ||= begin
+        @which_os ||=
           case RbConfig::CONFIG['host_os']
           when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
             :windows
@@ -134,7 +134,6 @@ module AtCoderFriends
           else
             :unknown
           end
-        end
       end
     end
   end

data/lib/at_coder_friends/test_runner/judge.rb

@@ -16,17 +16,17 @@ module AtCoderFriends
         puts "***** judge_all #{prg} (#{test_loc}) *****"
         results = Dir["#{data_dir}/#{q}/in/*"].sort.map do |infile|
           id = File.basename(infile)
-          judge(id, false)
+          judge(id, detail: false)
         end
         !results.empty? && results.all?
       end
 
       def judge_one(id)
         puts "***** judge_one #{prg} (#{test_loc}) *****"
-        judge(id, true)
+        judge(id, detail: true)
       end
 
-      def judge(id, detail = true)
+      def judge(id, detail: true)
         @detail = detail
         infile = "#{data_dir}/#{q}/in/#{id}"
         outfile = "#{result_dir}/#{q}/result/#{id}"

data/lib/at_coder_friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtCoderFriends
-  VERSION = '0.6.8'
+  VERSION = '0.7.0'
 end

data/lib/at_coder_friends.rb

@@ -28,6 +28,9 @@ require 'at_coder_friends/parser/interactive'
 require 'at_coder_friends/parser/binary'
 require 'at_coder_friends/parser/main'
 require 'at_coder_friends/generator/base'
+require 'at_coder_friends/generator/fragment'
+require 'at_coder_friends/generator/any_builtin'
+require 'at_coder_friends/generator/c_builtin'
 require 'at_coder_friends/generator/cxx_builtin'
 require 'at_coder_friends/generator/ruby_builtin'
 require 'at_coder_friends/generator/main'

data/templates/any_builtin.md.erb

@@ -0,0 +1,30 @@
+AnyBuiltin Generator
+====================
+
+## Usage
+- Prepare a source template file.
+- Specify the path to the template file
+  and file extension for the generated file (here we use 'js')
+  in `.at_coder_friends.yml` as follows:
+
+  ```
+  generators:
+    - AnyBuiltin
+  generator_settings:
+    AnyBuiltin:
+      file_ext: js
+      template: /path/to/template
+  ```
+
+## Problem URL
+<%= pbm.url %>
+
+## Constants
+<% gen_consts.each do |line| -%>
+- [<%= line %>]
+<% end -%>
+
+## Variables
+<% gen_decls.each do |line| -%>
+- [<%= line %>]
+<% end -%>

data/templates/any_builtin_fragments.yml

@@ -0,0 +1,5 @@
+constant:
+  mod: type=<%= type %> name=<%= name %> value=<%= value %>
+  max: type=<%= type %> name=<%= name %> value=<%= value %>
+declaration:
+  main: <%= to_s %>