kicad 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea6528c30596177b5286780246f20331ff0a82109b527d0c311e5aca88d6b42
-  data.tar.gz: b439278fbd1dd60ff5f931f67d7f6009517b179937b16cf0998de12beb3d8e1e
+  metadata.gz: 679cc2e86c98081d38458ec0503b64fc176dec709a412bcc8fcee6ff1ccc9fbc
+  data.tar.gz: 5c4c4d2e0fa767c8c9c841f3235f7124c6f81b4aef66841e24c0e652b17dad52
 SHA512:
-  metadata.gz: 57e43e2a123bb69b0497b7fd62cf66a54e5fcec279b3047dfdc7701bf8ae7016c33bfdc63fb298c28628a90a6e232b601e2eb0729495d8c4c8b4000dd9bb13f7
-  data.tar.gz: 7a4474f86498962aa00c14aee3dc89a4a8c7d0d73aa66eee185cd526928b0286fd15a08762cd8604ce1fdcde651c65ed3348ba1a3e960c3bf5e034ca19d78871
+  metadata.gz: ae34e7b3091ed815b836ca0f5f3f9f73ba5c622411279122f436949bb1a9e372c5d440795ba1f494cec5f5033a51f65578405c574ff70591a3db42640d5d7011
+  data.tar.gz: 8cf7ebfc425f27b4bd89389db45c6f3528236dd2c534b930a3102f5d06931ab383883db724d898f7eb67d518fdb5127aa384d91df74ef6fe03f59269f050d7d1

data/.gitignore

@@ -1,3 +1,2 @@
 sample.*
 *.swp
-lib/kicad/grammar.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kicad (0.8.0)
+    kicad (0.8.1)
       irb (~> 1.14, >= 1.14)
       treetop (~> 1.6, >= 1.6.9)
 
@@ -9,7 +9,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     date (3.4.1)
-    diff-lcs (1.6.1)
     io-console (0.8.0)
     irb (1.15.2)
       pp (>= 0.6.0)
@@ -27,19 +26,6 @@ GEM
       psych (>= 4.0.0)
     reline (0.6.1)
       io-console (~> 0.5)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.3)
     stringio (3.1.7)
     treetop (1.6.14)
       polyglot (~> 0.3)
@@ -51,8 +37,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.11)
   kicad!
-  rake (>= 13)
-  rspec (~> 3.3)
+  rake (~> 13)
 
 BUNDLED WITH
    2.6.2

data/README.md

@@ -4,19 +4,13 @@ Parse, load, modify and rewrite Kicad (s-epression) files into a convenient tree
 
 ## Installation
 
-    ```ruby
-    gem 'kicad'
-    ```
-
-or
-
     gem install kicad
 
 ## Usage
 
     $ irb -r kicad
-    irb(main):001> k = KiCad.load("my_file.kicad_lib").value
-    irb(main):001> k.children.filter{|c| c === KiCad::AST::Symbol}.map{|c| c.values[1]}
+    irb(main):001> k = KiCad.load("my_file.kicad_sym").value
+    irb(main):001> k.children.filter{|c| KiCad::AST::Symbol === c }.map{|c| c.values[1]}
     ["BC107", "CD4046"]
     irb(main):001> puts k.emit
     ...

data/kicad.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", ">= 1.11"
   spec.add_development_dependency "rake", "~> 13"
 
   spec.add_runtime_dependency "treetop", ["~> 1.6", ">= 1.6.9"]

data/lib/kicad/grammar.rb

