cddl 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed6608fc505b18aec7d8e30bac4b1faca1265da
-  data.tar.gz: 46a78ea14fc09cc01a56ca63320e2f8a9de175d3
+  metadata.gz: 57c85df19d5a0b7d9070f233f0d4a59a3cee1bb2
+  data.tar.gz: ac391af699e243e95ae1fce85de5fdf9c863a24d
 SHA512:
-  metadata.gz: c941909e3cf4064ae0fbcb3f94e8bb54a10da19c294f1b6a7d5152cb0dd653a7ac6652f11bddc3d2a0e30a8679e823585b235acdf3479e660a66ba33b793e069
-  data.tar.gz: 2dd6ad6d49ab40dc1ccba874ee722aa3e490075886f8af51255ad33b5656c0b5c009f326727689f36f0ebd2cc7a30944e69209c6340fead7277a8294dc2878ba
+  metadata.gz: 121cbda92cc8112171d3b7395373fe09e502786a90887e2b54dd2f7639f8082a5197b5f64d6b8fa8c157555c46e476e7a81f463fd33b2f5f085cb5b5b74b0908
+  data.tar.gz: 0ed8f5e200aabf211c5489cd66487bf22e5bcde1d06894795cb36341d4e848d9f479e77cbaa30d6e81d6fd28d66b9fe9cec724b460ae9fd357d3dd981b4995ee

data/bin/cddl

@@ -55,6 +55,9 @@ begin
   when /\Ar/                      # secret
     $advanced = true
     my_pp parser.rules
+  when /\Ae/                      # secret
+    $advanced = true
+    puts parser.defines(ARGV[2])
   when /\Ag/
     n = 1
     n = ARGV[2].to_i if ARGV[2]

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.6.3'
+  s.version = '0.6.4'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/data/prelude.cddl

@@ -18,6 +18,7 @@ biguint = #6.2(bstr)
 bignint = #6.3(bstr)
 bigint = biguint / bignint
 integer = int / bigint
+unsigned = uint / biguint
 decfrac = #6.4([e10: int, m: integer])
 bigfloat = #6.5([e2: int, m: integer])
 eb64url = #6.21(any)
@@ -45,4 +46,4 @@ nil = #7.22
 null = nil
 undefined = #7.23
 
-used_in_cddl_prelude = any / bytes / tdate / time / number / biguint / bignint / bigint / integer / decfrac / bigfloat / eb64url / eb64legacy / eb16 / encoded-cbor / uri / b64url / b64legacy / regexp / mime-message / cbor-any / float16 / float32 / float64 / float16-32 / float32-64 / float / false / true / bool / null / undefined / uint / nint / int / text
+used_in_cddl_prelude = any / bytes / tdate / time / number / biguint / bignint / bigint / integer / unsigned / decfrac / bigfloat / eb64url / eb64legacy / eb16 / encoded-cbor / uri / b64url / b64legacy / regexp / mime-message / cbor-any / float16 / float32 / float64 / float16-32 / float32-64 / float / false / true / bool / null / undefined / uint / nint / int / text

data/lib/cbor-pp.rb

@@ -131,6 +131,12 @@ class Class
   end
 end
 
+class String
+  def cbor_clone
+    frozen? ? dup : self
+  end
+end
+
 class Array # :nodoc:
   def cbor_pp(q) # :nodoc:
     s = "#{cbor_annotation_format}["
@@ -161,7 +167,11 @@ class Hash # :nodoc:
     }
   end
   def cbor_clone
-    to_a.cbor_clone.to_h
+    # to_a.cbor_clone.to_h  # this breaks for unknown reasons
+    h = {}
+    each {|k, v| h[k.cbor_clone] = v.cbor_clone}
+    each {|k, v| fail [h, k, h[k], v].inspect unless h[k] == v}
+    h
   end
 end
 

data/lib/cddl.rb

@@ -70,6 +70,23 @@ module CDDL
       }]
     end
 
