mulang-ruby 4.0.1 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84be5f642367b764ef958bc4a3c511490bc47eb9898a1acc0d78c8cdeb2a151
-  data.tar.gz: b0c259b85d202208265819dfe756c645e7b1009b4906358ec7c2cfe70c8e05ac
+  metadata.gz: f4c6d1ce223e3d229c5e4c7f3483fcd81e87548515c7edd2689859d257594078
+  data.tar.gz: 1771c2958eff5b7a1afb06adee2cf1ec005fc20c42ee91841bce8a566f773dc1
 SHA512:
-  metadata.gz: d8c10787e5920e6fc6b527f5d2d537ba459a94572b57fa33a9eef67609063358ad0b3f46227e3e3dab5192e09c5ae30dd504f51e19d6327d05e7a494d664966b
-  data.tar.gz: 6ea969e66b862dfd0c0bacc511b1f5c11a546c9e02e43997fb748652006f49080a1a2de02948ddac89e4d2b79bb5f72cbd09b14a0fbbcab5f342fb07897a42ab
+  metadata.gz: e742ffb822e379a604761d329027bca396baf1176d9ad65cb898df3a875f424a97fb2c3a044de64316c95375238ac20cdd03823787fd5a789e8075fc34a17b54
+  data.tar.gz: b5a91310d27d1eba544437b54aaef7e6f9218b49c96e522c70e5e74d18880c56029d04fbfd8e78db250bbc281108a599c8b5e9068df7b73586a8f897d48ce998

data/.github/workflows/test_and_deploy.yml

@@ -0,0 +1,31 @@
+name: Test and deploy
+
+on:
+- push
+- workflow_dispatch
+
+jobs:
+  test_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      with:
+        ruby-version: 2.6.3
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake
+    - name: Deploy
+      if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
+

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/lib/mulang/ruby.rb

@@ -11,7 +11,7 @@ module Mulang
     end
 
     def self.language
-      Mumukit::Language::External.new { |it| parse(it) }
+      Mulang::Language::External.new("Ruby") { |it| parse(it) }
     end
   end
 end

data/lib/mulang/ruby/ast_processor.rb

@@ -23,18 +23,22 @@ module Mulang::Ruby
     end
 
     def on_begin(node)
-      sequence(*process_all(node))
+      if node.children.size == 1 && node.children[0].nil?
+        none # ruby < 2.6 only
+      else
+        sequence(*process_all(node))
+      end
     end
 
     def on_rescue(node)
       try, *catch, _ = *node
-      ms :Try, process(try), process_all(catch), ms(:MuNil)
+      ms :Try, process(try), process_all(catch), none
     end
 
     def on_resbody(node)
       patterns, variable, block = *node
 
-      [to_mulang_pattern(patterns, variable), process(block) || ms(:MuNil)]
+      [to_mulang_pattern(patterns, variable), process(block) || none]
     end
 
     def _
@@ -120,9 +124,9 @@ module Mulang::Ruby
 
       case id
       when :equal?, :eql?, :==
-        mu_method :EqualMethod, process_all(args), process(body)
+        primitive_method :Equal, process_all(args), process(body)
       when :hash
-        mu_method :HashMethod, process_all(args), process(body)
+        primitive_method :Hash, process_all(args), process(body)
       else
         simple_method id, process_all(args), process(body)
       end
@@ -130,7 +134,7 @@ module Mulang::Ruby
 
     def on_block(node)
       send, parameters, body = *node
-      lambda = ms(:Lambda, process_all(parameters), process(body))
+      lambda = ms(:Lambda, process_all(parameters), process(body) || none)
       handle_send_with_args send, [lambda]
     end
 
@@ -148,7 +152,22 @@ module Mulang::Ruby
 
     def on_arg(node)
       name, _ = *node
-      ms :VariablePattern, name
+      if name.is_a? Parser::AST::Node
+        process name
+      else
+        ms :VariablePattern, name
+      end
+    end
+
+    def on_for(node)
+      variable, list, block = *node
+
+      pattern = ms(:VariablePattern, variable.children.first)
+      ms(:For, [ms(:Generator, pattern, process(list))], process(block) || none)
+    end
+
+    def on_optarg(node)
+      ms :OtherPattern, node.to_s, nil
     end
 
     alias on_restarg on_arg
@@ -206,7 +225,7 @@ module Mulang::Ruby
 
     def var_assignment(assignee, message, value)
       id = assignee.to_a.first
-      ms :Assignment, id, simple_send(ms(:Reference, id), message, [process(value)])
+      ms :Assignment, id, ms(:Send, ms(:Reference, id), message_reference(message), [process(value)])
     end
 
     def property_assignment(assignee, message, value)
@@ -218,9 +237,9 @@ module Mulang::Ruby
     def reasign(accessor, args, id, message, value)
       simple_send id,
                   "#{accessor}=".to_sym,