@@ -0,0 +1,539 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+require 'kicad/ast'
+
+module KiCad
+  module SExpr
+    include Treetop::Runtime
+
+    def root
+      @root ||= :node
+    end
+
+    module Node0
+      def value
+        elements[0]
+      end
+
+      def s
+        elements[1]
+      end
+    end
+
+    module Node1
+      def node
+        elements[0]
+      end
+
+      def s
+        elements[1]
+      end
+    end
+
+    module Node2
+      def s1
+        elements[1]
+      end
+
+      def values
+        elements[2]
+      end
+
+      def nodes
+        elements[3]
+      end
+
+      def s2
+        elements[5]
+      end
+    end
+
+    module Node3
+      def value
+               klass_name = values.elements[0].value.value
+               klass = KiCad::AST::Node
+               if klass_name.is_a? ::Symbol  # See if we have a defined class for this node type
+                 klass_name = klass_name.to_s.gsub(/\A[a-z]|_[a-z]/) {|from| from[-1].upcase }
+                 klass = KiCad::AST.const_get(klass_name, false) rescue KiCad::AST::Node
+               end
+               klass.new values.elements.map(&:value).map(&:value),
+                         nodes.elements.map(&:node).map(&:value)
+             end
+    end
+
+    def _nt_node
+      start_index = index
+      if node_cache[:node].has_key?(index)
+        cached = node_cache[:node][index]
+        if cached
+          node_cache[:node][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      if (match_len = has_terminal?('(', false, index))
+        r1 = true
+        @index += match_len
+      else
+        terminal_parse_failure('\'(\'')
+        r1 = nil
+      end
+      s0 << r1
+      if r1
+        r2 = _nt_s
+        s0 << r2
+        if r2
+          s3, i3 = [], index
+          loop do
+            i4, s4 = index, []
+            r5 = _nt_value
+            s4 << r5
+            if r5
+              r6 = _nt_s
+              s4 << r6
+            end
+            if s4.last
+              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+              r4.extend(Node0)
+            else
+              @index = i4
+              r4 = nil
+            end
+            if r4
+              s3 << r4
+            else
+              break
+            end
+          end
+          if s3.empty?
+            @index = i3
+            r3 = nil
+          else
+            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+          end
+          s0 << r3
+          if r3
+            s7, i7 = [], index
+            loop do
+              i8, s8 = index, []
+              r9 = _nt_node
+              s8 << r9
+              if r9
+                r10 = _nt_s
+                s8 << r10
+              end
+              if s8.last
+                r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+                r8.extend(Node1)
+              else
+                @index = i8
+                r8 = nil
+              end
+              if r8
+                s7 << r8
+              else
+                break
+              end
+            end
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+            s0 << r7
+            if r7
+              if (match_len = has_terminal?(')', false, index))
+                r11 = true
+                @index += match_len
+              else
+                terminal_parse_failure('\')\'')
+                r11 = nil
+              end
+              s0 << r11
+              if r11
+                r12 = _nt_s
+                s0 << r12
+              end
+            end
+          end
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Node2)
+        r0.extend(Node3)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:node][start_index] = r0
+
+      r0
+    end
+
+    def _nt_value
+      start_index = index
+      if node_cache[:value].has_key?(index)
+        cached = node_cache[:value][index]
+        if cached
+          node_cache[:value][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0 = index
+      r1 = _nt_string
+      if r1
+        r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+        r0 = r1
+      else
+        r2 = _nt_number
+        if r2
+          r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+          r0 = r2
+        else
+          r3 = _nt_symbol
+          if r3
+            r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+            r0 = r3
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+
+      node_cache[:value][start_index] = r0
+
+      r0
+    end
+
+    module Symbol0
+      def value; :"#{text_value}"; end
+    end
+
+    def _nt_symbol
+      start_index = index
+      if node_cache[:symbol].has_key?(index)
+        cached = node_cache[:symbol][index]
+        if cached
+          node_cache[:symbol][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        if has_terminal?(@regexps[gr = '\A[a-zA-Z_]'] ||= Regexp.new(gr), :regexp, index)
+          r1 = true
+          @index += 1
+        else
+          terminal_parse_failure('[a-zA-Z_]')
+          r1 = nil
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Symbol0)
+        r0.extend(Symbol0)
+      end
+
+      node_cache[:symbol][start_index] = r0
+
+      r0
+    end
+
+    module String0
+    end
+
+    module String1
+      def contents
+        elements[1]
+      end
+
+    end
+
+    module String2
+      def value; contents.text_value.force_encoding(Encoding::UTF_8); end
+    end
+
+    def _nt_string
+      start_index = index
+      if node_cache[:string].has_key?(index)
+        cached = node_cache[:string][index]
+        if cached
+          node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      if (match_len = has_terminal?('"', false, index))
+        r1 = true
+        @index += match_len
+      else
+        terminal_parse_failure('\'"\'')
+        r1 = nil
+      end
+      s0 << r1
+      if r1
+        s2, i2 = [], index
+        loop do
+          i3 = index
+          if (match_len = has_terminal?('\\"', false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('\'\\\\"\'')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r3 = r4
+          else
+            i5, s5 = index, []
+            i6 = index
+            if (match_len = has_terminal?('"', false, index))
+              r7 = true
+              @index += match_len
+            else
+              terminal_parse_failure('\'"\'')
+              r7 = nil
+            end
+            if r7
+              @index = i6
+              r6 = nil
+              terminal_parse_failure('\'"\'', true)
+            else
+              @terminal_failures.pop
+              @index = i6
+              r6 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s5 << r6
+            if r6
+              if index < input_length
+                r8 = true
+                @index += 1
+              else
+                terminal_parse_failure("any character")
+                r8 = nil
+              end
+              s5 << r8
+            end
+            if s5.last
+              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              r5.extend(String0)
+            else
+              @index = i5
+              r5 = nil
+            end
+            if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+              r3 = r5
+            else
+              @index = i3
+              r3 = nil
+            end
+          end
+          if r3
+            s2 << r3
+          else
+            break
+          end
+        end
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        s0 << r2
+        if r2
+          if (match_len = has_terminal?('"', false, index))
+            r9 = true
+            @index += match_len
+          else
+            terminal_parse_failure('\'"\'')
+            r9 = nil
+          end
+          s0 << r9
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(String1)
+        r0.extend(String2)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:string][start_index] = r0
+
+      r0
+    end
+
+    module Number0
+    end
+
+    module Number1
+    end
+
+    module Number2
+      def value; eval(text_value); end
+    end
+
+    def _nt_number
+      start_index = index
+      if node_cache[:number].has_key?(index)
+        cached = node_cache[:number][index]
+        if cached
+          node_cache[:number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      if (match_len = has_terminal?('-', false, index))
+        r2 = true
+        @index += match_len
+      else
+        terminal_parse_failure('\'-\'')
+        r2 = nil
+      end
+      if r2
+        r1 = r2
+      else
+        r1 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r1
+      if r1
+        s3, i3 = [], index
+        loop do
+          if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
+            r4 = true
+            @index += 1
+          else
+            terminal_parse_failure('[0-9]')
+            r4 = nil
+          end
+          if r4
+            s3 << r4
+          else
+            break
+          end
+        end
+        if s3.empty?
+          @index = i3
+          r3 = nil
+        else
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        end
+        s0 << r3
+        if r3
+          i6, s6 = index, []
+          if (match_len = has_terminal?('.', false, index))
+            r7 = true
+            @index += match_len
+          else
+            terminal_parse_failure('\'.\'')
+            r7 = nil
+          end
+          s6 << r7
+          if r7
+            s8, i8 = [], index
+            loop do
+              if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
+                r9 = true
+                @index += 1
+              else
+                terminal_parse_failure('[0-9]')
+                r9 = nil
+              end
+              if r9
+                s8 << r9
+              else
+                break
+              end
+            end
+            r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+            s6 << r8
+          end
+          if s6.last
+            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            r6.extend(Number0)
+          else
+            @index = i6
+            r6 = nil
+          end
+          if r6
+            r5 = r6
+          else
+            r5 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r5
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Number1)
+        r0.extend(Number2)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:number][start_index] = r0
+
+      r0
+    end
+
+    def _nt_s
+      start_index = index
+      if node_cache[:s].has_key?(index)
+        cached = node_cache[:s][index]
+        if cached
+          node_cache[:s][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        if has_terminal?(@regexps[gr = '\A[ \\t\\r\\n]'] ||= Regexp.new(gr), :regexp, index)
+          r1 = true
+          @index += 1
+        else
+          terminal_parse_failure('[ \\t\\r\\n]')
+          r1 = nil
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+      node_cache[:s][start_index] = r0
+
+      r0
+    end
+
+
+    class Parser < Treetop::Runtime::CompiledParser
+      include SExpr
+    end
+  end
+
+  SExprParser = SExpr::Parser
+
+end

data/lib/kicad/grammar.tt

@@ -7,9 +7,8 @@ module KiCad
       { def value
           klass_name = values.elements[0].value.value
           klass = KiCad::AST::Node
-          if klass_name.is_a? ::Symbol
-	    # See if we have a defined class for this node type
-	    klass_name = klass_name.to_s.gsub(/\A[a-z]|_[a-z]/) {|from| from[-1].upcase }
+          if klass_name.is_a? ::Symbol  # See if we have a defined class for this node type
+            klass_name = klass_name.to_s.gsub(/\A[a-z]|_[a-z]/) {|from| from[-1].upcase }
             klass = KiCad::AST.const_get(klass_name, false) rescue KiCad::AST::Node
           end
           klass.new values.elements.map(&:value).map(&:value),
@@ -28,8 +27,8 @@ module KiCad
     end
 
     rule string
-      '"' ('\\"' / !'"' .)* '"'
-        { def value; eval(text_value); end }  # REVISIT: Risk of evaluating code
+      '"' contents:( ('\\"' / !'"' .)* ) '"'
+        { def value; contents.text_value.force_encoding(Encoding::UTF_8); end }
     end
 
     rule number

data/lib/kicad/parser.rb

@@ -12,7 +12,7 @@ module KiCad
   end
 
   def self.load filename
-    self.parse File.read(filename)
+    self.parse File.read(filename, :encoding => 'iso-8859-1')
   end
 
   class Parser < KiCad::SExprParser

data/lib/kicad/version.rb

@@ -1,3 +1,3 @@
 module KiCad
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: kicad
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Clifford Heath
 bindir: bin
 cert_chain: []
-date: 2025-05-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
@@ -92,6 +92,7 @@ files:
 - kicad.gemspec
 - lib/kicad.rb
 - lib/kicad/ast.rb
+- lib/kicad/grammar.rb
 - lib/kicad/grammar.tt
 - lib/kicad/parser.rb
 - lib/kicad/version.rb
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Load and rewrite Kicad s-expression files into a tree structure for scripting
 test_files: []