cauterize 0.0.1.pre7 → 0.0.1.pre8

data/README.md

@@ -33,13 +33,31 @@ used to abstract the process of packaging and unpackaging different elements.
 
 # Different Types
 
-There are 6 fundamental classes of types in Cauterize. These types have several characteristics:
+There are 7 fundamental classes of types in Cauterize. These types have several characteristics:
 
 * They can be copied with `memcpy`.
 * They do not attempt to cover the concept of indirection or pointers.
 * They are simple.
 * They cannot be defined recursively.
 
+## Primitives
+
+* 1 Byte Primitives
+  * `:bool` - a boolean value
+  * `:int8` - a signed, 8 bit value
+  * `:uint8` - an unsigned, 8 bit value
+* 2 Byte Primitives
+  * `:int16` - a signed, 16 bit value
+  * `:uint16` - an unsigned, 16 bit value
+* 4 Byte Primitives
+  * `:int32` - a signed, 32 bit value
+  * `:uint32` - an unsigned, 32 bit value
+  * `:float32` - a 32 bit floating point value
+* 8 Byte Primitives
+  * `:int64` - a signed, 64 bit value
+  * `:uint64` - an unsigned, 64 bit value
+  * `:float64` - a 64 bit floating point value
+
 ## Scalars
 
 Scalars are any type that corresponds to a C scalar value. That is, something

data/example/Cauterize

@@ -40,6 +40,8 @@ composite(:nonsensical) do |c|
   c.field :color, :color
   c.field :color_list, :color_list
   c.field :numbers, :numbers
+  c.field :a_float, :float64
+  c.field :a_bool, :bool
 end
 
 composite(:crazy) do |c|

data/lib/cauterize/builders/c/builtin.rb

@@ -3,10 +3,10 @@ module Cauterize
     module C
       class BuiltIn < Buildable
         @@C_TYPE_MAPPING = {
-          1 => {signed:  :int8_t, unsigned:  :uint8_t},
-          2 => {signed: :int16_t, unsigned: :uint16_t},
-          4 => {signed: :int32_t, unsigned: :uint32_t},
-          8 => {signed: :int64_t, unsigned: :uint64_t},
+          1 => {signed:  :int8_t, unsigned:  :uint8_t, :float => nil,     :bool => :bool},
+          2 => {signed: :int16_t, unsigned: :uint16_t, :float => nil,     :bool =>   nil},
+          4 => {signed: :int32_t, unsigned: :uint32_t, :float => :float,  :bool =>   nil},
+          8 => {signed: :int64_t, unsigned: :uint64_t, :float => :double, :bool =>   nil},
         }
 
         def render
@@ -35,8 +35,7 @@ module Cauterize
         private
 
         def render_ctype
-          s_key = @blueprint.is_signed ? :signed : :unsigned
-          @@C_TYPE_MAPPING[@blueprint.byte_length][s_key]
+          @@C_TYPE_MAPPING[@blueprint.byte_length][@blueprint.flavor]
         end
       end
     end

data/lib/cauterize/builders/cs/builtin.rb

@@ -1,10 +1,10 @@
 module Cauterize::Builders::CS
   class BuiltIn < Buildable
     @@CS_TYPE_MAPPING = {
-      1 => {signed: "SByte", unsigned: "Byte"},
-      2 => {signed: "Int16", unsigned: "UInt16"},
-      4 => {signed: "Int32", unsigned: "UInt32"},
-      8 => {signed: "Int64", unsigned: "UInt64"},
+      1 => {signed: "SByte", unsigned: "Byte",   :float => nil,      :bool => "bool"},
+      2 => {signed: "Int16", unsigned: "UInt16", :float => nil,      :bool => nil},
+      4 => {signed: "Int32", unsigned: "UInt32", :float => "Float",  :bool => nil},
+      8 => {signed: "Int64", unsigned: "UInt64", :float => "Double", :bool => nil},
     }
 
     def render
@@ -14,8 +14,7 @@ module Cauterize::Builders::CS
     private
 
     def render_cstype
