mulang-ruby 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e7fe6b5d76688d1c0b24e65ff3a8ab6917ba2559
-  data.tar.gz: 810c8beadea0e4bfb37ccfd1d3d7791cf899397a
+SHA256:
+  metadata.gz: 7b7e1b03608d32ac99ba99a84ecb6c00a6db128491f7705616a5783cf1bffc22
+  data.tar.gz: c91a2299b7cdf95dcb2f834041dc5e39a0fcb229cbc044b05eeb5ad758573be0
 SHA512:
-  metadata.gz: bd615f842c21206138c8de5206edf8f5b1afb55012846b7eadaf4f5ff6e0ee2f2d186034cfc4ee3e0f14f06b2bbdac0ec6fbe97348043600fe23916ad4dcdf94
-  data.tar.gz: 6e79690be2c543c49807fff3575fae6b34a67ebe5a4f9b3d116e8d91231a1983e2a4340f37165a5b7865ab98e2c1d139b45d8ddf120498713ff39738e79efa7f
+  metadata.gz: a00c85cfcdcda31efcc10474c4b5f29e6390131470c7ae2ea7ee841f8cd0ab23b817dc02e40aa26dfc2bc3e821d2395b785db5469e781a2fce0b77f363c13c6e
+  data.tar.gz: df34437984268e50839c197585716353b7d52cbc9a0577fc433a432e8156f65691a204e96e8b85366f693f82d49d02c95ff3c9fb1b655fd1380fc2675c91655a

data/.travis.yml

@@ -8,10 +8,6 @@ before_install:
 - export PATH=$HOME/.local/bin:$PATH
 # Install bundler
 - gem install bundler -v 1.14.6
-# Install mulang
-- wget https://github.com/mumuki/mulang/releases/download/v3.1.1/mulang
-- mv mulang ~/.local/bin/mulang
-- chmod +x ~/.local/bin/mulang
 deploy:
   provider: rubygems
   api_key:

data/lib/mulang/ruby.rb

@@ -9,6 +9,10 @@ module Mulang
     def self.parse(ruby_code)
       Mulang::Ruby::AstProcessor.new.process Mulang::Ruby::SexpParser.parser(ruby_code)
     end
+
+    def self.language
+      Mumukit::Language::External.new { |it| parse(it) }
+    end
   end
 end
 

data/lib/mulang/ruby/ast_processor.rb

@@ -23,13 +23,42 @@ module Mulang::Ruby
     end
 
     def on_begin(node)
-      {tag: :Sequence, contents: process_all(node)}
+      sequence(*process_all(node))
     end
 
     def on_irange(node)
       ms :Other
     end
 
+    def on_regexp(node)
+      value, _ops = *node
+
+      simple_send ms(:Reference, :Regexp), :new, [process(value)]
+    end
+
+    def on_dstr(node)
+      parts = *node
+
+      simple_send ms(:MuList, process_all(parts)), :join, []
+    end
+
+    def on_or(node)
+      value, other = *node
+      simple_send process(value), '||', [process(other)]
+    end
+
+    def on_and(node)
+      value, other = *node
+
+      simple_send process(value), '&&', [process(other)]
+    end
+
+    def on_return(node)
+      value = *node
+
+      ms(:Return, process(value.first))
+    end
+
     def on_defs(node)
       _target, id, args, body = *node
       body ||= s(:nil)
@@ -75,6 +104,11 @@ module Mulang::Ruby
       ms :MuString, value
     end
 
+    def on_sym(node)
+      value, _ = *node
+      ms :MuSymbol, value.to_s
+    end
+
     def on_float(node)
       value, _ = *node
       ms :MuNumber, value
@@ -100,6 +134,9 @@ module Mulang::Ruby
       ms :Assignment, id, process(value)
     end
 
+    alias on_ivar on_lvar
+    alias on_ivasgn on_lvasgn
+
     def on_const(node)
       _ns, value = *node
       ms :Reference, value

data/lib/mulang/ruby/sexp.rb

@@ -1,5 +1,15 @@
 module Mulang::Ruby
   module Sexp
+    def sequence(*contents)
+      if contents.empty?
+        ms(:MuNull)
+      elsif contents.size == 1
+        contents[0]
+      else
+        ms(:Sequence, *contents)
+      end
+    end
+
     def ms(tag, *contents)
       if contents.empty?
         {tag: tag}

data/lib/mulang/ruby/version.rb

@@ -1,5 +1,5 @@
 module Mulang
   module Ruby
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/mulang-ruby.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,30 @@ dependencies:
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mulang
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Ruby integration for the Mulang Language Analyzer