sbyc 0.1.3 → 0.1.4

data/lib/sbyc/type_system/errors.rb

@@ -1,6 +1,8 @@
-module TypeSystem
-  class Error < StandardError; end
-  class InvalidValueLiteralError < Error; end
-  class NoSuchLiteralError < Error; end
-  class CoercionError < Error; end
-end # module TypeSystem
+module SByC
+  module TypeSystem
+    class Error < StandardError; end
+    class InvalidValueLiteralError < Error; end
+    class NoSuchLiteralError < Error; end
+    class CoercionError < Error; end
+  end # module TypeSystem
+end # module SByC

data/lib/sbyc/type_system/ruby.rb

@@ -1,135 +1,151 @@
 require 'date'
 require 'time'
-module TypeSystem
-  # 
-  # Implements a basic TypeSystem that mimics Ruby's type system.
-  #
-  module Ruby
+module SByC
+  module TypeSystem
+    # 
+    # Implements a basic TypeSystem that mimics Ruby's type system.
+    #
+    module Ruby
     
-    # Methods
-    module Methods
+      # Marker module for ruby Boolean values
+      module Boolean 
+      
+        # Returns true if value is a boolean
+        def self.===(value)
+          (value == true) or (value == false)
+        end
       
-      # Ruby classes for which value.inspect will work for returning
-      # a valid literal
-      SAFE_LITERAL_CLASSES = {}
-      [NilClass, TrueClass, FalseClass,
-       Fixnum, Bignum,
-       Float, 
-       String,
-       Symbol,
-       Class, 
-       Module,
-       Regexp].each{|c| SAFE_LITERAL_CLASSES[c] = true}
-    
-      #
-      # Returns value.class
-      #
-      # @see TypeSystem::Contract#type_of
-      #
-      def type_of(value)
-        value.class
       end
+    
+      # Methods
+      module Methods
+      
+        # Ruby classes for which value.inspect will work for returning
+        # a valid literal
+        SAFE_LITERAL_CLASSES = {}
+        [NilClass, TrueClass, FalseClass,
+         Fixnum, Bignum,
+         Float, 
+         String,
+         Symbol,
+         Class, 
+         Module,
+         Regexp].each{|c| SAFE_LITERAL_CLASSES[c] = true}
+       
+        #
+        # Returns value.class
+        #
+        # @see TypeSystem::Contract#type_of
+        #
+        def type_of(value)
+          value.class
+        end
   
-      #
-      # Converts _value_ to a ruby literal and returns it.
-      #
-      # Behavior of the algorithm when th value cannot be recognized depends
-      # on the :fallback option:
-      #   * when set to :fail, it raises a NoSuchLiteralError
-      #   * when set to :inspect, it returns <code>value.inspect</code>
-      #   * when set to :marshal it uses <code>Marshal::dump(value)</code>
-      #   * when set to :json it uses <code>JSON::generate(value)</code>
-      #
-      # @see TypeSystem::Contract#to_literal(value)
-      #
-      def to_literal(value, options = {:fallback => :fail})
-        if value.respond_to?(:to_ruby_literal)
-          value.to_ruby_literal
-        elsif value == (1.0/0)
-          return '(1.0/0)'
-        elsif value == -(1.0/0)
-          return '(-1.0/0)'
-        elsif SAFE_LITERAL_CLASSES.key?(type_of(value))
-          value.inspect
-        elsif value.kind_of?(Array)
-          "[" + value.collect{|v| to_literal(v, options)}.join(', ') + "]"
-        elsif value.kind_of?(Hash)
-          "{" + value.collect{|pair| "#{to_literal(pair[0], options)} => #{to_literal(pair[1], options)}"}.join(', ') + "}"
-        elsif value.kind_of?(Date)
-          "Date::parse(#{value.to_s.inspect})"
-        elsif value.kind_of?(Time)
-          "Time::parse(#{value.inspect.inspect})"
-        else
-          case options[:fallback]
-            when :inspect
-              value.inspect
-            when :marshal
-              "Marshal::load(#{Marshal::dump(value).inspect})"
-            when :json
-              require 'json'
-              JSON::generate(value)
-            when :fail, nil
-              raise NoSuchLiteralError, "Unable to convert #{value.inspect} to a ruby literal"
-            else
-              raise ArgumentError, "Invalid fallback option #{options[:fallback]}"
+        #
+        # Converts _value_ to a ruby literal and returns it.
+        #
+        # Behavior of the algorithm when th value cannot be recognized depends
+        # on the :fallback option:
+        #   * when set to :fail, it raises a NoSuchLiteralError
+        #   * when set to :inspect, it returns <code>value.inspect</code>
+        #   * when set to :marshal it uses <code>Marshal::dump(value)</code>
+        #   * when set to :json it uses <code>JSON::generate(value)</code>
+        #
+        # @see TypeSystem::Contract#to_literal(value)
+        #
+        def to_literal(value, options = {:fallback => :fail})
+          if value.respond_to?(:to_ruby_literal)
+            value.to_ruby_literal
+          elsif value == (1.0/0)
+            return '(1.0/0)'
+          elsif value == -(1.0/0)
+            return '(-1.0/0)'
+          elsif SAFE_LITERAL_CLASSES.key?(type_of(value))
+            value.inspect
+          elsif value.kind_of?(Array)
+            "[" + value.collect{|v| to_literal(v, options)}.join(', ') + "]"
+          elsif value.kind_of?(Hash)
+            "{" + value.collect{|pair| "#{to_literal(pair[0], options)} => #{to_literal(pair[1], options)}"}.join(', ') + "}"
+          elsif value.kind_of?(Date)
+            "Date::parse(#{value.to_s.inspect})"
+          elsif value.kind_of?(Time)
+            "Time::parse(#{value.inspect.inspect})"
+          else
+            case options[:fallback]
+              when :inspect
+                value.inspect
+              when :marshal
+                "Marshal::load(#{Marshal::dump(value).inspect})"
+              when :json
+                require 'json'
+                JSON::generate(value)
+              when :fail, nil
+                raise NoSuchLiteralError, "Unable to convert #{value.inspect} to a ruby literal"
+              else
+                raise ArgumentError, "Invalid fallback option #{options[:fallback]}"
+            end
           end
         end