-      s_key = @blueprint.is_signed ? :signed : :unsigned
-      @@CS_TYPE_MAPPING[@blueprint.byte_length][s_key]
+      @@CS_TYPE_MAPPING[@blueprint.byte_length][@blueprint.flavor]
     end
   end
 end

data/lib/cauterize/builtin.rb

@@ -2,14 +2,17 @@ module Cauterize
   module_function
 
   BUILT_IN_TYPES = [
-    { :name => :int8,   :size => 1, :signed => true },
-    { :name => :int16,  :size => 2, :signed => true },
-    { :name => :int32,  :size => 4, :signed => true },
-    { :name => :int64,  :size => 8, :signed => true },
-    { :name => :uint8,  :size => 1, :signed => false },
-    { :name => :uint16, :size => 2, :signed => false },
-    { :name => :uint32, :size => 4, :signed => false },
-    { :name => :uint64, :size => 8, :signed => false },
+    { :name => :int8,    :size => 1, :flavor => :signed },
+    { :name => :int16,   :size => 2, :flavor => :signed },
+    { :name => :int32,   :size => 4, :flavor => :signed },
+    { :name => :int64,   :size => 8, :flavor => :signed },
+    { :name => :uint8,   :size => 1, :flavor => :unsigned },
+    { :name => :uint16,  :size => 2, :flavor => :unsigned },
+    { :name => :uint32,  :size => 4, :flavor => :unsigned },
+    { :name => :uint64,  :size => 8, :flavor => :unsigned },
+    { :name => :float32, :size => 4, :flavor => :float },
+    { :name => :float64, :size => 8, :flavor => :float },
+    { :name => :bool,    :size => 1, :flavor => :bool },
   ]
 
   def builtins
@@ -20,7 +23,7 @@ module Cauterize
     BUILT_IN_TYPES.each do |b|
       _b = BuiltIn.new(b[:name], nil)
       _b.byte_length(b[:size])
-      _b.is_signed(b[:signed])
+      _b.flavor(b[:flavor])
       builtins[b[:name]] = _b
     end
   end
@@ -30,11 +33,11 @@ module Cauterize
       super
     end
 
-    def is_signed(signed = nil)
-      unless signed.nil?
-        @is_signed = signed
+    def flavor(f = nil)
+      unless f.nil?
+        @flavor = f
       else
-        @is_signed
+        @flavor
       end
     end
 

data/lib/cauterize/version.rb

@@ -1,3 +1,3 @@
 module Cauterize
-  VERSION = "0.0.1.pre7"
+  VERSION = "0.0.1.pre8"
 end

data/spec/builders/c/builtin_spec.rb

@@ -2,7 +2,7 @@ module Cauterize
   describe Builders::C::BuiltIn do
     let(:bi) do
       b = BuiltIn.new(:foo)
-      b.is_signed(false)
+      b.flavor(:unsigned)
       b.byte_length(4)
       b
     end

data/spec/builtin_spec.rb

@@ -4,11 +4,11 @@ module Cauterize
     describe :initialize do
       it "creates a builtin" do
         b = BuiltIn.new(:foo)
-        b.is_signed(false)
+        b.flavor(:unsigned)
         b.byte_length(4)
         
         b.name.should == :foo
-        b.is_signed.should == false
+        b.flavor.should == :unsigned
         b.byte_length.should == 4
       end
     end
@@ -30,6 +30,8 @@ module Cauterize
     Cauterize.builtins.keys.should =~ [
       :int8, :int16, :int32, :int64,
       :uint8, :uint16, :uint32, :uint64,
+      :float32, :float64,
+      :bool,
     ]
   end
 

data/spec/doc_builder_spec.rb

@@ -134,6 +134,21 @@ Cauterize Class: built-in
 Description: <none>
   data - size: 8 bytes
 
+Type Name: float32
+Cauterize Class: built-in
+Description: <none>
+  data - size: 4 bytes
+
+Type Name: float64
+Cauterize Class: built-in
+Description: <none>
+  data - size: 8 bytes
+
+Type Name: bool
+Cauterize Class: built-in
+Description: <none>
+  data - size: 1 bytes
+
 Type Name: an_int
 Cauterize Class: scalar
 Description:  - a useful int

