automotive-ecu 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05b1f41faab9eb4a9ffb33697b015f0242d64450f25bedf6ce47aef2aac08ca
-  data.tar.gz: ecdc24755f8244e51a2bc20ee9efef50f3e40be5f6a2d5f678d5bdea462f5c8b
+  metadata.gz: 75ae19b7bbf77cd45e42cc9e6b5138d19e85101df900fe844e3102bf18ac2c79
+  data.tar.gz: ecbc4929534d9245169ca0eaa7518df4fb18a08727b66244f4b6382a053af827
 SHA512:
-  metadata.gz: 1b92c416a9dacb5dd9c28afd30bdf9de68e31390977612752bf23365cf9a9b93894d7e4641bb5629832debb237d549fb4f38c475b2b55ad812c271b99b193e52
-  data.tar.gz: f8548dd035ac77f453d2b36717f398107d16207febfb886bc26964a6c84ef1582b0e41ea1039fed4b3afc0ebd48a8230e21eb47255d1064c71ae6f5ab90c9e74
+  metadata.gz: ff02d2b04386b8129d249be984934bcda8d53bd5f24057541f36c555152cbda2b008ac9ee1d4bdfec90d67fdcbc2c0455c0eaac2d5df524f44b857d21cad0cf2
+  data.tar.gz: fef42ccdfe5947851955aad5fc2655cabd047576268310da2cc1b6606e3c4390f6db91907a21b24710140149dfafd8b74670ac2aa701009a9ba8c9f4625d872b

data/bin/sandbox

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/ecu/combined_list" 
+
+begin
+  list = Ecu::CombinedList.from_file('spec/fixtures/lab/advanced.lab')
+  list.labels.each do |item|
+    puts item
+  end
+  list.signals.each do |item|
+    puts item.description
+  end
+rescue Ecu::LabParserError => e
+  puts e.message
+  puts e.context
+end

data/lib/ecu/combined_list.rb

@@ -6,6 +6,15 @@ require_relative "interfaces/lab/combined_list"
 class Ecu
   class CombinedList
 
+    def self.from_file(file_path)
+      case File.extname(file_path)
+      when ".lab" then self.from_lab(File.read_encoded(file_path))
+      when ".a2l" then self.from_a2l(File.read_encoded(file_path))
+      when ".dbc" then self.from_dbc(File.read_encoded(file_path))
+      else fail "Unknown file extension: #{file_path}!"
+      end
+    end
+
     def initialize(signals=SignalList.new, labels=LabelList.new, headers=[], subheaders=[])
       @signals    = signals
       @labels     = labels

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

@@ -39,7 +39,7 @@ class Ecu
               case tok
               in :HEADER  then next_state(:POST_HEADER)
               in :COMMENT then add_header(lexer.token_value)
-              in :NEWLINE
+              in :NEWLINE then # noop
               end
             in :POST_HEADER
               case tok
@@ -77,11 +77,7 @@ class Ecu
               end
             in :LABEL_CONTENT
               case tok
-              in :"ST/X"      then start_property(:"ST/X",      :NUMERIC_PROPERTY)
-              in :"ST/Y"      then start_property(:"ST/Y",      :NUMERIC_PROPERTY)
               in :WERT        then start_property(:WERT,        :NUMERIC_PROPERTY)
-              in :"ST_TX/X"   then start_property(:"ST_TX/X",   :TEXT_PROPERTY)
-              in :"ST_TX/Y"   then start_property(:"ST_TX/Y",   :TEXT_PROPERTY)
               in :TEXT        then start_property(:TEXT,        :TEXT_PROPERTY)
               in :EINHEIT_X   then start_property(:EINHEIT_X,   :TEXT_PROPERTY)
               in :EINHEIT_Y   then start_property(:EINHEIT_Y,   :TEXT_PROPERTY)
@@ -90,6 +86,10 @@ class Ecu
               in :FUNKTION    then start_property(:FUNKTION,    :ID_PROPERTY)
               in :DISPLAYNAME then start_property(:DISPLAYNAME, :ID_PROPERTY)
               in :END         then labels << finish_label
+              in :"ST/X"      then start_property(:"ST/X",      :NUMERIC_PROPERTY)
+              in :"ST/Y"      then start_property(:"ST/Y",      :NUMERIC_PROPERTY)
+              in :"ST_TX/X"   then start_property(:"ST_TX/X",   :TEXT_PROPERTY)
+              in :"ST_TX/Y"   then start_property(:"ST_TX/Y",   :TEXT_PROPERTY)
               in :NEWLINE     then # noop, DCM badly formatted
               in :COMMENT     then # noop, some programs add SST in comments
               end

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