-      end
     
-      #
-      # Returns result of Kernel.eval(str)
-      #
-      # @see TypeSystem::Contract#parse_literal(str)
-      #
-      def parse_literal(str)
-        Kernel.eval(str)
-      rescue Exception => ex
-        raise TypeSystem::InvalidValueLiteralError, "Invalid ruby value literal #{str.inspect}", ex.backtrace
-      end
+        #
+        # Returns result of Kernel.eval(str)
+        #
+        # @see TypeSystem::Contract#parse_literal(str)
+        #
+        def parse_literal(str)
+          Kernel.eval(str)
+        rescue Exception => ex
+          raise TypeSystem::InvalidValueLiteralError, "Invalid ruby value literal #{str.inspect}", ex.backtrace
+        end
 
-      #
-      # Coerces a string to a given class.
-      #
-      # @see TypeSystem::Contract#coerce(str)
-      #
-      def coerce(str, clazz)
-        if clazz == NilClass
-          return nil if str.empty? or str == "nil"
-        elsif clazz == TrueClass
-          return true if str == "true"
-        elsif clazz == FalseClass
-          return false if str == "false"
-        elsif [Fixnum, Bignum, Integer].include?(clazz)
-          if str =~ /^[-+]?[0-9]+$/
-            i = str.to_i
-            return i if i.kind_of?(clazz)
+        #
+        # Coerces a string to a given class.
+        #
+        # @see TypeSystem::Contract#coerce(str)
+        #
+        def coerce(str, clazz)
+          return str if str.kind_of?(clazz)
+          if clazz == NilClass
+            return nil if str.empty? or str == "nil"
+          elsif clazz == Ruby::Boolean
+            return true if str.to_s == "true"
+            return false if str.to_s == "false"
+          elsif clazz == TrueClass
+            return true if str == "true"
+          elsif clazz == FalseClass
+            return false if str == "false"
+          elsif [Fixnum, Bignum, Integer].include?(clazz)
+            if str =~ /^[-+]?[0-9]+$/
+              i = str.to_i
+              return i if i.kind_of?(clazz)
+            end
+          elsif clazz == Float 
+            if str =~ /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/
+              return str.to_f
+            end
+          elsif clazz == String
+            return str
+          elsif clazz == Symbol
+            return str.to_sym
+          elsif clazz == Class or clazz == Module
+            parts, current = str.split("::"), Kernel
+            parts.each{|part| current = current.const_get(part.to_sym)}
+            return current if current.kind_of?(clazz)
+          elsif clazz == Regexp
+            return Regexp::compile(str)
+          elsif clazz.respond_to?(:parse)
+            return clazz.parse(str)
           end
