mulang-ruby 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c6d1ce223e3d229c5e4c7f3483fcd81e87548515c7edd2689859d257594078
-  data.tar.gz: 1771c2958eff5b7a1afb06adee2cf1ec005fc20c42ee91841bce8a566f773dc1
+  metadata.gz: 534bc3c5a44381a2ba606c51162b1ccc664a20cdfe20470e3cd1c328fd43285b
+  data.tar.gz: abddef43c33abb13f13ae185ba94e310d384e0257fb7a62a1192b18e8b0bd6b9
 SHA512:
-  metadata.gz: e742ffb822e379a604761d329027bca396baf1176d9ad65cb898df3a875f424a97fb2c3a044de64316c95375238ac20cdd03823787fd5a789e8075fc34a17b54
-  data.tar.gz: b5a91310d27d1eba544437b54aaef7e6f9218b49c96e522c70e5e74d18880c56029d04fbfd8e78db250bbc281108a599c8b5e9068df7b73586a8f897d48ce998
+  metadata.gz: 523da2d9961e079ddc1061988dfee999ae73f753ac386588066f8942676eb01e66725af10777da41a31f5ecc2037841e5574a7c11ceb2387bec245a99ee40973
+  data.tar.gz: 6eba9d4083da3c9e63932c491c7b90d4b8b95ebe7e50fbb7c9bd99206e7ee56d41c938920ece70cdefc0baa72d6413f882991332e4efd0c5fe6485fa7e1331f8

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("Ruby") { |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
 
@@ -113,14 +115,12 @@ 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?, :==
@@ -143,7 +143,7 @@ module Mulang::Ruby
     end
 
     def on_nil(_)
-      ms :MuNil
+      mnil
     end
 
     def on_self(_)
@@ -192,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

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.1"
+    VERSION = "6.1.0"
   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.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-10 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