automotive-ecu 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52253becc23cc2f6a9e2da39535fc6b7b7f9332ff42c09f5b547ffa32984eb9b
-  data.tar.gz: 31454568e63eaafc261c4967422b35ddaa6582cdd4af99b24f9bd2e10dfa7698
+  metadata.gz: fb1a271295db80e88f49dff193115be32c7615485818d3b39b5af7a6c6e153a2
+  data.tar.gz: fd7bc67a0a75965cd659d812de45017f0e18581dadcb7cad4138e10abbd87109
 SHA512:
-  metadata.gz: 8bb7e3726537a3d979f06880ce13c8637fe22a458fe83eb72bfe73f9b7b650dfe82d80e1d343c791e14b2e0daccbd7ed36fca83942a0ee003d0b1a0644c4a250
-  data.tar.gz: 95826e4c5797ec1a7ab7a990061671c07be15e23f32917e2b8a28d7f1b65a364ab820dfa29b361639e9e6d511d70257cbd7ffbce60d7b8e3433b336ed02468a5
+  metadata.gz: 2f81b12bb0040f73348c996c4ed99a060a08036a77fd0d873b8b1897674354a8c96e77af239fa7ddad4b03ffc77606a44af1856c003446f784561e531543a3c8
+  data.tar.gz: 03cfce4b5c36725aa715e2e04deecb0baef10c5548aa2befa64ea9b0724e5d4b0a5d515343da28235a0839c5a230c91b6871eb8b622098dc7497f4da72ac6800

data/bin/console

@@ -2,13 +2,6 @@
 
 require "bundler/setup"
 require "ecu"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
 require "irb"
+
 IRB.start

data/lib/core_ext.rb

@@ -16,14 +16,6 @@ class String
   def enquote
     "\"#{to_s}\""
   end
-
-  def to_regexp(ignorecase: false, multiline: false, extended: false)
-    options = 0
-    options = options | Regexp::EXTENDED   if extended
-    options = options | Regexp::IGNORECASE if ignorecase
-    options = options | Regexp::MULTILINE  if multiline
-    Regexp.new(self, options)
-  end
 end
 
 class Array

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "strscan"
 
 class Ecu
@@ -44,16 +46,19 @@ class Ecu
 
 
       def next_token
+        # This is a hot path during DCM parsing. Make sure to optimize
+        # here are far as possible
+
         @scan.skip(WHITESPACE)
 
         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
@@ -71,6 +76,11 @@ class Ecu
         @scan.matched
       end
 
+      # Extracts quoted-text content without surrounding quotes in a single allocation.
+      def quoted_value
+        @scan.string.byteslice(@scan.pos - @scan.matched_size + 1, @scan.matched_size - 2)
+      end
+
       def lineno
         @doc.byteslice(0, @scan.pos).count("\n") +
           (@scan.beginning_of_line? ? 0 : 1)

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

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 require_relative "dcm_lexer"
 require_relative "dcm_parser_error"
+require "set"
 
 class Ecu
   class LabelList
     class DcmParser
 