-        elsif clazz == Float 
-          if str =~ /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/
-            return str.to_f
-          end
-        elsif clazz == String
-          return str
-        elsif clazz == Symbol
-          return str.to_sym
-        elsif clazz == Class or clazz == Module
-          parts, current = str.split("::"), Kernel
-          parts.each{|part| current = current.const_get(part.to_sym)}
-          return current if current.kind_of?(clazz)
-        elsif clazz == Regexp
-          return Regexp::compile(str)
-        elsif clazz.respond_to?(:parse)
-          return clazz.parse(str)
+          raise TypeSystem::CoercionError, "Unable to coerce #{str} to a #{clazz}"
+        rescue TypeSystem::CoercionError
+          raise
+        rescue StandardError => ex
+          raise TypeSystem::CoercionError, "Unable to coerce #{str} to a #{clazz}: #{ex.message}"
         end
-        raise TypeSystem::CoercionError, "Unable to coerce #{str} to a #{clazz}"
-      rescue TypeSystem::CoercionError
-        raise
-      rescue StandardError => ex
-        raise TypeSystem::CoercionError, "Unable to coerce #{str} to a #{clazz}: #{ex.message}"
-      end
 
-    end # module Methods
-    extend(Methods)
+      end # module Methods
+      extend(Methods)
     
-  end # class Ruby
-end # module TypeSystem
+    end # class Ruby
+  end # module TypeSystem
+end # module SByC

data/test/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.expand_path('../', __FILE__))
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'rubygems'
-require 'sbyc'
+require 'sbyc/shortspaces'
 require 'spec'
 require 'spec/autorun'
 

data/test/spec/unit/sbyc/type_system/ruby/boolean.spec

@@ -0,0 +1,14 @@
+require File.expand_path('../../../../../spec_helper', __FILE__)
+require 'sbyc/type_system/ruby'
+
+describe "TypeSystem::Ruby::Boolean" do
+  
+  subject{ TypeSystem::Ruby::Boolean }
+  
+  it { should === true }
+  
+  it { should === false }
+
+  it { should_not === nil }
+  
+end

data/test/spec/unit/sbyc/type_system/ruby/coerce.spec

@@ -9,6 +9,7 @@ describe "TypeSystem::Ruby#coerce" do
   
   safe_representors = {
     NilClass   => [ nil ],
+    ::SByC::TypeSystem::Ruby::Boolean => [ true, false ],
     TrueClass  => [ true ],
     FalseClass => [ false ],
     Fixnum     => [ -(2**(0.size * 8 - 2)), -1, 0, 1, 10, (2**(0.size * 8 - 2) - 1)],
@@ -23,12 +24,20 @@ describe "TypeSystem::Ruby#coerce" do
   
   safe_representors.each_pair do |clazz, values|
     values.each do |value|
-      describe "When coercing #{value} to a #{clazz}" do
+      
+      describe "When coercing '#{value} to a #{clazz}" do
+
         it "should return #{value}" do
           str = value.kind_of?(Regexp) ? value.inspect[1..-2] : value.to_s
           TypeSystem::Ruby::coerce(str, clazz).should == value
         end  
+
+        it "should be friendly" do
+          TypeSystem::Ruby::coerce(value, clazz).should == value
+        end  
+
       end
+      
     end
   end 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sbyc
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Bernard Lambeau
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +51,7 @@ files:
 - lib/sbyc/codetree/rewriting/match.rb
 - lib/sbyc/codetree/rewriting.rb
 - lib/sbyc/codetree.rb
+- lib/sbyc/shortspaces.rb
 - lib/sbyc/type_system/contract.rb
 - lib/sbyc/type_system/errors.rb
 - lib/sbyc/type_system/ruby.rb
@@ -113,6 +114,7 @@ files:
 - test/spec/unit/sbyc/codetree/rewriting/match/apply.spec
 - test/spec/unit/sbyc/codetree/rewriting/match/coerce.spec
 - test/spec/unit/sbyc/codetree/rewriting/match/matches.spec
+- test/spec/unit/sbyc/type_system/ruby/boolean.spec
 - test/spec/unit/sbyc/type_system/ruby/coerce.spec
 - test/spec/unit/sbyc/type_system/ruby/parse_literal.spec
 - test/spec/unit/sbyc/type_system/ruby/to_literal.spec