at_coder_friends 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8025722558e20114e202913981972cc89885a7f
-  data.tar.gz: 52975c30a2ac79ca4b459b2466de8c8b244f2296
+  metadata.gz: 9a7432316e843545fb879309e242139dc2c0405c
+  data.tar.gz: 9e22a2dcde9e98a171ed393365de8fd308957996
 SHA512:
-  metadata.gz: 14a7f27ec8de72d1ecafe5e27810ac781aedc23c5604e33005856398250e07617ed803dc6641ad17e45b7de8f8ae09c20fffd9997f64a34e1f4dc3f10beb63d6
-  data.tar.gz: 0fb4f2e1afb371a7ad49ad69e9ae22fe169856a7268daf4fc78054192bba532181b82e9290d5965d5cf608ea92d85b23bb4c71f976c814adac32e704e4311eeb
+  metadata.gz: 70e350831761899ee4178e65f8563cbd328a0b8e70971e4620015d623484c0297fa60a6a5ce447bb349d3b2fa06799b336fb270913a34b8efb857dc97e9dfaa3
+  data.tar.gz: ff84c2c7fb80dda6105561d82d94c697c7e5133e91219c9f6530f8e7db083192a5ac8a5148a204fd5740c3cf470d53fd56ac5026b908738f12ccb671d824dd39

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 ## master (unreleased)
 
+## 0.6.3 (2020-01-05)
+### Added
+- 'vertical array + matrix' input format support.
+- 'matrix + vertical array' input format support.
+- 'vertically expanded matrices' input format support.
+- 'horizontally expanded matrices' input format support.
+- decimal type support.
+- input data with delimiter(- : /) support.
+- input data of mixed type support.
+- input of N-1 lines support.
+
+### Changed
+- Change template file format to ERB.
+- Template file integration
+
+### Deleted
+- Template file for interactive problems.
+- '### OUTPUT ###' embedding pattern.
+- '### URL ###' embedding pattern.
+
 ## 0.6.2 (2019-11-18)
 ### Added
 - add ```check-and-go``` command.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    at_coder_friends (0.6.2)
+    at_coder_friends (0.6.3)
       colorize (~> 0.8.1)
       launchy (~> 2.4.3)
       mechanize (~> 2.0)
@@ -41,7 +41,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
     public_suffix (4.0.1)

data/docs/CONFIGURATION.md

@@ -198,14 +198,12 @@ ext_settings:
 ### Settings for RubyBuiltin generator
 | Setting | Description | Default |
 |---------|-------------|---------|
-|default_template|Source template file path|[/templates/ruby_builtin_default.rb](/templates/ruby_builtin_default.rb)|
-|interactive_template|Source template file path for interactive problems|[/templates/ruby_builtin_interactive.rb](/templates/ruby_builtin_interactive.rb)|
+|default_template|Source template file path|[/templates/ruby_builtin.rb.erb](/templates/ruby_builtin.rb.erb)|
 
 ### Settings for CxxBuiltin generator
 | Setting | Description | Default |
 |---------|-------------|---------|
-|default_template|Source template file path|[/templates/cxx_builtin_default.cxx](/templates/cxx_builtin_default.cxx)|
-|interactive_template|Source template file path for interactive problems|[/templates/cxx_builtin_interactive.cxx](/templates/cxx_builtin_interactive.cxx)|
+|default_template|Source template file path|[/templates/cxx_builtin.cxx.erb](/templates/cxx_builtin.cxx.erb)|
 
 ### Language ID list (2019/09/16)
 

