mulang-ruby 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffbfe0515ffc42d5a7cc62ac0c219f01efed7ca0a09867e081f87db7d60e17e
-  data.tar.gz: b4b58bb43f77bf21979922180af6a1dbcd2b99b9400e6a67b41cea7d618e8428
+  metadata.gz: 310222a26a40c26d470baccbff896da1b2f1ecf871391c2a5b1fb1dbebd4ff26
+  data.tar.gz: 26396d194ccc29a39bb2982dd83c4debb4dccc95a504fe6cac80c581d5dd433d
 SHA512:
-  metadata.gz: '0259e8d0bd2b6ae8782381eb98fa3025d461b0e7f5735547575af614bad2900b187b4dca409fa78d95554300fa2500513bbfcbf448501231008915aae7eb2b62'
-  data.tar.gz: 3c3c1cf74dee097855440376b97a934e273523545a82a38ad1fc47778b3b8c4ed2e39333e39d2b51945fa748cb31b91c778d7f2d8d7d0e42a5c50c3ab5f3a877
+  metadata.gz: 67c0ecd31d721393beb7612cf56b8f31e1cfc5d51b0731ebd00b4f36026647992cb951afd3535707b9ed5ea7200bfb4cf0d632b5683f15f379d6116069d7d6dc
+  data.tar.gz: 9c4c5fea0ad0e708ca81fa8fc05b08bee69604865151458428e50fa09e99a17884d0f1366bffafeb3e2648d1202dfd7decf68a0595da9f19f03aaeaa9ad2da95

data/.github/workflows/test_and_deploy.yml

@@ -13,8 +13,8 @@ jobs:
       uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
       with:
         ruby-version: 2.6.3
-    - name: Install dependencies
-      run: bundle install
+        bundler: 2.1.4
+        bundler-cache: true
     - name: Run tests
       run: bundle exec rake
     - name: Deploy

data/lib/mulang/ruby/ast_processor.rb

@@ -3,27 +3,55 @@ module Mulang::Ruby
     include AST::Sexp
     include Mulang::Ruby::Sexp
 
+    def initialize
+      @contexts = []
+    end
+
+    def process(node)
+      node.nil? ? none : super
+    end
+
     def on_class(node)
+      @contexts.push :class
+
       name, superclass, body = *node
-      body ||= s(:nil)
 
       _, class_name = *name
       _, superclass_name = *superclass
 
       ms :Class, class_name, superclass_name, process(body)
+    ensure
+      @contexts.pop
+    end
+
+    def on_sclass(node)
+      @contexts.push :sclass
+
+      target, body = *node
+
+      ms :EigenClass, process(target), process(body)
+    ensure
+      @contexts.pop
     end
 
     def on_module(node)
+      @contexts.push :module
+
       name, body = *node
-      body ||= s(:nil)
 
       _, module_name = *name
 
       ms :Object, module_name, process(body)
+    ensure
+      @contexts.pop
     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)
@@ -108,15 +136,23 @@ module Mulang::Ruby
     end
 
     def on_defs(node)
-      _target, id, args, body = *node
-      body ||= s(:nil)
+      target, id, args, body = *node
 
-      simple_method id, process_all(args), process(body)
+      result = simple_method id, process_all(args), process(body)
+
+      if target.type == :self
+        if @contexts.last == :module
+          result
+        else
+          ms(:Decorator, [ms(:Classy)], result)
+        end
+      else
+        ms(:EigenClass, process(target), result)
+      end
     end
 
     def on_def(node)
       id, args, body = *node
-      body ||= s(:nil)
 
       case id
       when :equal?, :eql?, :==
@@ -139,7 +175,7 @@ module Mulang::Ruby
     end
 
     def on_nil(_)
-      ms :MuNil
+      mnil
     end
 
     def on_self(_)
@@ -148,7 +184,11 @@ 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)
@@ -184,8 +224,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

data/lib/mulang/ruby/sexp.rb

@@ -4,8 +4,9 @@ module Mulang::Ruby
   module Sexp
     include Mulang::Sexp
 
-    def none
+    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 = "6.0.0"
+    VERSION = '6.2.0'
   end
 end

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/mulang-ruby.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "parser", "~> 2.6"
   spec.add_dependency "ast", "~> 2.4"
   spec.add_dependency "mumukit-core", "~> 1.0"
-  spec.add_dependency "mulang", "~> 6.0"
+  spec.add_dependency "mulang", '~> 6.0', '>= 6.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -128,6 +131,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org