mulang-ruby 6.1.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 534bc3c5a44381a2ba606c51162b1ccc664a20cdfe20470e3cd1c328fd43285b
-  data.tar.gz: abddef43c33abb13f13ae185ba94e310d384e0257fb7a62a1192b18e8b0bd6b9
+  metadata.gz: 00df60c46038a6626d1e3de934030c8ab3900c7b349c02d75e8be6c4baa64938
+  data.tar.gz: c12bb657bbb5553ec708ec38fa919a2d3bad2c33828e9242c56ae37996bc3337
 SHA512:
-  metadata.gz: 523da2d9961e079ddc1061988dfee999ae73f753ac386588066f8942676eb01e66725af10777da41a31f5ecc2037841e5574a7c11ceb2387bec245a99ee40973
-  data.tar.gz: 6eba9d4083da3c9e63932c491c7b90d4b8b95ebe7e50fbb7c9bd99206e7ee56d41c938920ece70cdefc0baa72d6413f882991332e4efd0c5fe6485fa7e1331f8
+  metadata.gz: 2f9409458260fe11969bfa1d01299798ceed7ee3790dce990e6be93eafe31382b220f76112403956253b0ce241a65e266f652a1ce952e4d13f8285ae18d980d4
+  data.tar.gz: 723c85b715112318f1e5c3e3a5e4430e50bc1ab6be0793eed80c6e04a101b353c49576725706e6a68d49f7078450ff5e93e093bd996a60e7f1bcf33b4f7d189c

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,25 +3,47 @@ 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
 
       _, 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
 
       _, module_name = *name
 
       ms :Object, module_name, process(body)
+    ensure
+      @contexts.pop
     end
 
     def on_begin(node)
@@ -114,9 +136,19 @@ module Mulang::Ruby
     end
 
     def on_defs(node)
-      _target, id, args, body = *node
+      target, id, args, body = *node
+
+      result = simple_method id, process_all(args), process(body)
 
-      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)
@@ -291,8 +323,8 @@ module Mulang::Ruby
         when :'&&'   then primitive :And
         when :'||'   then primitive :Or
         when :hash   then primitive :Hash
-        when :>=     then primitive :GreatherOrEqualThan
-        when :>      then primitive :GreatherThan
+        when :>=     then primitive :GreaterOrEqualThan
+        when :>      then primitive :GreaterThan
         when :<=     then primitive :LessOrEqualThan
         when :<      then primitive :LessThan
         when :+      then primitive :Plus

data/lib/mulang/ruby/version.rb

@@ -1,5 +1,5 @@
 module Mulang
   module Ruby
-    VERSION = "6.1.0"
+    VERSION = '6.3.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', '>= 6.0.3'
+  spec.add_dependency "mulang", "~> 6.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulang-ruby
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,20 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: '6.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: '6.10'
 description: Ruby - Mulang Parser
 email:
 - franco@mumuki.org