cddl 0.8.20 → 0.8.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/cddl.gemspec +1 -1
- data/lib/cddl.rb +6 -6
- data/test-data/bat.cddl +16 -0
- data/test-data/oidbat.cddl +8 -0
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 207ea6c166a60cfc705009af0a15b9633e301429cd8958d279f9d710800765bb
|
4
|
+
data.tar.gz: 6b0e05ce4c0059d2a40a39892784da5e838451772bbad0d301c056a2c83418cb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8fd0733ddb7c869b89578d92aee41d818ae3a4c85fbb9db0d4377136498195c054c17670c00ae89322578d5f6dfa64e1f10c5ed6c9c1cfcee27e9d135d9ac843
|
7
|
+
data.tar.gz: 7a64af74fe96ae30fe834c36ca7c59326257f27e2d9a16ac3edb97bd1772c46e6f77c4a8dd715c27996a1b59369b8efe7be8332f82215afd7a0014cb72097f59
|
data/cddl.gemspec
CHANGED
data/lib/cddl.rb
CHANGED
@@ -458,10 +458,10 @@ module CDDL
|
|
458
458
|
generate1(target, inmap)
|
459
459
|
when :feature
|
460
460
|
generate1(target, inmap)
|
461
|
-
when :cat, :
|
461
|
+
when :cat, :det
|
462
462
|
lhs = generate1(target, inmap)
|
463
463
|
rhs = generate1(control)
|
464
|
-
rhs = remove_indentation(rhs) if conop == :
|
464
|
+
rhs = remove_indentation(rhs) if conop == :det
|
465
465
|
begin
|
466
466
|
lhs + rhs
|
467
467
|
rescue Exception => e
|
@@ -599,7 +599,7 @@ module CDDL
|
|
599
599
|
elsif t[0] == :anno
|
600
600
|
_, conop, target, control = t
|
601
601
|
# warn ["EXV0", conop, target, control].inspect
|
602
|
-
if conop == :cat || conop == :plus || conop == :
|
602
|
+
if conop == :cat || conop == :plus || conop == :det
|
603
603
|
ok1, v1, vt1 = extract_value(target)
|
604
604
|
ok2, v2, vt2 = extract_value(control)
|
605
605
|
# warn ["EXV", ok1, v1, vt1, ok2, v2, vt2].inspect
|
@@ -609,7 +609,7 @@ module CDDL
|
|
609
609
|
elsif vt1 == Float
|
610
610
|
[true, v1 + v2, vt1] if vt2 == Integer || vt2 == Float
|
611
611
|
else
|
612
|
-
v2 = remove_indentation(v2) if conop == :
|
612
|
+
v2 = remove_indentation(v2) if conop == :det
|
613
613
|
[true, v1 + v2, vt1] if vt1 == vt2
|
614
614
|
end
|
615
615
|
end rescue nil
|
@@ -854,7 +854,7 @@ module CDDL
|
|
854
854
|
# warn ["ANNO0", ok1, v1, vt1, ok2, v2, vt2, d].inspect
|
855
855
|
if ok1 && ok2
|
856
856
|
v2 = Integer(v2) if vt1 == Integer
|
857
|
-
v2 = remove_indentation(v2) if conop == :
|
857
|
+
v2 = remove_indentation(v2) if conop == :det
|
858
858
|
# warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
|
859
859
|
[] if d == v1 + v2 # XXX Focus ArgumentError
|
860
860
|
end
|
@@ -1304,7 +1304,7 @@ module CDDL
|
|
1304
1304
|
RANGE_EXCLUDE_END = {".." => false, "..." => true}
|
1305
1305
|
SUPPORTED_ANNOTATIONS = [:bits, :size, :regexp, :cbor, :cborseq, :within, :and,
|
1306
1306
|
:default, :lt, :le, :gt, :ge, :eq, :ne,
|
1307
|
-
:feature, :abnf, :abnfb, :
|
1307
|
+
:feature, :abnf, :abnfb, :det, :cat, :plus]
|
1308
1308
|
|
1309
1309
|
def type1(n, canbegroup = false)
|
1310
1310
|
# puts "NVALUE #{n.value.inspect}"
|
data/test-data/bat.cddl
ADDED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cddl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.21
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Carsten Bormann
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-03-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: cbor-diag
|
@@ -121,6 +121,7 @@ files:
|
|
121
121
|
- test-data/b.cddl
|
122
122
|
- test-data/badaddr.cddl
|
123
123
|
- test-data/basic_syntax_example.cddl
|
124
|
+
- test-data/bat.cddl
|
124
125
|
- test-data/bpv7.cddl
|
125
126
|
- test-data/bpv7a.cddl
|
126
127
|
- test-data/bpv7b.cddl
|
@@ -167,6 +168,7 @@ files:
|
|
167
168
|
- test-data/multipart-ct.cddl
|
168
169
|
- test-data/named-group.cddl
|
169
170
|
- test-data/oid.cddl
|
171
|
+
- test-data/oidbat.cddl
|
170
172
|
- test-data/patch1.cddl
|
171
173
|
- test-data/reused_named_group.cddl
|
172
174
|
- test-data/sasl.cddl
|