data/support/c/src/cauterize.h

@@ -3,6 +3,7 @@
 
 #ifndef CUSTOM_TYPES
   #include <stdint.h>
+  #include <stdbool.h>
   #include <stddef.h>
 #else
   #include "cauterize_custom_types.h"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cauterize
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre7
+  version: 0.0.1.pre8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,7 +126,6 @@ files:
 - cauterize.gemspec
 - example/Cauterize
 - example/build.sh
-- example/doc_cauterize_output/example_project.txt
 - example/ruby_ex.rb
 - lib/cauterize.rb
 - lib/cauterize/base_type.rb
@@ -251,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3520063422642430845
+      hash: 1539031795664628107
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/example/doc_cauterize_output/example_project.txt

@@ -1,124 +0,0 @@
-Type Name: int8
-Cauterize Class: built-in
-Description: <none>
-  data - size: 1 bytes
-
-Type Name: int16
-Cauterize Class: built-in
-Description: <none>
-  data - size: 2 bytes
-
-Type Name: int32
-Cauterize Class: built-in
-Description: <none>
-  data - size: 4 bytes
-
-Type Name: int64
-Cauterize Class: built-in
-Description: <none>
-  data - size: 8 bytes
-
-Type Name: uint8
-Cauterize Class: built-in
-Description: <none>
-  data - size: 1 bytes
-
-Type Name: uint16
-Cauterize Class: built-in
-Description: <none>
-  data - size: 2 bytes
-
-Type Name: uint32
-Cauterize Class: built-in
-Description: <none>
-  data - size: 4 bytes
-
-Type Name: uint64
-Cauterize Class: built-in
-Description: <none>
-  data - size: 8 bytes
-
-Type Name: bigint
-Cauterize Class: scalar
-Description: <none>
-  data - type: int32
-
-Type Name: usmallint
-Cauterize Class: scalar
-Description: <none>
-  data - type: uint8
-
-Type Name: color
-Cauterize Class: enumeration
-Description: <none>
-Encoding: int8
-    red = 0
-    blue = 1
-    green = 2
-
-Type Name: large_value
-Cauterize Class: enumeration
-Description: <none>
-Encoding: int16
-    negative = -500
-    positive = 500
-
-Type Name: weirdness
-Cauterize Class: composite
-Description: <none>
-  val - type: large_value
-  num - type: int8
-
-Type Name: color_list
-Cauterize Class: fixed-array
-Description: <none>
-Stored Type: color
-Value Count: 4
-  data - 4 values of type color
-
-Type Name: color_list_list
-Cauterize Class: fixed-array
-Description: <none>
-Stored Type: color_list
-Value Count: 4
-  data - 4 values of type color_list
-
-Type Name: numbers
-Cauterize Class: variable-array
-Description: <none>
-Maximum Value Count: 128
-  length - type usmallint
-  data - 0 to 128 values of type bigint
-
-Type Name: nonsensical
-Cauterize Class: composite
-Description: <none>
-  color - type: color
-  color_list - type: color_list
-  numbers - type: numbers
-
-Type Name: crazy
-Cauterize Class: composite
-Description: <none>
-  first_numbers - type: numbers
-  second_numbers - type: numbers
-  third_numbers - type: numbers
-
-Type Name: insanity
-Cauterize Class: group
-Description: <none>
-  kind tag: group_insanity_type
-  kinds:
-    nonsensical - payload: nonsensical
-    crazy - payload: crazy
-    any_empty_entry - payload: <no payload>
-    another_empty - payload: <no payload>
-
-Type Name: group_insanity_type
-Cauterize Class: enumeration
-Description: <none>
-Encoding: int8
-    GROUP_INSANITY_TYPE_NONSENSICAL = 0
-    GROUP_INSANITY_TYPE_CRAZY = 1
-    GROUP_INSANITY_TYPE_ANY_EMPTY_ENTRY = 2
-    GROUP_INSANITY_TYPE_ANOTHER_EMPTY = 3