data/lib/at_coder_friends/generator/base.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+module AtCoderFriends
+  module Generator
+    Attributes = Struct.new(:file_ext, :default_template)
+
+    # common behavior of generators
+    class Base
+      attr_reader :cfg, :pbm
+
+      def initialize(cfg = nil)
+        @cfg = cfg || {}
+      end
+
+      def process(pbm)
+        pbm.add_src(attrs.file_ext, generate(pbm))
+      end
+
+      def generate(pbm)
+        @pbm = pbm
+        src = File.read(select_template)
+        src = ERB.new(src).result(binding)
+        render(src)
+      end
+
+      def select_template
+        cfg['default_template'] || attrs.default_template
+      end
+
+      def embed_lines(src, pat, lines)
+        re = Regexp.escape(pat)
+        src.gsub(
+          /^(.*)#{re}(.*)$\n/,
+          lines.compact.map { |s| "\\1#{s}\\2\n" }.join
+        )
+      end
+    end
+  end
+end

data/lib/at_coder_friends/generator/cxx_builtin.rb

@@ -2,96 +2,8 @@
 
 module AtCoderFriends
   module Generator
-    module CxxBuiltinConstants
-      ACF_HOME = File.realpath(File.join(__dir__, '..', '..', '..'))
-      TMPL_DIR = File.join(ACF_HOME, 'templates')
-      DEFAULT_TMPL = File.join(TMPL_DIR, 'cxx_builtin_default.cxx')
-      INTERACTIVE_TMPL = File.join(TMPL_DIR, 'cxx_builtin_interactive.cxx')
-      SCANF_FMTS = [
-        'scanf("%<fmt>s", %<addr>s);',
-        'REP(i, %<sz1>s) scanf("%<fmt>s", %<addr>s);',
-        'REP(i, %<sz1>s) REP(j, %<sz2>s) scanf("%<fmt>s", %<addr>s);'
-      ].freeze
-      FMT_FMTS = { number: '%d', string: '%s', char: '%s' }.freeze
-      ADDR_FMTS = {
-        single: {
-          number: '&%<v>s',
-          string: '%<v>s'
-        },
-        harray: {
-          number: '%<v>s + i',
-          string: '%<v>s[i]',
-          char: '%<v>s'
-        },
-        varray: {
-          number: '%<v>s + i',
-          string: '%<v>s[i]'
-        },
-        matrix: {
-          number: '&%<v>s[i][j]',
-          string: '%<v>s[i][j]',
-          char: '%<v>s[i]'
-        }
-      }.freeze
-      DEFAULT_OUTPUT = <<~TEXT
-        int ans = 0;
-        printf("%d\\n", ans);
-      TEXT
-      BINARY_OUTPUT_FMT = <<~TEXT
-        bool cond = false;
-        puts(cond ? "%s" : "%s");
-      TEXT
-    end
-
-    # generates C++ source from problem description
-    class CxxBuiltin
-      include CxxBuiltinConstants
-
-      attr_reader :cfg, :pbm
-
-      def initialize(cfg = nil)
-        @cfg = cfg || {}
-      end
-
-      def process(pbm)
-        src = generate(pbm)
-        pbm.add_src(:cxx, src)
-      end
-
-      def generate(pbm)
-        @pbm = pbm
-        src = File.read(select_template)
-        src = embed_lines(src, '/*** URL ***/', [pbm.url])
-        src = embed_lines(src, '/*** CONSTS ***/', gen_consts)
-        src = embed_lines(src, '/*** DCLS ***/', gen_decls)
-        src = embed_lines(src, '/*** INPUTS ***/', gen_inputs)
-        embed_lines(src, '/*** OUTPUT ***/', gen_output.split("\n"))
-      end
-
-      def embed_lines(src, pat, lines)
-        re = Regexp.escape(pat)
-        src.gsub(
-          /^(.*)#{re}(.*)$/,
-          lines.map { |s| '\1' + s + '\2' }.join("\n")
-        )
-      end
-
-      def select_template(interactive = pbm.options.interactive)
-        interactive ? interactive_template : default_template
-      end
-
-      def default_template
-        cfg['default_template'] || DEFAULT_TMPL
-      end
-
-      def interactive_template
-        cfg['interactive_template'] || INTERACTIVE_TMPL
-      end
-
-      def gen_consts(constants = pbm.constants)
-        constants.map { |c| gen_const(c) }
-      end
-
+    # generates C++ constants
+    module CxxBuiltinConstGen
       def gen_const(c)
         v = cnv_const_value(c.value)
         if c.type == :max
