mulang-ruby 4.0.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33cc9575fa24b31d336ce8101fc680c7f1f86b2796f80ef769833189b331fa27
-  data.tar.gz: ace4b0be67c260bc1205fcf4e95be821eb270ac5f28b4fea6b9dea22bf74e3ad
+  metadata.gz: 534bc3c5a44381a2ba606c51162b1ccc664a20cdfe20470e3cd1c328fd43285b
+  data.tar.gz: abddef43c33abb13f13ae185ba94e310d384e0257fb7a62a1192b18e8b0bd6b9
 SHA512:
-  metadata.gz: e5ee8d009b6670930b98e260cb9455e80561483515f06ed9c02f837186ed4a9ae89ff82639e02f187bcbae8e6b17791cb19495565a74b4b2f7432edcdeafcf2b
-  data.tar.gz: 5072f9a4f05803bcf5385674859350c133873c6269845e663c75b2db569328fcebe3b85cb581900a72ae2f2a9bf5df4c8c4a2947a11b33ef69f59e4306629f4b
+  metadata.gz: 523da2d9961e079ddc1061988dfee999ae73f753ac386588066f8942676eb01e66725af10777da41a31f5ecc2037841e5574a7c11ceb2387bec245a99ee40973
+  data.tar.gz: 6eba9d4083da3c9e63932c491c7b90d4b8b95ebe7e50fbb7c9bd99206e7ee56d41c938920ece70cdefc0baa72d6413f882991332e4efd0c5fe6485fa7e1331f8

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

@@ -1,17 +1,23 @@
 require 'ast'
-require 'parser/ruby23'
 require 'mumukit/core'
-
+require 'parser/ruby26'
 require_relative "./ruby/version"
 
 module Mulang
   module Ruby
-    def self.parse(ruby_code)
-      Mulang::Ruby::AstProcessor.new.process Mulang::Ruby::SexpParser.parser(ruby_code)
+    def self.parse(ruby_code, parser_class: nil)
+      parser_class ||= default_parser_class
+      Mulang::Ruby::AstProcessor.new.process Mulang::Ruby::SexpParser.parser(ruby_code, parser_class)
+    end
+
+    def self.language(parser_class: nil)
+      Mulang::Language::External.new("Ruby") { |it| parse(it, parser_class: parser_class) }
     end
 
-    def self.language
-      Mulang::Language::External.new { |it| parse(it) }
+    private
+
+    def self.default_parser_class
+      Parser::Ruby26
     end
   end
 end

data/lib/mulang/ruby/ast_processor.rb

@@ -3,9 +3,12 @@ module Mulang::Ruby
     include AST::Sexp
     include Mulang::Ruby::Sexp
 
+    def process(node)
+      node.nil? ? none : super
+    end
+
     def on_class(node)
       name, superclass, body = *node
-      body ||= s(:nil)
 
       _, class_name = *name
       _, superclass_name = *superclass
@@ -15,7 +18,6 @@ module Mulang::Ruby
 
     def on_module(node)
       name, body = *node
-      body ||= s(:nil)
 
       _, module_name = *name
 
@@ -23,18 +25,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 _
@@ -109,20 +115,18 @@ module Mulang::Ruby
 
     def on_defs(node)
       _target, id, args, body = *node
-      body ||= s(:nil)
 
       simple_method id, process_all(args), process(body)
     end
 
     def on_def(node)
       id, args, body = *node
-      body ||= s(:nil)
 
       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) || ms(:MuNil))
+      lambda = ms(:Lambda, process_all(parameters), process(body) || none)
       handle_send_with_args send, [lambda]
     end
 
@@ -139,7 +143,7 @@ module Mulang::Ruby
     end
 
     def on_nil(_)
-      ms :MuNil
+      mnil
     end
 
     def on_self(_)
@@ -148,14 +152,18 @@ 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) || ms(:MuNil))
+      ms(:For, [ms(:Generator, pattern, process(list))], process(block) || none)
     end
 
     def on_optarg(node)
@@ -184,8 +192,6 @@ module Mulang::Ruby
 
     def on_if(node)
       condition, if_true, if_false = *node
-      if_true  ||= s(:nil)
-      if_false ||= s(:nil)
 
       ms :If, process(condition), process(if_true), process(if_false)
     end
@@ -217,7 +223,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)
@@ -229,9 +235,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
 
@@ -274,15 +280,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,12 @@
+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
+    include Mulang::Sexp
 
-    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
-
-    def simple_send(sender, message, args)
-      ms(:Send, sender, {tag: :Reference, contents: message}, args)
+    def mnil
+      ms(:MuNil)
     end
   end
+
 end

data/lib/mulang/ruby/sexp_parser.rb

@@ -3,9 +3,10 @@ module Mulang::Ruby
     Parser::Builders::Default.emit_lambda = true
     Parser::Builders::Default.emit_procarg0 = true
 
-    def self.parser(ruby_code)
-      parser = Parser::Ruby23.new
+    def self.parser(ruby_code, parser_class)
+      parser = parser_class.new
       parser.diagnostics.consumer = lambda {|it|}
+      parser.diagnostics.all_errors_are_fatal = true
       buffer = Parser::Source::Buffer.new('(string)')
       buffer.source = ruby_code
       parser.parse(buffer).tap do |result|

data/lib/mulang/ruby/version.rb

@@ -1,5 +1,5 @@
 module Mulang
   module Ruby
-    VERSION = "4.0.2"
+    VERSION = "6.1.0"
   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', '>= 6.0.3'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 6.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2021-02-10 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.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        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,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org
@@ -129,9 +141,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