@@ -21,6 +21,13 @@ class Ecu
         .then { new(*_1, true) }
     end
 
+    def self.from_dcm_partial(str)
+      str
+        .then { DCM_HEADER + "\n\n" + _1 }
+        .then { from_dcm(_1) }
+        .first
+    end
+
     def to_dcm(indented=false)
       out = []
 

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

@@ -0,0 +1,9 @@
+require "json"
+
+class Ecu
+  class LabelList
+    def to_json
+      self.map(&:to_h).to_json
+    end
+  end
+end

data/lib/ecu/interfaces/lab/combined_list.rb

@@ -4,7 +4,7 @@ require_relative "label_list"
 class Ecu
   class CombinedList
     def self.from_lab(str)
-      signals, labels, headers, subheaders = LabParser.call(str)
+      signals, labels, headers, subheaders = LabParser.new(str).call
       new(signals, labels, headers, subheaders)
     end
 

data/lib/ecu/interfaces/lab/lab_lexer.rb

@@ -0,0 +1,57 @@
+require "strscan"
+
+class Ecu
+  class LabLexer
+    attr_reader :doc
+    def initialize(doc)
+      @doc  = doc
+      @scan = StringScanner.new(doc)
+    end
+
+    KEYWORDS = [
+      "[SETTINGS]",
+      "[RAMCELL]",
+      "[Label]",
+    ].freeze
+
+    NEWLINE         = %r{ \r\n|\n }x
+    SETTINGS_HEADER = %r{ \[SETTINGS\]\s*#{NEWLINE} }x
+    LABELS_HEADER   = %r{ \[Label\]\s*#{NEWLINE}    }x
+    SIGNALS_HEADER  = %r{ \[RAMCELL\]\s*#{NEWLINE}  }x
+    STRING          = %r{ [^\r\n;]+ }x
+    WHITESPACE      = %r{ [ \t]+ }x
+    SEPARATOR       = %r{ [;] }x
+    COMMENT         = %r{ ^[;].*$ }x
+
+    def next_token(state)
+      @scan.skip(WHITESPACE)
+
+      return if @scan.eos?
+
+      case
+      when @scan.skip(SETTINGS_HEADER)                     then :SETTINGS_HEADER
+      when @scan.skip(LABELS_HEADER)                       then :LABELS_HEADER
+      when @scan.skip("[LABEL]\n")                         then :LABELS_HEADER
+      when @scan.skip(SIGNALS_HEADER)                      then :SIGNALS_HEADER
+      when @scan.skip(STRING)                              then :STRING
+      when @scan.beginning_of_line? && @scan.skip(COMMENT) then :COMMENT
+      when @scan.skip(SEPARATOR)                           then :SEPARATOR
+      when @scan.skip(NEWLINE)                             then :NEWLINE
+      when @scan.skip(ANYTHING)                            then :ANYTHING
+
+      else
+        @scan.getch
+        :UNKNOWN_CHAR
+      end
+    end
+
+    def token_value
+      @doc.byteslice(@scan.pos - @scan.matched_size, @scan.matched_size)
+    end
+
+    def lineno
+      @doc.byteslice(0, @scan.pos).count("\n") +
+        (@scan.beginning_of_line? ? 0 : 1)
+    end
+  end
+end

data/lib/ecu/interfaces/lab/lab_parser.rb

@@ -1,61 +1,132 @@
 require_relative "../../labels"
 require_relative "../../signals"
 
-class LabParser
-  def self.call(str)
-    lines = str.lines
-
-    [
-      extract_signals(block_bounded_by(lines, "[RAMCELL]", /\A\[/)),
-      extract_labels(block_bounded_by(lines, "[Label]", /\A\[/)),
-      extract_headers(block_bounded_by(lines, 0, "[SETTINGS]")),
-      extract_headers(block_bounded_by(lines, "[SETTINGS]", /\A\[/)),
-    ]
-  end
+require_relative "lab_lexer"
+require_relative "lab_parser_error"
 
-  def self.extract_labels(lines)
-    Ecu::LabelList.new lines.
-      reject { |l| l.blank? }.
-      reject { |l| l.start_with?(";") }.
-      map { |l| Ecu::Label.from_lab(l) }
-  end
+class Ecu
+  class LabParser
 
-  def self.extract_signals(lines)
-    Ecu::SignalList.new lines.
-      reject { |l| l.blank? }.
-      reject { |l| l.start_with?(";") }.
-      map { |l| Ecu::Signal.from_lab(l) }
-  end
+    attr_reader :lexer, :state, :labels, :signals, :headers, :subheaders
+    def initialize(doc)
+      @lexer      = LabLexer.new(doc)
+      @state      = :NO_SECTION
+      @signals    = []
+      @labels     = []
+      @headers    = []
+      @subheaders = []
+      reset_entry!
+    end
 
-  def self.extract_headers(lines)
-    lines.
-      select { |l| l.match(/\A; /) }.
-      map { |l| l[2..-1].chomp }
-  end
+    def reset_entry!
+      @properties = {}
+    end
 
-  def self.block_bounded_by(lines, upper, lower)
-    upper = case upper
-            when Integer then upper
-            when String
-              return [] unless lines.any? { |l| l.strip.downcase == upper.downcase }
-              lines.index { |l| l.strip.downcase == upper.downcase } + 1
-            when Regexp
-              return [] unless lines.any? { |l| l.match?(upper) }
-              lines.index { |l| l.match?(upper) } + 1
+    def call
+      while tok = lexer.next_token(state)
+        begin
+          case state
+          in :NO_SECTION
+            case tok
+            in :SETTINGS_HEADER then next_state(:SETTINGS)
+            in :SIGNALS_HEADER  then next_state(:SIGNALS)
+            in :LABELS_HEADER   then next_state(:LABELS)
+            in :COMMENT         then add_header(lexer.token_value)
+            in :NEWLINE         then # noop
+            end
+          in :SETTINGS
+            case tok
+            in :SIGNALS_HEADER then next_state(:SIGNALS)
+            in :LABELS_HEADER  then next_state(:LABELS)
+            in :COMMENT        then add_subheader(lexer.token_value)
+            in :STRING         then # save that shit?
+            in :SEPARATOR      then # now comes the value
+            in :NEWLINE        then # next setting
+            end
+          in :LABELS
+            case tok
+            in :SIGNALS_HEADER then next_state(:SIGNALS)
+            in :STRING         then start_label(lexer.token_value)
+            in :COMMENT        then # noop
+            in :NEWLINE        then # noop
+            end
+          in :SIGNALS
+            case tok
+            in :LABELS_HEADER  then next_state(:LABELS)
+            in :STRING         then start_signal(lexer.token_value)
+            in :COMMENT        then # noop
+            in :NEWLINE        then # noop
+            end
+          in :LABEL
+            case tok
+            in :NEWLINE        then labels << finish_label
+            in :SEPARATOR      then # noop, sometimes used as end separator
             end
+          in :SIGNAL
+            case tok
+            in :STRING         then add_property(lexer.token_value)
+            in :SEPARATOR      then # noop, next property
+            in :NEWLINE        then signals << finish_signal
+            end
+          end
+        rescue NoMatchingPatternError => e
+          raise LabParserError.new("Unexpected token #{debug_token(tok)} (state: #{state})", lexer)
+        rescue StandardError => e
+          raise LabParserError.new("#{e.message} (state: #{@state})", lexer)
+        end
+      end
+      [signals, labels, headers, subheaders]
+    end
 
-    segment = lines[upper..-1]
+    def debug_token(tok)
+      "#{tok}: \"#{lexer.token_value}\" - #{@properties.inspect}"
+    end
 
-    lower = case lower
-            when Integer then lower
-            when String
-              return lines[upper..-1] unless segment.any? { |l| l.strip.downcase == lower.downcase }
-              upper + segment.index { |l| l.strip.downcase == lower.downcase }
-            when Regexp
-              return lines[upper..-1] unless segment.any? { |l| l.match?(lower) }
-              upper + segment.index { |l| l.match?(lower) }
-            end
+    def next_state(newstate)
+      @state = newstate
+      yield if block_given?
+    end
+
+    def add_header(str)
+      @headers << str[1..].strip
+    end
+
+    def add_subheader(str)
+      @subheaders << str[1..].strip
+    end
+
+    def start_label(name)
+      next_state(:LABEL) do
+        @properties[:name] = name
+      end
+    end
+
+    def finish_label
+      Festwert.new(**@properties, value: nil).tap do
+        reset_entry!
+        next_state(:LABELS)
+      end
+    end
+
+    def start_signal(name)
+      next_state(:SIGNAL) do
+        @properties[:name] = name
+      end
+    end
+
+    def finish_signal
+      Signal.new(**@properties).tap do
+        reset_entry!
+        next_state(:SIGNALS)
+      end
+    end
 
-    lines[upper...lower]
+    def add_property(str)
+      case @properties
+      in { task:, description: } then @properties[:description] << " " << str
+      in { task:               } then @properties[:description] = str.strip
+      in { **                  } then @properties[:task] = str.split("&").first
+      end
+    end
   end
 end

data/lib/ecu/interfaces/lab/lab_parser_error.rb

@@ -0,0 +1,38 @@
+# TODO: This is exactly the same as the DcmParserError, maybe pull these
+# together?
+
+class Ecu
+  class LabParserError < StandardError
+
+    CTXLENGHT = 5
+
+    attr_reader :doc, :lineno
+    def initialize(msg, lexer)
+      @msg    = msg
+      @doc    = lexer.doc
+      @lineno = lexer.lineno
+    end
+
+    def message = @msg
+    def context
+      @doc
+        .lines[ctx_startline..ctx_endline]
+        .each
+        .with_index(ctx_startline + 1)
+        .map { |line, n| present(line, n, n == lineno) }
+    end
+
+    def present(line, n, highlight)
+      case highlight
+        when true  then fmt(n) + " => | " + line
+        when false then fmt(n) + "    | " + line
+      end
+    end
+
+    def ctx_startline = [0, lineno - CTXLENGHT].max
+    def ctx_endline   = @endline ||= [doc.lines.count - 1, lineno + CTXLENGHT].min
+    def fmt_str = "%#{(ctx_endline + 1).to_s.length}d"
+    def fmt(n)  = fmt_str % n
+
+  end
+end

data/lib/ecu/interfaces/lab/label.rb

@@ -1,19 +1,5 @@
 class Ecu
   class Label
-
-    # This is a silly hack, since the *.lab file doesn't contain any information
-    # about the label in question (just the name). Subsequently, just initialize
-    # a Festwert with no value and hope if does the job correctly
-
-    def self.from_lab(line)
-      name, description = line.strip.split(";")
-      if description.nil?
-        Festwert.new(name: name, value: nil)
-      else
-        Festwert.new(name: name, value: nil, description: description)
-      end
-    end
-
     def to_lab
       "#{name};#{description}"
     end

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

@@ -4,7 +4,7 @@ require_relative "lab_parser"
 class Ecu
   class LabelList
     def self.from_lab(str)
-      _, labels, headers, subheaders = LabParser.call(str)
+      _, labels, headers, subheaders = LabParser.new(str).call
       new(labels, headers, subheaders)
     end
 

data/lib/ecu/interfaces/lab/signal.rb

@@ -1,13 +1,5 @@
 class Ecu
   class Signal
-    def self.from_lab(line)
-      name, tasks, comment = line.strip.split(";")
-      maintask             = tasks.split("&").first rescue nil
-      new(name: name,
-          task: maintask,
-          description: comment&.strip)
-    end
-
     def to_lab
       "#{name};#{task};#{description}"
     end

data/lib/ecu/interfaces/lab/signal_list.rb

@@ -4,7 +4,7 @@ require_relative "lab_parser"
 class Ecu
   class SignalList
     def self.from_lab(str)
-      signals, _, headers, subheaders = LabParser.call(str)
+      signals, _, headers, subheaders = LabParser.new(str).call
       new(signals, headers, subheaders)
     end
 

data/lib/ecu/labels/label_list.rb

@@ -10,6 +10,7 @@ require_relative "../interfaces/dcm/label_list"
 require_relative "../interfaces/lab/label_list"
 require_relative "../interfaces/a2l/label_list"
 require_relative "../interfaces/mfile/label_list"
+require_relative "../interfaces/json/label_list"
 
 require "set"
 require_relative "../../core_ext"

data/lib/ecu/version.rb

@@ -1,3 +1,3 @@
 class Ecu
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: automotive-ecu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonas Mueller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-04 00:00:00.000000000 Z
+date: 2025-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -97,6 +97,7 @@ files:
 - bin/pry
 - bin/rake
 - bin/rspec
+- bin/sandbox
 - bin/setup
 - lib/core_ext.rb
 - lib/ecu.rb
@@ -119,8 +120,11 @@ files:
 - lib/ecu/interfaces/dcm/label.rb
 - lib/ecu/interfaces/dcm/label_list.rb
 - lib/ecu/interfaces/dcm/stuetzstellenverteilung.rb
+- lib/ecu/interfaces/json/label_list.rb
 - lib/ecu/interfaces/lab/combined_list.rb
+- lib/ecu/interfaces/lab/lab_lexer.rb
 - lib/ecu/interfaces/lab/lab_parser.rb
+- lib/ecu/interfaces/lab/lab_parser_error.rb
 - lib/ecu/interfaces/lab/label.rb
 - lib/ecu/interfaces/lab/label_list.rb
 - lib/ecu/interfaces/lab/signal.rb