+    # Generate some simple #define lines from the value-only rules
+    def defines(prefix)
+      s = ''
+      prefix ||= "CDDL"
+      ast.each :rule do |rule|
+        if rulename = rule.typename
+          t = rule.type.children(:type1)
+          if t.size == 1
+            if (t2 = t.first.children(:type2)) && t2.size == 1 && (v = t2.first.value)
+              s += "#define #{prefix}_#{rulename.to_s.gsub(/-/, "_")} " << v.to_s << "\n"
+            end
+          end
+        end
+      end
+      s
+    end
+
     def rules
       @rules = {}
       @generics = {}

data/test-data/grasp-01.cddl

@@ -0,0 +1,90 @@
+   grasp-message = message
+
+   session-id = 0..16777215
+   ; that is up to 24 bits
+
+   message /= discovery-message
+   discovery-message = [M_DISCOVERY, session-id, objective]
+
+   message /= response-message
+   response-message = [M_RESPONSE, session-id,
+                      (+locator-option // divert-option // objective)]
+
+   message /= request-message
+   request-message = [M_REQUEST, session-id, objective]
+
+   message /= negotiation-message
+   negotiation-message = [M_NEGOTIATE, session-id, objective]
+
+   message /= end-message
+   end-message = [M_END, session-id, (accept-option / decline-option)]
+
+   message /= wait-message
+   wait-message = [M_WAIT, session-id, waiting-time-option]
+
+   divert-option = [O_DIVERT, +locator-option]
+
+   accept-option = [O_ACCEPT]
+
+   decline-option = [O_DECLINE]
+
+   waiting-time-option = [O_WAITING, option-waiting-time]
+   option-waiting-time = 0..4294967295 ; in milliseconds
+
+   option-device-id = [O_DEVICE_ID, bytes]
+
+   locator-option /= ipv4-locator-option
+   ipv4-locator-option = bytes .size 4
+   ; this is simpler than [O_IPv4_LOCATOR, bytes .size 4]
+
+   locator-option /= ipv6-locator-option
+   ipv6-locator-option = bytes .size 16
+
+   locator-option /= fqdn-locator-option
+   fqdn-locator-option = [O_FQDN_LOCATOR, text]
+
+   locator-option /= url-locator-option
+   url-locator-option = [O_URL_LOCATOR, text]
+
+   objective-flags = uint .bits objective-flag
+
+   objective-flag = &(
+   D: 0
+   N: 1
+   S: 2
+   )
+
+   ; D means valid for discovery only
+   ; N means valid for discovery and negotiation
+   ; S means valid for discovery and synchronization
+
+   objective /= generic-obj
+   generic-obj = [objective-name, objective-flags, loop-count, ?any]
+
+   objective /= vendor-obj
+   vendor-obj = [{"PEN":pen}, objective-name, objective-flags,
+                 loop-count, ?any]
+
+   ; A PEN is used to distinguish vendor-specific options.
+
+   pen = 0..4294967295
+   objective-name = tstr
+   loop-count = 0..255
+
+   ; Constants
+
+   M_DISCOVERY = 1
+
+   M_RESPONSE = 2
+   M_REQUEST = 3
+   M_NEGOTIATE = 4
+   M_END = 5
+   M_WAIT = 6
+
+   O_DIVERT = 100
+   O_ACCEPT = 101
+   O_DECLINE = 102
+   O_WAITING = 103
+   O_DEVICE_ID = 104
+   O_FQDN_LOCATOR = 105
+   O_URL_LOCATOR = 106

data/test/test-cddl.rb

@@ -5,6 +5,7 @@ require 'cbor-pretty.rb'
 require 'cbor-diagnostic.rb'
 
 require_relative '../lib/cddl'
+require_relative '../lib/cbor-pp'
 
 
 class TestABNF < Test::Unit::TestCase
@@ -100,6 +101,37 @@ HERE
     refute parser1.validate(g, false)
   end
 
+  def test_aaaaaaa_cbor_clone_hash
+    a = "x".cbor_clone
+    b = {a => 1}
+    assert_equal 1, b[a]
+    assert_equal 1, b["x".cbor_clone]
+    assert_equal 1, b["x"]
+    assert_equal 1, b.fetch("x".cbor_clone, :not_found)
+    assert_equal 1, b.fetch("x", :not_found)
+    b = {"x" => 1}.cbor_clone
+    assert_equal 1, b["x"]
+    assert_equal 1, b["x".cbor_clone]
+    assert_equal 1, b[a]
+    assert_equal 1, b.fetch("x".cbor_clone, :not_found)
+    assert_equal 1, b.fetch("x", :not_found)
+  end
+
+  def test_aaaaa_validate_clone
+    parser1 = CDDL::Parser.new(File.read("test-data/7071-concise.cddl"))
+    g = parser1.generate
+    pp g
+    g = g.cbor_clone
+
+    assert parser1.validate(g)
+    old = g["application"]
+    g["application"] = 4711.cbor_clone
+    refute parser1.validate(g, false)
+    g["application"] = old
+    g["reputons"] << 5712.cbor_clone
+    refute parser1.validate(g, false)
+  end
+
   def test_validate_1
     parser = CDDL::Parser.new <<HERE
 test = 1
@@ -1030,7 +1062,7 @@ HERE
     }
   end
 
-  
+
   def test_group_recursion2
     parser = CDDL::Parser.new <<HERE
 b = {1: 2, a}
@@ -1049,7 +1081,7 @@ HERE
     }
   end
 
