automotive-ecu 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52253becc23cc2f6a9e2da39535fc6b7b7f9332ff42c09f5b547ffa32984eb9b
-  data.tar.gz: 31454568e63eaafc261c4967422b35ddaa6582cdd4af99b24f9bd2e10dfa7698
+  metadata.gz: 4ad47ed36e2d54205a5c804187b85e2f2a7b91d73f2fc1bc548f691a87804c88
+  data.tar.gz: 2ab14530309248995b479e9dc4010bf61a83f767efd62ddf9b739686791aaae5
 SHA512:
-  metadata.gz: 8bb7e3726537a3d979f06880ce13c8637fe22a458fe83eb72bfe73f9b7b650dfe82d80e1d343c791e14b2e0daccbd7ed36fca83942a0ee003d0b1a0644c4a250
-  data.tar.gz: 95826e4c5797ec1a7ab7a990061671c07be15e23f32917e2b8a28d7f1b65a364ab820dfa29b361639e9e6d511d70257cbd7ffbce60d7b8e3433b336ed02468a5
+  metadata.gz: de3516033d423a95b0c813f3e22eed22a0195fbbf5c4d7b2dc6f3604d897d59bd4b7bc46f0b527651fa5f3c1ffecec4cc3642e3f1482033b0104154088abdb44
+  data.tar.gz: ebaf253e55c358547cb63ad4024a8bf0e90c6bb7a529b5ab30a9117593436aacd15d546bd226a5cf7a02156edfe2193c94e67f51e59fc9545c6b9688cd35b45b

data/lib/ecu/interfaces/dcm/dcm_lexer.rb

@@ -48,12 +48,12 @@ class Ecu
 
         return if @scan.eos?
 
-        case @scan.peek(1)
-        when "\n", "\r" then @scan.skip(NEWLINE) && :NEWLINE
-        when '"'        then @scan.skip(QUOTED_TEXT) && :QUOTED_TEXT
-        when '*'        then @scan.skip(COMMENT) && :COMMENT
-        when '@'        then @scan.skip(DIMENSIONS_SEP) && :DIMENSIONS_SEP
-        when '-', '+', '.', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+        case @doc.getbyte(@scan.pos)
+        when 10, 13          then @scan.skip(NEWLINE) && :NEWLINE           # \n \r
+        when 34              then @scan.skip(QUOTED_TEXT) && :QUOTED_TEXT   # "
+        when 42              then @scan.skip(COMMENT) && :COMMENT           # *
+        when 64              then @scan.skip(DIMENSIONS_SEP) && :DIMENSIONS_SEP # @
+        when 43, 45, 46, 48..57                                             # + - . 0-9
           if    @scan.skip(FLOAT) then :FLOAT
           elsif @scan.skip(INT)   then :INT
           else  @scan.getch;           :UNKNOWN_CHAR

data/lib/ecu/interfaces/dcm/dcm_parser.rb

@@ -158,10 +158,8 @@ class Ecu
 
       def finish_label
         next_state(:POST_HEADER) do
-          @properties
-            .except(:displayname)
-            .then { @constructor.new(**_1) }
-            .tap { reset_label! }
+          @properties.delete(:displayname)
+          @constructor.new(**@properties).tap { reset_label! }
         end
       end
 
@@ -186,7 +184,12 @@ class Ecu
         next_state(newstate) do
           @key    = KEY_MAPPING[key]
           @is_ary = ARY_PROPERTIES.include?(@key)
-          @value  = @is_ary ? [] : nil
+          if @is_ary
+            @properties[@key] ||= []
+            @value = @properties[@key]   # alias: append_property writes directly to target
+          else
+            @value = nil
+          end
         end
       end
 
@@ -202,15 +205,10 @@ class Ecu
 
       def finish_property
         next_state(:LABEL_CONTENT) do
-          if @properties.key?(@key)
-            if @is_ary
-              @properties[@key].concat(@value)
-            else
-              fail "Multiple property lines not allowed for #{@key}"
-            end
-          else
-            @properties[@key] = @value
-          end
+          next if @is_ary  # values already in @properties[@key] via @value alias
+
+          fail "Multiple property lines not allowed for #{@key}" if @properties.key?(@key)
+          @properties[@key] = @value
         end
       end
 

data/lib/ecu/interfaces/dcm/festwert.rb

@@ -7,10 +7,11 @@ class Ecu
         str << "  LANGNAME #{description.enquote}\n" if description
         str << "  FUNKTION #{function}\n"            if function
         str << "  EINHEIT_W #{unit.enquote}\n"       if unit
-        str << case value
-               when Numeric then "  WERT #{value}\n"
-               when String  then "  TEXT #{value.enquote}\n"
-               end
+        if value.is_a?(Numeric)
+          str << "  WERT " << value.to_s << "\n"
+        else
+          str << "  TEXT " << value.enquote << "\n"
+        end
         str << "END\n"
       end
     end

data/lib/ecu/interfaces/dcm/label_list.rb

@@ -29,21 +29,23 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      out = []
+      buf = String.new
 
       unless headers.empty?
-        out += headers.map { "* " + _1 }.push("")
+        headers.each { buf << "* " << _1 << "\n" }
+        buf << "\n"
       end
 
-      out << DCM_HEADER << ""
+      buf << DCM_HEADER << "\n"
 
       unless subheaders.empty?
-        out += subheaders.map { "* " + _1 }.push("")
+        buf << "\n"
+        subheaders.each { buf << "* " << _1 << "\n" }
       end
 
-      out += map { _1.to_dcm(indented) }
+      each { buf << "\n" << _1.to_dcm(indented) }
 
-      out.join("\n")
+      buf
     end
   end
 end

data/lib/ecu/version.rb

@@ -1,3 +1,3 @@
 class Ecu
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automotive-ecu
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jonas Mueller