atomy 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9aceb9ef636c07aa78300caf235cc6e28d65d45
-  data.tar.gz: 4ec7c130b15909d5cbbe526d60a710af0e5b601f
+  metadata.gz: 068466b3dfc8c044b62bb9f9ee89d2b26fe1ae2b
+  data.tar.gz: bd823b4edeca86beb03b073e6be4dae391713678
 SHA512:
-  metadata.gz: c4a75b4f1d2077ca834d9a063f0ca915d3119ca25d67756496648cb431368973df13c9b4e29e8f5105bb01bc4dceaf6b34a6e51aeae5db6ea54340bbd2d61020
-  data.tar.gz: c820dd093b9e6d1977a82f691c7eb4ce453cad47438943a3993560ffcc2483aa7fd7d43df677287d1240e8b9a9df88870b8dcbf6c4d0a2e797ef3f3a1a6c4f67
+  metadata.gz: 93862742056c9c253d3b8e8eb1d3ba3ef795e33938469e18b55c3b2de16e9335f987040122f1c174ab07fe46d26a44a280eb4c9ff8fc181f71e6c5e9463c4d21
+  data.tar.gz: 015bab9f5314108b9c83f5a6f7f19569872b36b06b796dabf8e5f6c674e61bfda7ea5a79342986dcbf9b2c0249edf732b83b9d7db0d00f36edbc798e951657a1

data/kernel/define.ay

@@ -37,7 +37,7 @@ macro(def(~message): ~*body):
     structure proc-argument
   )
 
--- helper for adding a module to the constant scope
+-- helper for adding a module to the lexical scope
 with-module = Class new:
   def(bytecode(gen, _)):
     gen push-self

data/lib/atomy.rb

@@ -23,15 +23,15 @@ module Atomy
       if branch.receiver
         branch.receiver.target
       else
-        binding.constant_scope.for_method_definition
+        binding.lexical_scope.for_method_definition
       end
 
     method, branch = register_branch(target, name, branch)
 
     if branch.name
-      Rubinius.add_method(branch.name, branch.as_method, target, binding.constant_scope, 0, :public)
+      Rubinius.add_method(branch.name, branch.as_method, target, binding.lexical_scope, 0, :public)
     end
 
-    Rubinius.add_method(name, method.build, target, binding.constant_scope, 0, :public)
+    Rubinius.add_method(name, method.build, target, binding.lexical_scope, 0, :public)
   end
 end

data/lib/atomy/bootstrap.rb

@@ -236,7 +236,7 @@ module Atomy
           blk.push_scope
           blk.send(:module, 0)
 
-          # add Atomy::Grammar::AST to the constant scope
+          # add Atomy::Grammar::AST to the lexical scope
           blk.push_cpath_top
           blk.find_const(:Atomy)
           blk.find_const(:Grammar)

data/lib/atomy/code/send.rb

@@ -13,8 +13,10 @@ module Atomy
       end
 
       def bytecode(gen, mod)
-        if @receiver.nil? && fun = gen.state.scope.search_local(:"#{@message}:function")
-          invoke_function(gen, mod, fun)
+        flocal = gen.state.scope.search_local(:"#{@message}:function")
+
+        if @receiver.nil? && flocal
+          invoke_function(gen, mod, flocal)
         else
           invoke_method(gen, mod)
         end
@@ -22,12 +24,12 @@ module Atomy
 
       private
 
-      def invoke_function(gen, mod, fun)
-        fun.get_bytecode(gen)
+      def invoke_function(gen, mod, flocal)
+        flocal.get_bytecode(gen)
 
         gen.dup
         gen.send(:block_env, 0)
-        gen.send(:constant_scope, 0)
+        gen.send(:lexical_scope, 0)
         gen.send(:module, 0)
 
         gen.push_literal(@message)

data/lib/atomy/codeloader.rb

@@ -156,7 +156,7 @@ module Atomy
         Rubinius.attach_method(
           :__script__,
           code,
-          mod.compile_context.constant_scope,
+          mod.compile_context.lexical_scope,
           mod)
 
         res = mod.__script__

data/lib/atomy/compiler.rb

@@ -44,7 +44,7 @@ module Atomy
 
     def construct_block(code, binding)
       code = code.dup
-      code.scope = binding.constant_scope
+      code.scope = binding.lexical_scope
       code.name = binding.variables.method.name
       code.scope.script =
         Rubinius::CompiledCode::Script.new(code, code.file.to_s, true)

data/lib/atomy/method.rb

@@ -140,7 +140,7 @@ module Atomy
 
         done.set!
       end.tap do |cm|
-        cm.scope = Rubinius::ConstantScope.new(Object)
+        cm.scope = Rubinius::LexicalScope.new(Object)
       end
     end
 
@@ -293,7 +293,7 @@ module Atomy
           gen.push_literal(@name)
           gen.move_down(branch_args)
 
-          gen.push_literal(b.body.constant_scope.module)
+          gen.push_literal(b.body.lexical_scope.module)
           gen.move_down(branch_args)
 
           gen.push_self

data/lib/atomy/module.rb

@@ -22,7 +22,7 @@ module Atomy
 
       @exported_modules = []
 
-      # easy accessor for the current module via ConstantScope lookup
+      # easy accessor for the current module via LexicalScope lookup
       const_set(:Self, self)
 
       super
@@ -51,7 +51,7 @@ module Atomy
         Binding.setup(
           Rubinius::VariableScope.of_sender,
           Rubinius::CompiledCode.of_sender,
-          Rubinius::ConstantScope.of_sender,
+          Rubinius::LexicalScope.of_sender,
           self)
 
       code = Atomy::Compiler.compile(
@@ -108,9 +108,9 @@ module Atomy
     def compile_context
       return @compile_context if @compile_context
 
-      scope = Rubinius::ConstantScope.new(
+      scope = Rubinius::LexicalScope.new(
         self,
-        Rubinius::ConstantScope.new(Object))
+        Rubinius::LexicalScope.new(Object))
 
       meth = proc {}.block.compiled_code
       meth.metadata = nil

data/lib/atomy/version.rb

@@ -1,3 +1,3 @@
 module Atomy
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 end

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: atomy
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :runtime
   name: kpeg
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec-its
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: the Atomy programming language