@@ -107,98 +19,239 @@ module AtCoderFriends
           .sub(/\b2\^/, '1<<')
           .gsub(',', "'")
       end
+    end
 
-      def gen_decls(inpdefs = pbm.formats)
-        inpdefs.map { |inpdef| gen_decl(inpdef) }.flatten
-      end
-
+    # generates C++ variable declarations
+    module CxxBuiltinDeclGen
+      TYPE_TBL = {
+        number: 'int',
+        decimal: 'double',
+        string: 'char',
+        char: 'char'
+      }.tap { |h| h.default = 'int' }
       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)
+        if inpdef.components
+          inpdef.components.map { |cmp| gen_decl(cmp) }
+        else
+          case inpdef.container
+          when :single
+            gen_single_decl(inpdef)
+          when :harray
+            gen_harray_decl(inpdef)
+          when :varray
+            gen_varray_decl(inpdef)
+          when :matrix, :vmatrix, :hmatrix
+            gen_matrix_decl(inpdef)
+          end
         end
       end
 
       def gen_single_decl(inpdef)
-        names = inpdef.names
-        case inpdef.item
-        when :number
+        names, cols = inpdef.vars.transpose
+        if cols.uniq.size == 1 && cols[0] != :string
+          type = TYPE_TBL[cols[0]]
           dcl = names.join(', ')
-          "int #{dcl};"
-        when :string
-          names.map { |v| "char #{v}[#{v.upcase}_MAX + 1];" }
+          "#{type} #{dcl};"
+        else
+          inpdef.vars.map do |v, item|
+            type = TYPE_TBL[item]
+            dcl = v
+            dcl += "[#{v.upcase}_MAX + 1]" if item == :string
+            "#{type} #{dcl};"
+          end
         end
       end
 
       def gen_harray_decl(inpdef)
+        type = TYPE_TBL[inpdef.item]
         v = inpdef.names[0]
         sz = gen_arr_size(inpdef.size)[0]
         case inpdef.item
-        when :number
-          "int #{v}[#{sz}];"
+        when :number, :decimal
+          "#{type} #{v}[#{sz}];"
         when :string
-          "char #{v}[#{sz}][#{v.upcase}_MAX + 1];"
+          "#{type} #{v}[#{sz}][#{v.upcase}_MAX + 1];"
         when :char
-          "char #{v}[#{sz} + 1];"
+          "#{type} #{v}[#{sz} + 1];"
         end
       end
 
       def gen_varray_decl(inpdef)
-        names = inpdef.names
         sz = gen_arr_size(inpdef.size)[0]
-        case inpdef.item
-        when :number
-          names.map { |v| "int #{v}[#{sz}];" }
-        when :string
-          names.map { |v| "char #{v}[#{sz}][#{v.upcase}_MAX + 1];" }
+        inpdef.vars.map do |v, item|
+          type = TYPE_TBL[item]
+          dcl = "#{v}[#{sz}]"
+          dcl += "[#{v.upcase}_MAX + 1]" if item == :string
+          "#{type} #{dcl};"
         end
       end
 
       def gen_matrix_decl(inpdef)
-        v = inpdef.names[0]
         sz1, sz2 = gen_arr_size(inpdef.size)
