From 68f98d9f0d0807ab2414d3db4aa5118113363250 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Thu, 4 Jul 2019 23:55:46 +0200
Subject: [PATCH] Some typos fixed, connect_implicit now can be used multiple
 times (but without glob pattern)

---
 src/drc/drc/built-in-macros/_drc_engine.rb   |  18 +++++-----
 src/drc/drc/built-in-macros/_drc_netter.rb   |  34 ++++++++-----------
 src/lay/lay/doc/manual/lvs_connect.xml       |  15 ++++++++
 src/lay/lay/doc/manual/metal_connections.png | Bin 0 -> 13184 bytes
 4 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 src/lay/lay/doc/manual/lvs_connect.xml
 create mode 100644 src/lay/lay/doc/manual/metal_connections.png

diff --git a/src/drc/drc/built-in-macros/_drc_engine.rb b/src/drc/drc/built-in-macros/_drc_engine.rb
index 617f5aa76..099062b27 100644
--- a/src/drc/drc/built-in-macros/_drc_engine.rb
+++ b/src/drc/drc/built-in-macros/_drc_engine.rb
@@ -141,7 +141,7 @@ module DRC
     # @brief Supplies the MOS3 transistor extractor class
     # @name mos3
     # @synopsis mos3(name)
-    # Use this class with \device_extract to specify extraction of a 
+    # Use this class with \extract_devices to specify extraction of a 
     # three-terminal MOS transistor
 
     def mos3(name)
@@ -152,7 +152,7 @@ module DRC
     # @brief Supplies the MOS4 transistor extractor class
     # @name mos4
     # @synopsis mos4(name)
-    # Use this class with \device_extract to specify extraction of a 
+    # Use this class with \extract_devices to specify extraction of a 
     # four-terminal MOS transistor
 
     def mos4(name)
@@ -163,7 +163,7 @@ module DRC
     # @brief Supplies the BJT3 transistor extractor class
     # @name bjt3
     # @synopsis bjt3(name)
-    # Use this class with \device_extract to specify extraction of a 
+    # Use this class with \extract_devices to specify extraction of a 
     # bipolar junction transistor
 
     def bjt3(name)
@@ -174,7 +174,7 @@ module DRC
     # @brief Supplies the BJT4 transistor extractor class
     # @name bjt4
     # @synopsis bjt4(name)
-    # Use this class with \device_extract to specify extraction of a 
+    # Use this class with \extract_devices to specify extraction of a 
     # bipolar junction transistor with a substrate terminal
 
     def bjt4(name)
@@ -185,7 +185,7 @@ module DRC
     # @brief Supplies the diode extractor class
     # @name diode
     # @synopsis diode(name)
-    # Use this class with \device_extract to specify extraction of a 
+    # Use this class with \extract_devices to specify extraction of a 
     # planar diode 
 
     def diode(name)
@@ -196,7 +196,7 @@ module DRC
     # @brief Supplies the resistor extractor class
     # @name resistor
     # @synopsis resistor(name, sheet_rho)
-    # Use this class with \device_extract to specify extraction of a resistor.
+    # Use this class with \extract_devices to specify extraction of a resistor.
     # The sheet_rho value is the sheet resistance in ohms/square.
 
     def resistor(name, sheet_rho)
@@ -207,7 +207,7 @@ module DRC
     # @brief Supplies the resistor extractor class that includes a bulk terminal
     # @name resistor_with_bulk
     # @synopsis resistor_with_bulk(name, sheet_rho)
-    # Use this class with \device_extract to specify extraction of a resistor 
+    # Use this class with \extract_devices to specify extraction of a resistor 
     # with a bulk terminal.
     # The sheet_rho value is the sheet resistance in ohms/square.
 
@@ -219,7 +219,7 @@ module DRC
     # @brief Supplies the capacitor extractor class
     # @name capacitor
     # @synopsis capacitor(name, area_cap)
-    # Use this class with \device_extract to specify extraction of a capacitor.
+    # Use this class with \extract_devices to specify extraction of a capacitor.
     # The area_cap argument is the capacitance in Farad per square micrometer.
 
     def capacitor(name, area_cap)
@@ -230,7 +230,7 @@ module DRC
     # @brief Supplies the capacitor extractor class that includes a bulk terminal
     # @name capacitor_with_bulk
     # @synopsis capacitor_with_bulk(name, area_cap)
