slow_blink 0.0.2 → 0.0.3

data/ext/slow_blink/ext_schema_parser/parser.h

@@ -34,7 +34,7 @@
 # define YY_YY_EXT_SLOW_BLINK_EXT_SCHEMA_PARSER_PARSER_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+# define YYDEBUG 1
 #endif
 #if YYDEBUG
 extern int yydebug;

data/lib/slow_blink/annotatable.rb

@@ -37,7 +37,7 @@ module SlowBlink
                     if @nameWithID.id
                         puts "#{a.location}: warning: overriding previous id"
                     end
-                    @nameWithID.id = a                    
+                    @nameWithID.id = a.to_i             
                 end
             end
         end

data/lib/slow_blink/annotation.rb

@@ -22,15 +22,15 @@ module SlowBlink
 
         attr_reader :location
         attr_reader :id
-        attr_reader :literal
+        attr_reader :value
         
         # @param id [String] any string
-        # @param literal [String] any string
+        # @param value [String] any string
         # @param location [String]
-        def initialize(id,literal,location)
+        def initialize(id,value,location)
             @id = id
-            @literal = literal
-            @location = location
+            @value = value
+            @location = value
         end
 
     end

data/lib/slow_blink/binary.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module SlowBlink
+
+    # Blink Specification 3.3
+    class BINARY < STRING
+    end
+
+end

data/lib/slow_blink/boolean.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module SlowBlink
+
+    # Blink Specification 3.6
+    class BOOLEAN < Type
+    end
+
+end

data/lib/slow_blink/compact_encoder.rb

@@ -17,81 +17,55 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# SlowBlink
 module SlowBlink
 
     module CompactEncoder
 
-        # @return [String]
-        def self.putNull
-            "\x40"
-        end
-        
-        # @return [String]
-        def self.putPresent
-            "\x01"
-        end
+        # @!method getU8(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
 
-        def self.putBool(value)
-            (value) ? "\x01" : "\x00"
-        end
-
-        # @param value [Float]
-        # @return [String]
-        def self.putF64(value)
-            putVLC([value].pack("G").unpack("Q<").first)
-        end
-
-        def self.putString(value)
-            putVLC(value.size) + value
-        end
-
-        def self.putBinary(value)
-            putVLC(value.size) + value.to_s
-        end
-
-        def self.putFixed(value)
-            value.to_s
-        end
-
-
-        
-
-            
-            # @private
-            #
-            # @param value [Integer] unsigned integer
-            # @return [Integer] bytes to encode as VLC
-            def self.getSizeUnsigned(value)                
-            end
-
-            # @private
-            #
-            # @param value [Integer] signed integer
-            # @return [Integer] bytes to encode as VLC
-            def self.getSizeSigned(value)                
-            end
-
-            # @private
-            #
-            # @param value [Integer] signed or unsigned integer
-            # @param opts [Hash] option
-            # @option opts [Symbol] :signed value is a signed integer
-            def self.putVLC(value, **opts)
-                bytes = opts[:signed] ? getSizeSigned(value) : getSizeUnsigned(value)
-                case bytes
-                when 1
-                    [value].pack("C")
-                when 2
-                    [0x80 | value].pack("S<")
-                else
-                    out = [0xc0 | bytes]
-                    while out.size < (bytes - 1) do
-                        out << (value >> 8)
-                    end
-                    out.pack("S<C#{bytes-2}")                                                        
-                end                    
-            end
+        # @!method getU16(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getU32(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getU64(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getI8(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getI16(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getI32(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getI64(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
+        # @!method getF64(input)
+        # @param input [String]
+        # @return [nil, Integer]
+        # @raise [Error]
+    
     end
-
+    
 end

data/lib/slow_blink/date.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module SlowBlink
+
+    class DATE < Type
+    end
+
+end

data/lib/slow_blink/decimal.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module SlowBlink
+
+    # Blink Specification 3.7
+    class DECIMAL < Type
+    end
+
+end

data/lib/slow_blink/definition.rb

@@ -21,7 +21,10 @@ module SlowBlink
     class Definition
 
         include Annotatable
-        extend CompactEncoder
+
+        def self.===(other)
+            self == other                
+        end
 
         # @return [String]
         attr_reader :location