-        case inpdef.item
-        when :number
-          "int #{v}[#{sz1}][#{sz2}];"
-        when :string
-          "char #{v}[#{sz1}][#{sz2}][#{v.upcase}_MAX + 1];"
-        when :char
-          "char #{v}[#{sz1}][#{sz2} + 1];"
+        inpdef.vars.map do |v, item|
+          type = TYPE_TBL[item]
+          dcl = "#{v}[#{sz1}]"
+          dcl += item == :char ? "[#{sz2} + 1]" : "[#{sz2}]"
+          dcl += "[#{v.upcase}_MAX + 1]" if item == :string
+          "#{type} #{dcl};"
         end
       end
 
       def gen_arr_size(szs)
         szs.map { |sz| sz.gsub(/([a-z][a-z0-9_]*)/i, '\1_MAX').upcase }
       end
+    end
 
-      def gen_inputs(inpdefs = pbm.formats)
-        inpdefs.map { |inpdef| gen_input(inpdef) }.flatten
-      end
+    # generates C++ input source
+    module CxxBuiltinInputGen
+      SCANF_FMTS = [
+        'scanf("%<fmt>s", %<addr>s);',
+        'REP(i, %<sz1>s) scanf("%<fmt>s", %<addr>s);',
+        'REP(i, %<sz1>s) REP(j, %<sz2>s) scanf("%<fmt>s", %<addr>s);'
+      ].freeze
+      SCANF_FMTS_CMB = {
+        varray_matrix:
+          [
+            <<~TEXT,
+              REP(i, %<sz1>s) {
+                scanf("%<fmt1>s", %<addr1>s);
+                scanf("%<fmt2>s", %<addr2>s);
+              }
+            TEXT
+            <<~TEXT
+              REP(i, %<sz1>s) {
+                scanf("%<fmt1>s", %<addr1>s);
+                REP(j, %<sz2>s[i]) scanf("%<fmt2>s", %<addr2>s);
+              }
+            TEXT
+          ],
+        matrix_varray:
+          [
+            <<~TEXT,
+              REP(i, %<sz1>s) {
+                scanf("%<fmt1>s", %<addr1>s);
+                scanf("%<fmt2>s", %<addr2>s);
+              }
+            TEXT
+            <<~TEXT
+              REP(i, %<sz1>s) {
+                REP(j, %<sz2>s) scanf("%<fmt1>s", %<addr1>s);
+                scanf("%<fmt2>s", %<addr2>s);
+              }
+            TEXT
+          ]
+      }.tap { |h| h.default = h[:varray_matrix] }
+      FMT_FMTS = {
+        number: '%d',
+        decimal: '%lf',
+        string: '%s',
+        char: '%s'
+      }.tap { |h| h.default = h[:number] }
+      SINGLE_ADDR_FMTS = {
+        number: '&%<v>s',
+        decimal: '&%<v>s',
+        string: '%<v>s'
+      }.tap { |h| h.default = h[:number] }
+      ARRAY_ADDR_FMTS = {
+        number: '%<v>s + i',
+        decimal: '%<v>s + i',
+        string: '%<v>s[i]',
+        char: '%<v>s'
+      }.tap { |h| h.default = h[:number] }
+      MATRIX_ADDR_FMTS = {
+        number: '&%<v>s[i][j]',
+        decimal: '&%<v>s[i][j]',
+        string: '%<v>s[i][j]',
+        char: '%<v>s[i]'
+      }.tap { |h| h.default = h[:number] }
+      ADDR_FMTS = {
+        single: SINGLE_ADDR_FMTS,
+        harray: ARRAY_ADDR_FMTS,
+        varray: ARRAY_ADDR_FMTS,
+        matrix: MATRIX_ADDR_FMTS,
+        vmatrix: MATRIX_ADDR_FMTS,
+        hmatrix: MATRIX_ADDR_FMTS
+      }.tap { |h| h.default = h[:single] }
 
-      # rubocop:disable Metrics/AbcSize
       def gen_input(inpdef)
-        dim = inpdef.size.size - (inpdef.item == :char ? 1 : 0)
-        scanf = SCANF_FMTS[dim]
+        if inpdef.components
+          gen_cmb_input(inpdef)
+        else
+          gen_plain_input(inpdef)
+        end
+      end
+
+      def gen_plain_input(inpdef)
+        scanf = SCANF_FMTS[inpdef.size.size - (inpdef.item == :char ? 1 : 0)]
         sz1, sz2 = inpdef.size