-    # Use this class with \device_extract to specify extraction of a capacitor 
+    # Use this class with \extract_devices to specify extraction of a capacitor 
     # with a bulk terminal.
     # The area_cap argument is the capacitance in Farad per square micrometer.
 
diff --git a/src/drc/drc/built-in-macros/_drc_netter.rb b/src/drc/drc/built-in-macros/_drc_netter.rb
index 8f333b0c9..aa86fe84e 100644
--- a/src/drc/drc/built-in-macros/_drc_netter.rb
+++ b/src/drc/drc/built-in-macros/_drc_netter.rb
@@ -65,7 +65,7 @@ module DRC
     def initialize(engine)
       @engine = engine
       @netlisted = false
-      @connect_implicit = ""
+      @connect_implicit = []
       @l2n = nil
     end
     
@@ -186,7 +186,7 @@ module DRC
 
     def clear_connections
       @netlisted = false
-      @connect_implicit = ""
+      @connect_implicit = []
       _clear_data
     end
     
@@ -194,34 +194,21 @@ module DRC
     # @name connect_implicit
     # @brief Specifies a search pattern for labels which create implicit net connections
     # @synopsis connect_implicit(label_pattern)
-    # Use this method to supply a glob pattern for labels which create implicit net connections
+    # Use this method to supply label strings which create implicit net connections
     # on the top level circuit. This feature is useful to connect identically labelled nets
-    # while a component isn't integrated yet. If the component is integrated, net may be connected
+    # while a component isn't integrated yet. If the component is integrated, nets may be connected
     # on a higher hierarchy level - e.g. by a power mesh. Inside the component this net consists
     # of individual islands. To properly perform netlist extraction and comparison, these islands
     # need to be connected even though there isn't a physical connection. "connect_implicit" can
     # achive this if these islands are labelled with the same text on the top level of the
     # component.
     #
-    # Glob pattern are used which resemble shell file pattern: "*" is for all labels, "VDD"
-    # for all "VDD" labels (pattern act case sensitive). "VDD*" is for all labels beginning
-    # with "VDD" (still different labels will be connected to different nets!). "{VDD,VSS}"
-    # is either "VDD" or "VSS".
-    #
-    # The search pattern is applied on the next net extraction. The search pattern is cleared
+    # The implicit connections are applied on the next net extraction and cleared
     # on "clear_connections".
 
     def connect_implicit(arg)
-
       cleanup
-
-      if arg != @connect_implicit
-        if @connect_implicit != "" && arg != ""
-          raise("connect_implicit can only be used once")
-        end
-        @connect_implicit = arg
-      end
-
+      @connect_implicit << arg
     end
 
     # %DRC%
@@ -338,7 +325,14 @@ module DRC
 
       # run extraction in a timed environment
       if ! @netlisted
-        @engine._cmd(@l2n, :extract_netlist, @connect_implicit)
+        # build a glob expression from the parts
+        exprs =  @connect_implicit.collect { |c| c.gsub(/\?\*\[\]\{\},\(\)\\/) { |x| "\\" + x } }
+        if exprs.size > 1
+          expr = "{" + exprs.join(",") + "}"
+        else
+          expr = exprs[0] || ""
+        end
+        @engine._cmd(@l2n, :extract_netlist, expr)
         @netlisted = true
       end
 
diff --git a/src/lay/lay/doc/manual/lvs_connect.xml b/src/lay/lay/doc/manual/lvs_connect.xml
new file mode 100644
index 000000000..96151e5f5
--- /dev/null
+++ b/src/lay/lay/doc/manual/lvs_connect.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "klayout_doc.dtd">
+
+<doc>
+
+  <title>LVS Connectivity</title>
+  <keyword name="LVS"/>
+  <keyword name="LVS Connectivity"/>
+
+  <h2-index/>
+
+  <p>
+  </p>
+
+</doc>
diff --git a/src/lay/lay/doc/manual/metal_connections.png b/src/lay/lay/doc/manual/metal_connections.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5e184dfd7919ed37a7ef4419b63073263eedb9e
GIT binary patch
literal 13184
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
Jl@>he{{XdVa%TVl

literal 0
HcmV?d00001