-                  args + [simple_send(
+                  args + [ms(:Send,
                             simple_send(id, accessor, args),
-                            message,
+                            message_reference(message),
                             [value])]
     end
 
@@ -256,7 +275,6 @@ module Mulang::Ruby
     end
 
     def handler_missing(*args)
-      puts args
       ms :Other, args.to_s, nil
     end
 
@@ -264,15 +282,29 @@ module Mulang::Ruby
       receptor, message, *args = *node
       receptor ||= s(:self)
 
-      if message == :==
-        message = {tag: :Equal}
-      elsif message == :!=
-        message = {tag: :NotEqual}
-      else
-        message = {tag: :Reference, contents: message}
+      ms :Send, process(receptor), message_reference(message), (process_all(args) + extra_args)
+    end
+
+    def message_reference(message)
+      case message
+        when :==     then primitive :Equal
+        when :!=     then primitive :NotEqual
+        when :!      then primitive :Negation
+        when :'&&'   then primitive :And
+        when :'||'   then primitive :Or
+        when :hash   then primitive :Hash
+        when :>=     then primitive :GreatherOrEqualThan
+        when :>      then primitive :GreatherThan
+        when :<=     then primitive :LessOrEqualThan
+        when :<      then primitive :LessThan
+        when :+      then primitive :Plus
+        when :-      then primitive :Minus
+        when :*      then primitive :Multiply
+        when :/      then primitive :Divide
+        when :length then primitive :Size
+        when :size   then primitive :Size
+        else ms :Reference, message
       end
-
-      ms :Send, process(receptor), message, (process_all(args) + extra_args)
     end
 
   end

data/lib/mulang/ruby/sexp.rb

@@ -1,48 +1,11 @@
+require "mulang"
+
 module Mulang::Ruby
   module Sexp
-    def sequence(*contents)
-      if contents.empty?
-        ms(:MuNil)
-      elsif contents.size == 1
-        contents[0]
-      else
-        ms(:Sequence, *contents)
-      end
-    end
-
-    def ms(tag, *contents)
-      if contents.empty?
-        {tag: tag}
-      elsif contents.size == 1
-        {tag: tag, contents: contents.first}
-      else
-        {tag: tag, contents: contents}
-      end
-    end
-
-    def simple_method(name, args, body)
-      {
-        tag: :Method,
-        contents: [
-          name, 
-          [
-            [ args, {tag: :UnguardedBody, contents: body }]
-          ]
-        ]
-      }
-    end
-
-    def mu_method(tag, args, body)
-      {
-        tag: tag,
-        contents: [
-          [ args, {tag: :UnguardedBody, contents: body }]
-        ]
-      }
-    end
+    include Mulang::Sexp
 
-    def simple_send(sender, message, args)
-      ms(:Send, sender, {tag: :Reference, contents: message}, args)
+    def none
+      ms(:MuNil)
     end
   end
 end

data/lib/mulang/ruby/version.rb

@@ -1,5 +1,5 @@
 module Mulang
   module Ruby
-    VERSION = "4.0.1"
+    VERSION = "6.0.1"
   end
 end

data/mulang-ruby.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler", '>= 1.1', '< 3'
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
 
-  spec.add_dependency "parser"
-  spec.add_dependency "ast"
+  spec.add_dependency "parser", "~> 2.6"
+  spec.add_dependency "ast", "~> 2.4"
   spec.add_dependency "mumukit-core", "~> 1.0"
-  spec.add_dependency "mulang", "~> 4.0"
+  spec.add_dependency "mulang", "~> 6.0"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 6.0.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +76,30 @@ dependencies:
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org
@@ -129,9 +135,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test_and_deploy.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - COPYRIGHT.txt
 - Gemfile

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-- 2.3.1
-before_install:
-# Extend Path
-- mkdir -p ~/.local/bin
-- export PATH=$HOME/.local/bin:$PATH
-# Install bundler
-- gem install bundler -v 1.14.6
-deploy:
-  provider: rubygems
-  api_key:
-    secure: UReab6XV1hLEiB+qmV2z7urHDApuD8MLINMOXxjaU7X6jplHmTttgci+wuP3w8Q+oqAy1s97j270ofQszHogppOtxa+AZzmXvI9TPZ5XRJJXFNH4Bt5RguP/gIN2bZEmCESdbpsTC6w5gxvDAfSQTPSE0mO/MLY5xRUYja/RdmhxdrvQuzir+c9L+hzGT4ysoiJ7UXkaKEUsfi2ief9/XRflmzTytf+C0uNSjFbVo0JCB5StBJwxmaUAMH2F5LQTZPUBDu+/FFJJO3w/yyYcRrqsNxujqJozXQZAwsmR3myMxyKIOZFAGCeC22+6XKPDHDSBLnNsQzWFdCieUzgsd3jZJFYeorXY63Uv5cGa1F+S7tbLmdXHBlbSfN2e5g6AUse1HyFXqgzgVUUftgZ8Uv7Ttc+BN9R1uzxMTJ7ox1wGncc01rbfQ/KPD0W0XEwON18aiCYjM5XvVNb4F1W4e7mNk28tdrxIC6RNkScpKLg5E0td1xPRkRDo2ZO2KWRZGGrabzjr05TTTWrI1+YVx3Mm4N1RiirjC5HybdHy5JO7eLDYU/FIXlVRwjCN7LKnP42zUsic1Y5JCYNs1RzZdJlH5sQaC/boy0bi2pVbehh3BlAbdCQu/ckqla7RG0ab5Bbw01m4aNSO5PkdIksxAN6yuelKkFXrSrs3pXEr528=
-  gem: mulang-ruby
-  on:
-    tags: true
-    repo: mumuki/mulang-ruby