-      ARY_PROPERTIES = %i( xvalue yvalue value )
+      ARY_PROPERTIES = Set.new([:xvalue, :yvalue, :value]).freeze
       KEY_MAPPING = {
         "ST/X":         :xvalue,
         "ST/Y":         :yvalue,
@@ -28,6 +31,7 @@ class Ecu
         @labels     = []
         @headers    = []
         @subheaders = []
+        @properties = {}
         reset_label!
       end
 
@@ -108,7 +112,7 @@ class Ecu
               end
             when :TEXT_PROPERTY
               case tok
-              when :QUOTED_TEXT then append_property(lexer.token_value[1..-2])
+              when :QUOTED_TEXT then append_property(lexer.quoted_value)
               when :NEWLINE     then finish_property
               else raise DcmParserError.new("Unexpected token #{debug_token(tok)} (state: #{@state})", lexer)
               end
@@ -158,10 +162,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 +188,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,21 +209,16 @@ 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
 
       def reset_label!
         @constructor = nil
-        @properties  = {}
+        @properties.clear
         @key         = nil
         @is_ary      = false
         @value       = nil

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/labels/festwert.rb

@@ -54,5 +54,14 @@ class Ecu
     def equality_properties
       [:name, :value]
     end
+
+    def self.sample(suffix="")
+      new \
+        name:        PropertyGenerator.name(prefix: "PAR", suffix: suffix),
+        value:       PropertyGenerator.value([true, false].sample),
+        unit:        PropertyGenerator.unit,
+        function:    PropertyGenerator.function,
+        description: PropertyGenerator.description
+    end
   end
 end

data/lib/ecu/labels/festwerteblock.rb

@@ -66,6 +66,20 @@ class Ecu
       [:name, :value]
     end
 
+    def self.sample(suffix="")
+      xdim    = (1..10).to_a.sample
+      ydim    = (1..10).to_a.sample
+      numeric = [true, false].sample
+      new \
+        name: PropertyGenerator.name(prefix: %w(VEC MAT).sample, suffix: suffix),
+        xdim: xdim,
+        ydim: ydim,
+        value: ydim.times.map { xdim.times.map { PropertyGenerator.value(numeric) } },
+        unit: PropertyGenerator.unit,
+        function: PropertyGenerator.function,
+        description: PropertyGenerator.description
+    end
+
     private
 
     def reshape_if_needed(value, xdim, ydim)

data/lib/ecu/labels/kennfeld.rb

@@ -105,5 +105,24 @@ class Ecu
       [:name, :xvalue, :yvalue, :value]
     end
 
+    def self.sample(suffix="")
+      xdim     = (2..10).to_a.sample
+      ydim     = (2..10).to_a.sample
+      xnumeric = [true, true, false].sample
+      ynumeric = [true, true, false].sample
+      numeric  = [true, true, false].sample
+      new \
+        name:        PropertyGenerator.name(prefix: "MAP", suffix: suffix),
+        xdim:        xdim,
+        ydim:        ydim,
+        xvalue:      xdim.times.map { PropertyGenerator.value(xnumeric) },
+        yvalue:      ydim.times.map { PropertyGenerator.value(ynumeric) },
+        value:       ydim.times.map { xdim.times.map { PropertyGenerator.value(numeric) } },
+        xunit:       PropertyGenerator.unit,
+        yunit:       PropertyGenerator.unit,
+        unit:        PropertyGenerator.unit,
+        function:    PropertyGenerator.function,
+        description: PropertyGenerator.description
+    end
   end
 end

data/lib/ecu/labels/kennlinie.rb

@@ -80,5 +80,19 @@ class Ecu
       [:name, :xvalue, :value, :type]
     end
 
+    def self.sample(suffix="")
+      xdim     = (1..10).to_a.sample
+      xnumeric = [true, false].sample
+      numeric  = [true, false].sample
+      new \
+        name:        PropertyGenerator.name(prefix: "CRV", suffix: suffix),
+        xdim:        xdim,
+        xvalue:      xdim.times.map { PropertyGenerator.value(xnumeric) },
+        value:       xdim.times.map { PropertyGenerator.value(numeric) },
+        unit:        PropertyGenerator.unit,
+        xunit:       PropertyGenerator.unit,
+        function:    PropertyGenerator.function,
+        description: PropertyGenerator.description
+    end
   end
 end

data/lib/ecu/labels/label.rb

@@ -1,6 +1,7 @@
 require_relative "../interfaces/dcm/label"
 require_relative "../interfaces/lab/label"
 
+require_relative "property_generator"
 require_relative "value_comparison"
 require_relative "value_printer"
 

data/lib/ecu/labels/property_generator.rb

@@ -0,0 +1,38 @@
+class Ecu
+  class PropertyGenerator
+    PREFIXES = %w(PAR VEC MAT CRV MAP)
+    FCN1 = %w(Ldp Dmc Dcr Wc Sns)
+    FCN2 = %w(Pa Etf Btf Ca Tqz Msc Tqx Tqa Tqb)
+    TYPE = %w(ww tqw st a ax cw b sx vx v r)
+    LOC = %w(FL FR RL RR FA RA)
+    DESC = %w(Foo Bar Baz Lala Hulu)
+    UNIT = %w(Nm rad/s m s m/s^2 m/s -)
+
+    def self.name(prefix: nil, suffix: "")
+      (prefix || PREFIXES.sample) + "_" +
+        FCN1.sample + FCN2.sample + "_" +
+        TYPE.sample + (LOC + [""]).sample + "_" +
+        DESC.sample + DESC.sample + suffix.to_s
+    end
+
+    def self.unit
+      UNIT.sample
+    end
+
+    def self.function
+      FCN1.sample + FCN2.sample
+    end
+
+    def self.description
+      "foo bar"
+    end
+
+    def self.value(numeric=true)
+      if numeric
+        rand(-1e3..1e3)
+      else
+        %w(true false).sample
+      end
+    end
+  end
+end

data/lib/ecu/labels/stuetzstellenverteilung.rb

@@ -61,5 +61,16 @@ class Ecu
       [:name, :xvalue]
     end
 
+    def self.sample(suffix="")
+      xdim = (1..10).to_a.sample
+      numeric = [true, false].sample
+      new \
+        name: PropertyGenerator.name(prefix: %w(AXX AXY).sample, suffix: suffix),
+        xdim: xdim,
+        xvalue: xdim.times.map { PropertyGenerator.value(numeric) },
+        xunit: PropertyGenerator.unit,
+        function: PropertyGenerator.function,
+        description: PropertyGenerator.description
+    end
   end
 end

data/lib/ecu/version.rb

@@ -1,3 +1,3 @@
 class Ecu
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 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.3
 platform: ruby
 authors:
 - Jonas Mueller
@@ -87,15 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/bundle
-- bin/coderay
 - bin/console
 - bin/htmldiff
-- bin/irb
 - bin/ldiff
-- bin/pry
-- bin/rake
-- bin/rspec
 - bin/sandbox
 - bin/setup
 - lib/core_ext.rb
@@ -143,6 +137,7 @@ files:
 - lib/ecu/labels/label.rb
 - lib/ecu/labels/label_list.rb
 - lib/ecu/labels/label_list_comparison.rb
+- lib/ecu/labels/property_generator.rb
 - lib/ecu/labels/stuetzstellenverteilung.rb
 - lib/ecu/labels/value_comparison.rb
 - lib/ecu/labels/value_printer.rb
@@ -169,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.14
 specification_version: 4
 summary: A simple API for managing automotive ecu signals and labels
 test_files: []

data/bin/bundle

@@ -1,114 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'bundle' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-  module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("../../gems.rb", __FILE__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_version
-    @bundler_version ||=
-      env_var_version || cli_arg_version ||
-        lockfile_version
-  end
-
-  def bundler_requirement
-    return "#{Gem::Requirement.default}.a" unless bundler_version
-
-    bundler_gem_version = Gem::Version.new(bundler_version)
-
-    requirement = bundler_gem_version.approximate_recommendation
-
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
-
-    requirement += ".a" if bundler_gem_version.prerelease?
-
-    requirement
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    activate_bundler
-  end
-
-  def activate_bundler
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end

data/bin/coderay

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'coderay' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("coderay", "coderay")

data/bin/irb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'irb' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("irb", "irb")

data/bin/pry

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'pry' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("pry", "pry")

data/bin/rake

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")