klam 0.0.1 → 0.0.2

data/Gemfile

@@ -1 +1,3 @@
+source 'https://rubygems.org'
+
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Greg Spurrier
+Copyright (c) 2014-2015 Greg Spurrier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/PROGRESS.asciidoc

@@ -91,6 +91,7 @@ Primitive Functions of Kl]:
 
 Ruby Interoperation
 ~~~~~~~~~~~~~~~~~~~
+* Invoking Kl functions from Ruby
 * Ruby \<\-> Kl converters
 ** Array \<\-> List
 
@@ -99,7 +100,6 @@ Not Yet Implemented
 
 Ruby Interoperation
 ~~~~~~~~~~~~~~~~~~~
-* Invoking Kl functions from Ruby
 * Invoking Ruby functions from Kl
 * Ruby \<\-> Kl converters
 ** Array \<\-> Absvector

data/lib/klam.rb

@@ -6,6 +6,7 @@ require 'klam/error'
 require 'klam/template'
 require 'klam/variable'
 require 'klam/variable_generator'
+require 'klam/absvector'
 require 'klam/cons'
 require 'klam/primitives'
 require 'klam/converters'

data/lib/klam/absvector.rb

@@ -0,0 +1,22 @@
+module Klam
+  class Absvector < Array
+    def [](i)
+      if i < 0 || i >= size
+        raise Klam::Error, "index out of bounds: #{i}"
+      end
+      super(i)
+    end
+
+    def []=(i, x)
+      if i < 0 || i >= size
+        raise Klam::Error, "index out of bounds: #{i}"
+      end
+      super(i, x)
+    end
+
+    def store(i, x)
+      self[i] = x
+      self
+    end
+  end
+end

data/lib/klam/compilation_stages/emit_ruby.rb

@@ -22,9 +22,10 @@ module Klam
         :<= => [2, '($1 <= $2)'],
         :>= => [2, '($1 >= $2)'],
         :"=" => [2, '($1 == $2)'],
-        :absvector => [1, '::Array.new($1)'],
-        :absvector? => [1, '$1.instance_of?(::Array)'],
+        :absvector => [1, '::Klam::Absvector.new($1)'],
+        :absvector? => [1, '$1.instance_of?(::Klam::Absvector)'],
         :"<-address" => [2, '$1[$2]'],
+        :"address->" => [3, '$1.store($2, $3)'],
         :cons => [2, '::Klam::Cons.new($1, $2)'],
         :cons? => [1, '$1.instance_of?(::Klam::Cons)'],
         :hd => [1, '$1.hd'],

data/lib/klam/primitives/vectors.rb

@@ -2,12 +2,11 @@ module Klam
   module Primitives
     module Vectors
       def absvector(n)
-        ::Array.new(n)
+        ::Klam::Absvector.new(n)
       end
 
       def absvec_store(vec, n, val)
-        vec[n] = val
-        vec
+        vec.store(n, val)
       end
       alias_method :"address->", :absvec_store
       remove_method :absvec_store
@@ -19,7 +18,7 @@ module Klam
       remove_method :absvec_read
 
       def absvector?(v)
-        v.instance_of?(::Array)
+        v.instance_of?(::Klam::Absvector)
       end
     end
   end

data/lib/klam/version.rb

@@ -1,3 +1,3 @@
 module Klam
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/unit/klam/primitives/vectors_spec.rb

@@ -6,7 +6,7 @@ describe Klam::Primitives::Vectors do
   describe '(absvector N)' do
     it 'returns an absvector of size N' do
       vec = absvector(3)
-      expect(vec).to be_kind_of Array
+      expect(vec).to be_instance_of Klam::Absvector
       expect(vec.size).to eq(3)
     end
   end
@@ -24,6 +24,18 @@ describe Klam::Primitives::Vectors do
       send(:"address->", @vec, 1, :foo)
       expect(send(:"<-address", @vec, 1)).to eq(:foo)
     end
+
+    it 'raises an error if N is negative' do
+      expect {
+        send(:"address->", @vec, -1, :foo)
+      }.to raise_error
+    end
+
+    it 'raises an error if N is >= the size of the V' do
+      expect {
+        send(:"address->", @vec, 3, :foo)
+      }.to raise_error
+    end
   end
 
   describe '(<-address V N)' do
@@ -41,6 +53,18 @@ describe Klam::Primitives::Vectors do
         send(:"<-address", @vec, 1)
       }.not_to raise_error
     end
+
+    it 'raises an error if N is negative' do
+      expect {
+        send(:"<-address", @vec, -1)
+      }.to raise_error
+    end
+
+    it 'raises an error if N is >= the size of the V' do
+      expect {
+        send(:"<-address", @vec, 3)
+      }.to raise_error
+    end
   end
 
   describe '(absvector? X)' do

metadata

@@ -1,96 +1,106 @@
 --- !ruby/object:Gem::Specification
 name: klam
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Greg Spurrier
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10.4'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '10.4'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-autotest
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.11'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.11'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.11'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.11'
-  prerelease: false
-  type: :development
-description: Klam is a Ruby implementation of Kl, the small Lisp on top of which the Shen programming language is implemented.
+description: Klam is a Ruby implementation of Kl, the small Lisp on top of which the
+  Shen programming language is implemented.
 email:
 - greg@sourcematters.org
 executables: []
@@ -107,6 +117,7 @@ files:
 - Rakefile
 - klam.gemspec
 - lib/klam.rb
+- lib/klam/absvector.rb
 - lib/klam/compilation_stages.rb
 - lib/klam/compilation_stages/convert_freezes_to_lambdas.rb
 - lib/klam/compilation_stages/convert_lexical_variables.rb
@@ -174,26 +185,27 @@ files:
 homepage: https://github.com/gregspurrier/klam
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
-specification_version: 4
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
 summary: Klam is a Ruby implementation of the Kl.
 test_files:
 - spec/functional/application_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d6bfb59d34a33d476f312e82821a8daa9c23a766
-  data.tar.gz: 1e17a5d167569095f128e551504e48ccfc5c3f84
-SHA512:
-  metadata.gz: f2adf161608625ab5b3a7c7d38cb406df8152d98a55b85fa7d77f338c543f7c21a98df1923d507b52e863a2aeb47f3672dce37b18e3c28cc6226e1664b036b97
-  data.tar.gz: 2949ef6dcb1086f138bdd8059cf8419de98eca82c2054754244050511147c6d1119bda3969397e0b436b8b1a49dde962a470d1d5f299cb1e146b7cdcba9e46cd