cddl 0.8.25 → 0.8.26
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 +13 -4
- data/test-data/det1.cddl +12 -0
- data/test-data/yangid.cddl +1 -0
- metadata +5 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 47f3304378cd8f42807f0b96551a9b8cd5c609741d9a1e508c7c68913bf591d0
|
4
|
+
data.tar.gz: 312535858550c20a3415238c8f26b5c96f2036707e305bd6665b12bb73e4addc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 36ef0f6662d44814da072251405894b4b70ef20a6a493e8de7b597ece370e774cbf8fe8d2da35c2baa5f8b08adffc1a98dffaf1535907aca11a1a3936b11286a
|
7
|
+
data.tar.gz: a6a731d5d348156deb0b2e3415bf6c944198bcfc7ca33632ee7f4d40e07ce832bbcadcc1b4bab4d8f75653932b9f82cba2c4ccbef662af49c81554edb2e77480
|
data/cddl.gemspec
CHANGED
data/lib/cddl.rb
CHANGED
@@ -463,7 +463,10 @@ module CDDL
|
|
463
463
|
when :cat, :det
|
464
464
|
lhs = generate1(target, inmap)
|
465
465
|
rhs = generate1(control)
|
466
|
-
|
466
|
+
if conop == :det
|
467
|
+
lhs = remove_indentation(lhs)
|
468
|
+
rhs = remove_indentation(rhs)
|
469
|
+
end
|
467
470
|
begin
|
468
471
|
lhs + rhs
|
469
472
|
rescue Exception => e
|
@@ -611,7 +614,10 @@ module CDDL
|
|
611
614
|
elsif vt1 == Float
|
612
615
|
[true, v1 + v2, vt1] if vt2 == Integer || vt2 == Float
|
613
616
|
else
|
614
|
-
|
617
|
+
if conop == :det
|
618
|
+
v1 = remove_indentation(v1)
|
619
|
+
v2 = remove_indentation(v2)
|
620
|
+
end
|
615
621
|
[true, v1 + v2, vt1] if vt1 == vt2
|
616
622
|
end
|
617
623
|
end rescue nil
|
@@ -854,13 +860,16 @@ module CDDL
|
|
854
860
|
[] if where[2] === d && where[1].include?(d)
|
855
861
|
when :anno
|
856
862
|
_, conop, target, control = where
|
857
|
-
if conop == :cat || conop == :plus
|
863
|
+
if conop == :cat || conop == :plus || conop == :det
|
858
864
|
ok1, v1, vt1 = extract_value(target)
|
859
865
|
ok2, v2, vt2 = extract_value(control)
|
860
866
|
# warn ["ANNO0", ok1, v1, vt1, ok2, v2, vt2, d].inspect
|
861
867
|
if ok1 && ok2
|
862
868
|
v2 = Integer(v2) if vt1 == Integer
|
863
|
-
|
869
|
+
if conop == :det
|
870
|
+
v1 = remove_indentation(v1)
|
871
|
+
v2 = remove_indentation(v2)
|
872
|
+
end
|
864
873
|
# warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
|
865
874
|
[] if d == v1 + v2 # XXX Focus ArgumentError
|
866
875
|
end
|
data/test-data/det1.cddl
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
a = text .regexp "[a-z][a-z0-9]*(-[a-z0-9]+)*"
|
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.26
|
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-07-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: cbor-diag
|
@@ -135,6 +135,7 @@ files:
|
|
135
135
|
- test-data/cose.cddl
|
136
136
|
- test-data/dcaf.cddl
|
137
137
|
- test-data/dcaf1.cddl
|
138
|
+
- test-data/det1.cddl
|
138
139
|
- test-data/dotsize.cddl
|
139
140
|
- test-data/extractor-demo.cddl
|
140
141
|
- test-data/feat1.cddl
|
@@ -194,6 +195,7 @@ files:
|
|
194
195
|
- test-data/wrong2.cddl
|
195
196
|
- test-data/wrong2a.cddl
|
196
197
|
- test-data/xmlmig.cddl
|
198
|
+
- test-data/yangid.cddl
|
197
199
|
- test-data/yaron1.cddl
|
198
200
|
- test/test-cddl.rb
|
199
201
|
homepage: http://github.com/cabo/cddl
|
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
215
217
|
- !ruby/object:Gem::Version
|
216
218
|
version: '0'
|
217
219
|
requirements: []
|
218
|
-
rubygems_version: 3.2.
|
220
|
+
rubygems_version: 3.2.22
|
219
221
|
signing_key:
|
220
222
|
specification_version: 4
|
221
223
|
summary: CDDL generator and validator.
|