@@ -29,28 +32,34 @@ module SlowBlink
         # @return [String]
         attr_reader :nameWithID
 
-        # @return [Enumeration]
+        # @return [ENUMERATION]
         # @return [Type]
-        attr_reader :enumOrType
+        attr_reader :type
+
+        # @param namespace [Namespace]
+        def namespace=(namespace)
+            @ns = namespace
+        end
 
         # @private
         #
         # @param nameWithID [NameWithID]
-        # @param enumOrType [Enumeration, Type]
+        # @param type [ENUMERATION, Type]
         # @param location [String]
-        def initialize(nameWithID, enumOrType, location)
+        def initialize(nameWithID, type, location)
             @annotes = {}
             @schema = nil
-            @enumOrType = enumOrType
+            @type = type
             @location = location
             @nameWithID = nameWithID
+            @ns = nil
         end
 
-        # @private
-        #
-        # @!macro common_link
         def link(schema, stack=[])
-            @schema = @enumOrType.link(schema, stack << self)
+            if @schema.nil?
+                @schema = @type.link(schema, @ns, stack << self)
+            end
+            @schema
         end
 
     end

data/lib/slow_blink/enumeration.rb

@@ -19,10 +19,13 @@
 
 module SlowBlink
 
-    class Enumeration
+    class ENUMERATION
 
         include Annotatable
-        extend CompactEncoder
+
+        def self.===(other)
+            self == other                
+        end
 
         # @private
         #
@@ -34,22 +37,14 @@ module SlowBlink
             @schema = nil       
         end
 
-        def ===(other)
-            self.class == other.class            
-        end
-
-        # @private
-        #
-        # @macro common_link
-        def link(schema, stack=[])
-            if @schema != schema
-                @schema = nil
+        def link(schema, ns, stack=[])
+            if @schema.nil?
                 value = 0
                 errors = 0
                 @syms = {}                        
                 @rawSyms.each do |s|
                     if @syms[s.name]
-                        puts "#{s.location}: error: duplicate name"
+                        puts "#{s.location}: error: duplicate name '#{s.name}' (first defined at #{@syms[s.name].location})"
                         errors += 1
                     else
                         if s.val
@@ -60,9 +55,10 @@ module SlowBlink
                                 value = s.val + 1
                             end                        
                         else
-                            @syms[s.name] = value
+                            s.val = value                            
                             value += 1
                         end
+                        @syms[s.name] = s
                     end
                 end
                 if errors == 0
@@ -75,29 +71,11 @@ module SlowBlink
         # @param nameOrVal [String,Integer]
         # @return [Sym]
         # @return [nil]
-        def sym(nameOrVal)
-            if key.kind_of? String
-                @syms[key.to_s]
-            else
-                @syms.detect{|s|s.val == s.to_i}
-            end
-        end
-
-        # @private
-        def validate(input)
-            if sym(input)
-               true
-            else
-                raise
-            end
-        end
-
-        # @private
-        def encode_compact(value, **opts)
-            if opts[:opt]
-                putPresent + putVLC(value)
+        def symbol(nameOrVal)
+            if nameOrVal.kind_of? String
+                @syms[nameOrVal]
             else
-                putVLC(value)
+                @syms.values.detect{|s|s.val == nameOrVal.to_i}
             end
         end
 

data/lib/slow_blink/error.rb

@@ -1,3 +1,22 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module SlowBlink
     class Error < Exception
     end

data/lib/slow_blink/field.rb

@@ -22,7 +22,6 @@ module SlowBlink
     class Field
         
         include Annotatable
-        extend CompactEncoder
 
         # @return [String]
         attr_reader :location
@@ -57,26 +56,14 @@ module SlowBlink
         # @private
         #
         # @!macro common_link
-        def link(schema,stack=[])
-            if @schema != schema
-                @schema = nil
-                if @type.link(schema, stack << self)
+        def link(schema,ns, stack=[])
+            if @schema.nil?
+                if @type.link(schema, ns, stack << self)
                     @schema = schema
                 end
             end
             @schema
         end
