cddlc 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ebce64393cf5518aaaf97d1257771e4b0a7e0f3318f0c1ba7a2c0a3342de9f
-  data.tar.gz: 6dd472b20440724ce78aa6bc87a858b29d8b81b8137b7f583afed016285e0e2b
+  metadata.gz: 6d01061fd86124e6e68aae0a7ef043d23c9a2211992f9421e9333c50d8a870ee
+  data.tar.gz: 7efe567eeca90c756dac4354791583cae6da812b05eaf4074dfb953f71d09adb
 SHA512:
-  metadata.gz: 31b74e7d6fc4fce123d2289c7323d8dcbc91704f16851c509938bc89d786a4850c8abd373247c931c1a5a078e310ab0b539900b514626d8dcaa24e5c33fb3067
-  data.tar.gz: a3c9e1683b8bf909cd4c946b2396794172fd1c6f8d66814af36bb209ab65524da4c5f61b920d0836b91d39d53bd7c784156b22989e99946c166b34c6b3dca0f3
+  metadata.gz: c051e4c6c4e319e223dc8126512ffe8c7368b985735c8b15b34ac3ae5dad183f7f80f74e3a4b90f1679877472c8c5a0968f38d73994fc4e3dbb8669a39938c09
+  data.tar.gz: 29fce82dbdfd0bf5e14184b8445d3281a648fdd3f1fb982e37020317c23b94100449d21fed9a609a2f041fdc4a035c7842e23f861b5730480f9a828963122fef

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{cddlc implements converters and miscellaneous tools for CDDL, RFC 8610}
   s.author = "Carsten Bormann"

data/lib/writer/cddl-writer.rb

@@ -2,6 +2,32 @@ require_relative "../cddlc.rb"
 
 class CDDL
 
+  # In each specific case, use the appropriate subset
+  ESCAPED_STRING_MAPPINGS = Hash[[
+                                   ["\x08", "b"],
+                                   ["\x09", "t"],
+                                   ["\x0A", "n"],
+                                   ["\x0C", "f"],
+                                   ["\x0D", "r"],
+                                   ["\x22", "\""],
+                                   ["\x27", "'"],
+                                   ["\x2F", "/"],
+                                   ["\x5C", "\\"],
+                                 ]]
+
+  # TODO: Enable selecting Unicode-friendly variants
+  def escape_string(s)
+    s.gsub(/[^\n !#-\[\]-~]/) {|ch|
+      if m = ESCAPED_STRING_MAPPINGS[ch]
+        "\\#{m}"
+      elsif (o = ch.ord) < 0x10000
+        "\\u#{"%04x" % o}"
+      else
+        "\\u{#{"%x" % o}}"
+      end
+    }
+  end
+
   def write_lhs(k, parmnames)
     if parmnames
       "#{k}<#{parmnames.join(", ")}>"
@@ -104,7 +130,7 @@ class CDDL
     in ["bytes", t]
       [4, t]                    # XXX not very clean
     in ["text", t]
-      [4, "\"#{t}\""]           # XXX escape
+      [4, "\"#{escape_string(t)}\""]
     in ["number", t]
       [4, t.to_s]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler