at_coder_friends-generator-python_ref 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f6fd099c746e4e5e4912c4cac72e839cd49985aff42f560d833f13aa8daf96
-  data.tar.gz: 5b3fb579bfc0ac86800cc20b99b75e2505015ce4d98cc0c8908ff6fe2dbcd1f3
+  metadata.gz: 2a804a55d43573bd91ea0b11c9d4df5a170109874d24a7107e72c948b839343e
+  data.tar.gz: 3ad6eeac429650c1e7770a14181009fd39acfdc1be6cc4ee47a99f2733a608dc
 SHA512:
-  metadata.gz: 0f142ec1d52f7ceacf31096cd4535f85b1b780f9ef4d4752f742e907344743219277e1f8082488f9a806ab731f34a82d7c2e2c8655a9c1df5fb40b1dd7ddbc82
-  data.tar.gz: d38828116e05577842dffbd5e28648106f1af62649b91e447d977966fda2ea09db6bb5db3114fb7383b7a3374a3629e1409e9fe13be72ba059a58b9ec6674a5e
+  metadata.gz: 7245a02695fe12bcecdd52507c40e34a8152fb8bc63eed16fe586180166b44df3a6d2a6ac7ca05d8b914cdd893995d58b2223828e20769b94e8f43453f5f6285
+  data.tar.gz: 9dffdfff8fa54abcb58f9e58d91c7e55d90b7da1893098cd7051f3bea8d09e67b8aa58f7d08ac990061dcc8694cb48c374dfaf08f126d4263b686f68adc44049

data/.github/workflows/ruby.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.7']
+        ruby-version: ['2.7', '3.0', '3.2']
 
     steps:
     - uses: actions/checkout@v2

data/.gitignore

@@ -12,3 +12,6 @@
 
 # rvm
 .ruby-version
+
+# Visual Studio Code local settings
+.vscode/

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
 
 Metrics/BlockLength:

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master (unreleased)
 