-        fmt = FMT_FMTS[inpdef.item] * inpdef.names.size
-        addr_fmt = ADDR_FMTS[inpdef.container][inpdef.item]
-        addr = inpdef.names.map { |v| format(addr_fmt, v: v) }.join(', ')
+        fmt, addr = scanf_params(inpdef)
         format(scanf, sz1: sz1, sz2: sz2, fmt: fmt, addr: addr)
       end
-      # rubocop:enable Metrics/AbcSize
 
-      def gen_output(vs = pbm.options.binary_values)
-        if vs
-          format(BINARY_OUTPUT_FMT, *vs)
-        else
-          DEFAULT_OUTPUT
-        end
+      def gen_cmb_input(inpdef)
+        scanf = SCANF_FMTS_CMB.dig(
+          inpdef.container, inpdef.item == :char ? 0 : 1
+        )
+        sz1 = inpdef.size[0]
+        sz2 = inpdef.size[1].split('_')[0]
+        fmt1, addr1, fmt2, addr2 =
+          inpdef.components.map { |cmp| scanf_params(cmp) }.flatten
+        format(
+          scanf,
+          sz1: sz1, sz2: sz2,
+          fmt1: fmt1, addr1: addr1,
+          fmt2: fmt2, addr2: addr2
+        ).split("\n")
+      end
+
+      def scanf_params(inpdef)
+        [scanf_fmt(inpdef), scanf_addr(inpdef)]
+      end
+
+      def scanf_fmt(inpdef)
+        inpdef.vars.map { |(_v, item)| FMT_FMTS[item] }.join
+      end
+
+      def scanf_addr(inpdef)
+        inpdef.vars.map do |(v, item)|
+          addr_fmt = ADDR_FMTS.dig(inpdef.container, item)
+          format(addr_fmt, v: v)
+        end.join(', ')
+      end
+    end
+
+    # generates C++ source from problem description
+    class CxxBuiltin < Base
+      include CxxBuiltinConstGen
+      include CxxBuiltinDeclGen
+      include CxxBuiltinInputGen
+
+      ACF_HOME = File.realpath(File.join(__dir__, '..', '..', '..'))
+      TMPL_DIR = File.join(ACF_HOME, 'templates')
+      DEFAULT_TMPL = File.join(TMPL_DIR, 'cxx_builtin.cxx.erb')
+      ATTRS = Attributes.new(:cxx, DEFAULT_TMPL)
+
+      def attrs
+        ATTRS
+      end
+
+      def render(src)
+        src = embed_lines(src, '/*** CONSTS ***/', gen_consts)
+        src = embed_lines(src, '/*** DCLS ***/', gen_decls)
+        src = embed_lines(src, '/*** INPUTS ***/', gen_inputs)
+        src
+      end
+
+      def gen_consts(constants = pbm.constants)
+        constants.map { |c| gen_const(c) }
+      end
+
+      def gen_decls(inpdefs = pbm.formats)
+        inpdefs.map { |inpdef| gen_decl(inpdef) }.flatten
+      end
+
+      def gen_inputs(inpdefs = pbm.formats)
+        inpdefs.map { |inpdef| gen_input(inpdef) }.flatten
       end
     end
   end

data/lib/at_coder_friends/generator/main.rb

@@ -14,8 +14,13 @@ module AtCoderFriends
       def process(pbm)
         generators = ctx.config.dig('generators') || []
         generators.each do |gen_name|
-          gen_obj = load_obj(gen_name)
-          gen_obj.process(pbm)
+          begin
+            gen_obj = load_obj(gen_name)
+            gen_obj.process(pbm)
+          rescue StandardError => e
+            puts "an error occurred in generator:#{gen_name}."
+            p e
+          end
         end
       end