mulang-ruby 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce25f9ddfa919462478020c4996eb79df700ffe92846a351823c330d7e011ed
-  data.tar.gz: 13a07d738b7ff03172b3c52cc2d2c5596fd8e14afac84fc920a6185acd9773ec
+  metadata.gz: cc516897bffe4f75c21f68fda78e0c2490b106a99835f90d6183cca18fd4ac49
+  data.tar.gz: e5ef308fbdc39a5773a8b2e47197c4fb6d87ad3e34c203d683ea59b00a0358ad
 SHA512:
-  metadata.gz: 93ecfa1b6813275b19b0a598725a14df5269c7f5728ac0e77eb665c4fca702ae148f67311bc8c502648bd2f04d3cfad456f09377d98ff0d1e95d87ca7ffc8aa6
-  data.tar.gz: 770b47bd8c440644c8ee7e54b6d8ccaec6dd6ccee562c238cee09e8992061bfb5d6cf99b97e92abb72dc9bd2ba1d5366050487e9c3c10270ef77fe52ce1b2096
+  metadata.gz: 25d18f36683e53a5b1d0211433a9725021d70a25afe5a6d8a5d63c90d56db085ee4fcc2399f632ded1e3e48623f1b310b8ef4784436ca1fbdb9ee11d5a524bd2
+  data.tar.gz: 485d1e6ea0118c89baaa34658d2e5e0e2fa7e7421439204cdfe2e91d9393585189eb14acde547646fd6fd98684bd464f24002c67c05a9655c4a0545aa1d7f0aa

data/.gitignore

@@ -11,4 +11,6 @@
 # rspec failure tracking
 .rspec_status
 
+.idea
+
 bin/mulang

data/lib/mulang/ruby/ast_processor.rb

@@ -26,6 +26,54 @@ module Mulang::Ruby
       sequence(*process_all(node))
     end
 
+    def on_rescue(node)
+      try, *catch, _ = *node
+      ms :Try, process(try), process_all(catch), ms(:MuNull)
+    end
+
+    def on_resbody(node)
+      patterns, variable, block = *node
+
+      [to_mulang_pattern(patterns, variable), process(block) || ms(:MuNull)]
+    end
+
+    def _
+      Object.new.tap { |it| it.define_singleton_method(:==) { |_| true } }
+    end
+
+    def to_mulang_pattern(patterns, variable)
+      case [patterns, variable]
+        when [nil, nil]
+          ms :WildcardPattern
+        when [nil, _]
+          ms :VariablePattern, variable.to_a.first
+        when [_, nil]
+          to_single_pattern patterns
+        else
+          ms(:AsPattern, variable.to_a.first, to_single_pattern(patterns))
+      end
+    end
+
+    def to_single_pattern(patterns)
+      mu_patterns = patterns.to_a.map { |it| to_type_pattern it }
+      mu_patterns.size == 1 ? mu_patterns.first : ms(:UnionPattern, mu_patterns)
+    end
+
+    def to_type_pattern(node)
+      _, type = *node
+      ms :TypePattern, type
+    end
+
+    def on_kwbegin(node)
+      process node.to_a.first
+    end
+
+    def on_ensure(node)
+      catch, finally = *node
+      try, catches = on_rescue(catch)[:contents]
+      ms :Try, try, catches, process(finally)
+    end
+
     def on_irange(node)
       ms :Other
     end
@@ -72,9 +120,9 @@ module Mulang::Ruby
 
       case id
       when :equal?, :eql?, :==
-        method :EqualMethod, process_all(args), process(body)
+        mu_method :EqualMethod, process_all(args), process(body)
       when :hash
-        method :HashMethod, process_all(args), process(body)
+        mu_method :HashMethod, process_all(args), process(body)
       else
         simple_method id, process_all(args), process(body)
       end

data/lib/mulang/ruby/sexp.rb

@@ -32,7 +32,7 @@ module Mulang::Ruby
       }
     end
 
-    def method(tag, args, body)
+    def mu_method(tag, args, body)
       {
         tag: tag,
         contents: [

data/lib/mulang/ruby/version.rb

@@ -1,5 +1,5 @@
 module Mulang
   module Ruby
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/mulang-ruby.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "parser"
   spec.add_dependency "ast"
   spec.add_dependency "mumukit-core", "~> 1.0"
-  spec.add_dependency "mulang", "~> 3.4"
+  spec.add_dependency "mulang", "~> 3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org