+## 0.4.0 (2023/05/12)
+### Added
+- add Ruby3.2 to target version.
+### Changed
+- externalize code fragments to YAML
+### Deleted
+- drop Ruby2.5 from target version.
+
 ## 0.3.2 (2021/12/25)
 ### Deleted
 - drop Ruby2.4 from target version.

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    at_coder_friends-generator-python_ref (0.3.2)
-      at_coder_friends (~> 0.6.8)
+    at_coder_friends-generator-python_ref (0.4.0)
+      at_coder_friends (~> 0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    at_coder_friends (0.6.8)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    at_coder_friends (0.7.0)
       colorize (~> 0.8.1)
       launchy (>= 2.4.3)
       mechanize (~> 2.0)
     colorize (0.8.1)
-    connection_pool (2.2.5)
+    connection_pool (2.4.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    mechanize (2.8.3)
+    launchy (2.5.2)
+      addressable (~> 2.8)
+    mechanize (2.9.1)
       addressable (~> 2.8)
       domain_name (~> 0.5, >= 0.5.20190701)
       http-cookie (~> 1.0, >= 1.0.3)
@@ -36,49 +36,46 @@ GEM
       webrobots (~> 0.1.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
-    mini_portile2 (2.6.1)
+    mime-types-data (3.2023.0218.1)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.14.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x64-mingw32)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
-    public_suffix (4.0.6)
-    racc (1.6.0)
+    public_suffix (5.0.1)
+    racc (1.6.2)
     rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubyntlm (0.6.3)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
-    unf_ext (0.0.8-x64-mingw32)
-    webrick (1.7.0)
+    unf_ext (0.0.8.2)
+    webrick (1.8.1)
     webrobots (0.1.2)
 
 PLATFORMS
-  ruby
-  x64-mingw32
+  arm64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   at_coder_friends-generator-python_ref!
@@ -88,4 +85,4 @@ DEPENDENCIES
   simplecov (~> 0.10)
 
 BUNDLED WITH
-   2.1.4
+   2.4.12

data/README.md

@@ -27,24 +27,26 @@ Or install it yourself as:
 
 ## Configuration
 
-Add ```PythonRef``` to ```generators``` setting in ```.at_coder_friends.yml```
+Add `PythonRef` to `generators` setting in `.at_coder_friends.yml`
 
 ## Generator Options
 
 Following options are available  
-in ```generator_settings/PythonRef``` section of ```.at_coder_friends.yml```:
+in `generator_settings/PythonRef` section of `.at_coder_friends.yml`:
 
-| Option | Description | Default |
-|---------|-------------|---------|
-|default_template|Source template file path|[/templates/python_ref.py.erb](/templates/python_ref.py.erb)|
+| Option   | Description    | Default |
+| -------- | -------------- | ------- |
+| file_ext | File extension | py      |
+| template<br>(formerly default_template) | Code template file path | [python_ref.py.erb](/templates/python_ref.py.erb) |
+| fragments | Code fragments file path | [python_ref_fragments.yml](/templates/python_ref_fragments.yml) |
 
-## ```.at_coder_friends.yml``` example for Python
+## `.at_coder_friends.yml` example for Python
   ```YAML
   generators:
     - PythonRef
   generator_settings:
     PythonRef:
-      default_template: /path/to/template
+      template: /path/to/template
   ext_settings:
     'py':
       test_cmd:

data/at_coder_friends-generator-python_ref.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.metadata = {
     'homepage_uri' => spec.homepage,
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
     'rubygems_mfa_required' => 'true'
   }
 
-  spec.add_dependency 'at_coder_friends', '~> 0.6.8'
+  spec.add_dependency 'at_coder_friends', '~> 0.7.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'

data/lib/at_coder_friends/generator/python_ref/version.rb

@@ -3,7 +3,7 @@
 module AtCoderFriends
   module Generator
     module PythonRefConstants
-      VERSION = '0.3.2'
+      VERSION = '0.4.0'
     end
   end
 end

data/lib/at_coder_friends/generator/python_ref.rb

@@ -5,183 +5,34 @@ require 'at_coder_friends/generator/python_ref/version'
 
 module AtCoderFriends
   module Generator
+    # Python variable declaration generator
+
     # generates Python source from problem description
     class PythonRef < Base
       include PythonRefConstants
+      include ConstFragmentMixin
+      include DeclFragmentMixin
 
       ACF_HOME = File.realpath(File.join(__dir__, '..', '..', '..'))
       TMPL_DIR = File.join(ACF_HOME, 'templates')
-      DEFAULT_TMPL = File.join(TMPL_DIR, 'python_ref.py.erb')
-      ATTRS = Attributes.new(:py, DEFAULT_TMPL)
+      TEMPLATE = File.join(TMPL_DIR, 'python_ref.py.erb')
+      FRAGMENTS = File.realpath(File.join(TMPL_DIR, 'python_ref_fragments.yml'))
+      ATTRS = Attributes.new(:py, TEMPLATE, FRAGMENTS)
 
       def attrs
         ATTRS
       end
 
-      def render(src)
-        src = embed_lines(src, '### CONSTS ###', gen_consts)
-        embed_lines(src, '### DCLS ###', gen_decls)
-      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} = [#{expr} for _ in range(#{sz})]"
-      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 = [None for _ in range(#{sz})]" }
-        ret << "for i in range(#{sz}):"
-        ret << "    #{dcl} = #{expr}"
-        ret
-      end
-
-      def gen_matrix_decl(inpdef)
-        v = inpdef.names[0]
-        sz = inpdef.size[0]
-        decl = "#{v}ss"
-        expr = gen_expr(inpdef, true)
-        "#{decl} = [#{expr} for _ in range(#{sz})]"
-      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} = [None for _ in range(#{sz})]" }
-        ret << "for i in range(#{sz}):"
-        ret << "    #{dcl} = #{expr}"
-        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 = [[None for _ in range(#{sz2})] for _ in range(#{sz1})]"
-        end
-        ret << "for i in range(#{sz1}):"
-        ret << "    for j in range(#{sz2}):"
-        ret << "        #{dcl} = #{expr}"
-        ret
-      end
-
-      def gen_hmatrix_decl(inpdef)
-        names = inpdef.names
-        sz = inpdef.size[0]
-        dcls = names.map { |v| "#{v}ss[i]" }
-        expr = gen_expr(inpdef, true)
-        ret = []
-        ret += names.map { |v| "#{v}ss = [None for _ in range(#{sz})]" }
-        ret << "for i in range(#{sz}):"
-        ret << "    line = #{expr}"
-        ret += dcls.map.with_index do |dcl, i|
-          "    #{dcl} = line[#{i}::#{dcls.size}]"
-        end
-        ret
-      end
-
-      def gen_expr(inpdef, split)
-        read = gen_read(inpdef.delim)
-        case inpdef.item
-        when :number
-          split ? "list(map(int, #{read}.split()))" : "int(#{read})"
-        when :decimal
-          split ? "list(map(float, #{read}.split()))" : "float(#{read})"
-        when :string
-          split ? "#{read}.split()" : read
-        when :char
-          read
-        end
-      end
-
-      def gen_cmb_expr(inpdef)
-        read = gen_read(inpdef.delim)
-        case inpdef.item
-        when :number
-          "list(map(int, #{read}.split()))"
-        when :decimal
-          "list(map(float, #{read}.split()))"
-        when :string, :char
-          "#{read}.split()"
-        end
-      end
-
-      def gen_read(delim)
-        sub = delim.chars.map { |d| ".replace('#{d}', ' ')" }.join
-        "input()#{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/templates/python_ref_fragments.yml

@@ -0,0 +1,90 @@
+constant:
+  value_print: <%= value.gsub('^', '**').gsub(',', '_') %>
+  mod: MOD = <%= value_print %>
+declaration:
+  read: input()<% delims.each do |d| %>.replace('<%= d %>', ' ')<% end %>
+  multiplicity: |
+    <%
+      case container
+      when :single, :varray
+        if vs.size > 1 && item != :char
+          %>multi<%
+        else
+          %>single<%
+        end
+      when :harray, :matrix
+        if item != :char
+          %>multi<%
+        else
+          %>single<%
+        end
+      else
+        %>multi<%
+      end
+    -%>
+  input:
+    __key: [item, multiplicity]
+    number:
+      single: int(<%= read %>)
+      multi: list(map(int, <%= read %>.split()))
+    decimal:
+      single: float(<%= read %>)
+      multi: list(map(float, <%= read %>.split()))
+    string:
+      single: <%= read %>
+      multi: <%= read %>.split()
+    char:
+      single: <%= read %>
+      multi: <%= read %>.split()
+  decl_type: |
+    <%
+      case container
+      when :varray
+        if vs.size > 1 %>varray_n<% else %>varray_1<% end
+      else
+        %><%= container.to_s %><%
+      end
+    -%>
+  splat: <% unless item == :char %>*<% end %>
+  main:
+    __key: [decl_type]
+    single: <%= vs.join(', ') %> = <%= input %>
+    harray: <%= v %>s = <%= input %>
+    varray_1: <%= v %>s = [<%= input %> for _ in range(<%= sz %>)]
+    varray_n: |
+      <% vs.each do |v| -%>
+      <%= v %>s = [None for _ in range(<%= sz %>)]
+      <% end -%>
+      for i in range(<%= sz %>):
+          <%= vs.map { |v| "#{v}s[i]" }.join(', ') %> = <%= input %>
+    matrix: <%= v %>ss = [<%= input %> for _ in range(<%= sz %>)]
+    varray_matrix: |
+      <% vs[0..-2].each do |v| -%>
+      <%= v %>s = [None for _ in range(<%= sz %>)]
+      <% end -%>
+      <%= vs[-1] %>ss = [None for _ in range(<%= sz %>)]
+      for i in range(<%= sz %>):
+          <%= vs[0..-2].map { |v| "#{v}s[i]" }.join(', ') %>, <%= splat %><%= vs[-1] %>ss[i] = <%= input %>
+    matrix_varray: |
+      <%= vs[0] %>ss = [None for _ in range(<%= sz %>)]
+      <% vs[1..].each do |v| -%>
+      <%= v %>s = [None for _ in range(<%= sz %>)]
+      <% end -%>
+      for i in range(<%= sz %>):
+          <%= splat %><%= vs[0] %>ss[i], <%= vs[1..].map { |v| "#{v}s[i]" }.join(', ') %> = <%= input %>
+    vmatrix: |
+      <% vs.each do |v| -%>
+      <%= v %>ss = [[None for _ in range(<%= sz2 %>)] for _ in range(<%= sz1 %>)]
+      <% end -%>
+      for i in range(<%= sz1 %>):
+          for j in range(<%= sz2 %>):
+              <%= vs.map { |v| "#{v}ss[i][j]" }.join(', ') %> = <%= input %>
+    hmatrix: |
+      <% vs.each do |v| -%>
+      <%= v %>ss = [None for _ in range(<%= sz %>)]
+      <% end -%>
+      for i in range(<%= sz %>):
+          line = <%= input %>
+      <% vs.each_with_index do |v, k| -%>
+          <%= v %>ss[i] = line[<%= k %>::<%= vs.size %>]
+      <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: at_coder_friends-generator-python_ref
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: at_coder_friends
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -108,6 +107,7 @@ files:
 - lib/at_coder_friends/generator/python_ref.rb
 - lib/at_coder_friends/generator/python_ref/version.rb
 - templates/python_ref.py.erb
+- templates/python_ref_fragments.yml
 homepage: https://github.com/nejiko96/at_coder_friends-generator-python_ref
 licenses:
 - MIT
@@ -124,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: Python generator for AtCoderFriends

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.4
-before_install: gem install bundler -v 2.0.2