-
-        # @private
-        def encode_compact(value, **opts)
-            if value[name]
-                @type.encode_compact(value[:name], opt: @opt)
-            elsif @opt
-                putNull
-            else
-                raise
-            end
-        end
         
     end
 end

data/lib/slow_blink/fixed.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module SlowBlink
+
+    # Blink Specification 3.4
+    class FIXED < STRING        
+    end
+
+end

data/lib/slow_blink/floating_point.rb

@@ -0,0 +1,27 @@
+# Copyright (c) 2016 Cameron Harper
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#  
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+module SlowBlink
+
+    # Blink Specification 3.1
+    class FLOATING_POINT < INTEGER
+    end
+
+end

data/lib/slow_blink/group.rb

@@ -22,7 +22,10 @@ module SlowBlink
     class Group
 
         include Annotatable
-        extend CompactEncoder
+
+        def self.===(other)
+            self == other                
+        end
 
         # @return [String]
         attr_reader :location
@@ -30,6 +33,16 @@ module SlowBlink
         # @return [NameWithID]
         attr_reader :nameWithID
 
+        # @return [Array<Field>]
+        def fields
+            @fields.values
+        end
+
+        # @param namespace [Namespace]
+        def namespace=(namespace)
+            @ns = namespace
+        end
+
         # @private
         #
         # @param nameWithID [NameWithID]
@@ -44,27 +57,29 @@ module SlowBlink
             @location = location
             @fields = []
             @nameWithID = nameWithID
+            @ns = nil
         end
         
         # @private
         #
         # @macro common_link
         def link(schema,stack=[])
-            if @schema != schema
+            if @schema.nil?
                 errors = 0
-                @schema = nil
                 @fields = {}
-                if !@superGroup or (@superGroup and @superGroup.link(schema, stack << self))                    
-                    if !@superGroup or @superGroup.value.is_a?(Group)
+                if !@superGroup or (@superGroup and @superGroup.link(schema, @ns, stack << self))                    
+                    if !@superGroup or @superGroup.ref.is_a?(Group)
                         if @superGroup
-                            @fields.merge(@superGroup.value.fields)
+                            @superGroup.ref.fields.each do |f|
+                                 @fields[f.nameWithID.name] = f
+                            end
                         end
                         @rawFields.each do |f|
                             if @fields[f.nameWithID.name]
-                                puts "#{f.location}: error: field with duplicate name '#{f.nameWithID.name}'"
+                                puts "#{f.location}: error: duplicate field name '#{f.nameWithID.name}' (first defined at #{@fields[f.nameWithID.name].location})"
                                 errors += 1
                             else
-                                if f.link(schema, stack.dup << self)
+                                if f.link(schema, @ns, stack.dup << self)
                                     @fields[f.nameWithID.name] = f
                                 else
                                     errors += 1
@@ -75,7 +90,7 @@ module SlowBlink
                             @schema = schema
                         end
                     else
-                        puts "#{@superGroup.location}: error: superGroup must be a group"
+                        puts "#{@superGroup.location}: error: superGroup '#{@superGroup.qname}' must resolve to a group definition"
                     end
                 end
             end
@@ -89,41 +104,13 @@ module SlowBlink
             @fields[name]
         end
 
-        def fields
-            @fields
-        end
-
-        # @private
-        def validate(value)
-            if value.kind_of? Hash
-                if value["$type"] == @nameWithID.name
-                    @fields.each do |name,f|
-                        f.validate(value[name])
-                    end
-                    true
-                else
-                    raise
-                end
-            end
-        end
-
-        # @private
+        # Is this group a sub group of the super group?
         #
-        # @param value [Hash] Blink JSON format
-        # @param opts [Hash] options
-        # @option opts [Symbol] :dynamic encode as dynamic group
-        # @return [String] compact format
-        def encode_compact(value, **opts)
-            out = ""
-            @fields.each do |name, f|
-                out << f.encode_compact(value)
-            end
-            if opts[:dynamic]
-                putVLC(@nameWithID.id) + putVLC(out.size) + out
-            else
-                out
-            end
+        # @param superGroup [Group]
+        # @return [true,false]
+        def group_kind_of?(superGroup)
+            (self == superGroup) or (@superGroup and @superGroup.ref.group_kind_of?(superGroup))            
         end
-        
+
     end
 end