-
+  
   def test_group_recursion_fail1
     parser = CDDL::Parser.new <<HERE
 b = {a}
@@ -1089,7 +1121,7 @@ HERE
     assert parser.validate({})
   end
 
-  
+
   def test_empty_group_augmented
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1105,7 +1137,7 @@ HERE
     assert_equal({}, parser.generate)
     assert parser.validate({})
   end
-  
+
   def test_simple_group_augmented
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1128,7 +1160,7 @@ HERE
     assert parser.validate({"abs" => 5})
     assert parser.validate({"abs" => -3})
   end
-  
+
   def test_simple_group_augmented_uninitialized
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1150,7 +1182,7 @@ HERE
     assert parser.validate({"abs" => -3})
   end
 
-  
+
   def test_simple_type_augmented
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1172,7 +1204,7 @@ HERE
     assert parser.validate({"abs" => -3})
   end
 
-    
+
   def test_empty_type_socket
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1185,7 +1217,7 @@ HERE
     assert_raise { parser.generate }
   end
 
-      
+
   def test_empty_group_socket
     parser = CDDL::Parser.new <<HERE
 a = {$$t2}
@@ -1197,7 +1229,7 @@ HERE
     assert_raise { parser.generate }
   end
 
-      
+
   def test_validate_empty_type_socket
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1211,7 +1243,7 @@ HERE
     assert parser.validate({"abs" => 17})
   end
 
-      
+
   def test_validate_empty_group_socket
     parser = CDDL::Parser.new <<HERE
 a = {$$t2 // a: 1}
@@ -1224,7 +1256,7 @@ HERE
     assert parser.validate({"a" => 1})
   end
 
-        
+
   def test_validate_empty_group_socket_in_star
     parser = CDDL::Parser.new <<HERE
 a = {* $$t2}
@@ -1265,7 +1297,7 @@ HERE
     assert parser.validate({"seq" => 1, "ack" => 2})
   end
 
-  
+
   def test_simple_type_augmented_uninitialized
     parser = CDDL::Parser.new <<HERE
 a = {b}
@@ -1376,8 +1408,7 @@ HERE
     # end
   end
 
-  
-  def test_aaaaa_false_map_values
+  def test_false_map_values
     parser = CDDL::Parser.new <<HERE
 a = {a: nil}
 HERE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -102,6 +102,7 @@ files:
 - test-data/cdni-ct.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/grasp-01.cddl
 - test-data/grasp-v1.cddl
 - test-data/grasp-v2X.cddl
 - test-data/ifmap-base-2.0v17.cddl