mulang-ruby 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f051c87797239230bd7e561316a7038a84a3be2af363978456546a9bb015d5
-  data.tar.gz: 87f978d2895c52e130095932e0812bb38676cc9d5b2e475c0f111d4ebc20e85b
+  metadata.gz: beb92a73844dc910e25060e880ee2f4c7b65f99feaea4b7cf9afdeb6f5fe8b59
+  data.tar.gz: 9d7e6cee290d77b29485b8757d3c1b1c6baee08dc09ca0060a717dfca83f5b40
 SHA512:
-  metadata.gz: fd0af43454321d2feb44c0791f8b180225c688916ef2e65fbb209dae4fc736fb26a0c1a0c5432c9c0bb8306f89d9ab6a424a191e0a6fa96d518547b8dd437f34
-  data.tar.gz: 8034320d399b43fa2bfb9845f20f90415f4335b7cce1be440dace3808d10325289197c060e35ab0783b22b232c31f274ceb8a227b56bda1188e5603a0419cb17
+  metadata.gz: 37317ff94e92ca730cb14523cb0d5fd4499ec0a70cd4f89af8a66050f4662fbb300c41d0ef439cb216f5e0dd01d8a1a5fbf0a8b9cf5769a16c5bdd76d6631bf6
+  data.tar.gz: fd5a5dd350e847cbb6aa916ba2ecafe8627091ed858039383cd3c15036d3617f5131ab6b6dfee4e5c5e40506a35896cc32e19522ac6b6be3aeab480a3db7e68c

data/lib/mulang/ruby/ast_processor.rb

@@ -120,9 +120,9 @@ module Mulang::Ruby
 
       case id
       when :equal?, :eql?, :==
-        mu_method :EqualMethod, process_all(args), process(body)
+        mu_primitive_method :Equal, process_all(args), process(body)
       when :hash
-        mu_method :HashMethod, process_all(args), process(body)
+        mu_primitive_method :Hash, process_all(args), process(body)
       else
         simple_method id, process_all(args), process(body)
       end
@@ -217,7 +217,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 +229,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 +274,27 @@ 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 ms :Primitive, :Equal
+        when :!=    then ms :Primitive, :NotEqual
+        when :!     then ms :Primitive, :Negation
+        when :'&&'  then ms :Primitive, :And
+        when :'||'  then ms :Primitive, :Or
+        when :hash  then ms :Primitive, :Hash
+        when :>=    then ms :Primitive, :GreatherOrEqualThan
+        when :>     then ms :Primitive, :GreatherThan
+        when :<=    then ms :Primitive, :LessOrEqualThan
+        when :<     then ms :Primitive, :LessThan
+        when :+     then ms :Primitive, :Plus
+        when :-     then ms :Primitive, :Minus
+        when :*     then ms :Primitive, :Multiply
+        when :/     then ms :Primitive, :Divide
+        else ms :Reference, message
       end
-
-      ms :Send, process(receptor), message, (process_all(args) + extra_args)
     end
 
   end

data/lib/mulang/ruby/sexp.rb

@@ -24,7 +24,7 @@ module Mulang::Ruby
       {
         tag: :Method,
         contents: [
-          name, 
+          name,
           [
             [ args, {tag: :UnguardedBody, contents: body }]
           ]
@@ -32,17 +32,22 @@ module Mulang::Ruby
       }
     end
 
-    def mu_method(tag, args, body)
+    def mu_primitive_method(type, args, body)
       {
-        tag: tag,
+        tag: :PrimitiveMethod,
         contents: [
+          type,
           [ args, {tag: :UnguardedBody, contents: body }]
         ]
       }
     end
 
     def simple_send(sender, message, args)
-      ms(:Send, sender, {tag: :Reference, contents: message}, args)
+      ms(:Send, sender, ms(:Reference, message), args)
+    end
+
+    def primitive_send(sender, op, args)
+      ms(:Send, sender, ms(:Primitive, op), args)
     end
   end
 end

data/lib/mulang/ruby/version.rb

@@ -1,5 +1,5 @@
 module Mulang
   module Ruby
-    VERSION = "4.1.0"
+    VERSION = "5.0.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", '< 6'
+  spec.add_dependency "mulang", "~> 5.0"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-09-27 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
@@ -112,22 +118,16 @@ dependencies:
   name: mulang
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '5.0'
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org