cddl 0.8.25 → 0.8.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f2e513842da8f3086dcdfa5e6cafdade09e3e098ca20b68855fcfff7d8ee52ec
4
- data.tar.gz: e78425bd7a93c1da2ae319a332fca9a90cab0e42deaa09e20af7a3fc330a369a
3
+ metadata.gz: 47f3304378cd8f42807f0b96551a9b8cd5c609741d9a1e508c7c68913bf591d0
4
+ data.tar.gz: 312535858550c20a3415238c8f26b5c96f2036707e305bd6665b12bb73e4addc
5
5
  SHA512:
6
- metadata.gz: 7e3dda08f71e21cff6ddebf1d67a6252145f560203d4ec411b5aad4473e11c5635c36a518e58915ae5a6ced00c0cbb6a55d1a50c6687fdb6000c3113ed1cd311
7
- data.tar.gz: eed4acc73dac34d3a7715bfa853c8c9638d146c75a6742af420aadef39e7ad5b75fde2f297164d3818d4d4737844e9d8e779d48ed4899fa2b9f79927c8ca3cc3
6
+ metadata.gz: 36ef0f6662d44814da072251405894b4b70ef20a6a493e8de7b597ece370e774cbf8fe8d2da35c2baa5f8b08adffc1a98dffaf1535907aca11a1a3936b11286a
7
+ data.tar.gz: a6a731d5d348156deb0b2e3415bf6c944198bcfc7ca33632ee7f4d40e07ce832bbcadcc1b4bab4d8f75653932b9f82cba2c4ccbef662af49c81554edb2e77480
data/cddl.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  spec = Gem::Specification.new do |s|
2
2
  s.name = 'cddl'
3
- s.version = '0.8.25'
3
+ s.version = '0.8.26'
4
4
  s.summary = "CDDL generator and validator."
5
5
  s.description = %{A parser, generator, and validator for CDDL}
6
6
  s.add_dependency('cbor-diag')
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
- rhs = remove_indentation(rhs) if conop == :det
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
- v2 = remove_indentation(v2) if conop == :det
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
- v2 = remove_indentation(v2) if conop == :det
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
@@ -0,0 +1,12 @@
1
+ bar = ["" .cat foo, "" .cat cbor-tags-oid]
2
+
3
+ foo = '' .det cbor-tags-oid
4
+
5
+ cbor-tags-oid = '
6
+ oid = 1*arc
7
+ roid = *arc
8
+ arc = [nlsb] %x00-7f
9
+ nlsb = %x81-ff *%x80-ff
10
+ ' .det ''
11
+
12
+ cbor-tags-oid-decrypted = cbor-tags-oid .det (([]) .det ([]))
@@ -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.25
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-06-16 00:00:00.000000000 Z
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.15
220
+ rubygems_version: 3.2.22
219
221
  signing_key:
220
222
  specification_version: 4
221
223
  summary: CDDL generator and validator.