Fixed issue #1485 (Incorrectly set output cell name if using DRC::cell)

KLayout · Oct 1, 2023 · 75e3c31 · 75e3c31
1 parent 2558bde
commit 75e3c31
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 1 deletion.
diff --git a/src/drc/drc/built-in-macros/_drc_engine.rb b/src/drc/drc/built-in-macros/_drc_engine.rb
@@ -1595,7 +1595,7 @@ def output_cell(cellname)
         if ! @def_output
           if @def_layout
             # establish a new default output from the default layout on this occasion
-            @def_output = LayoutOutputChannel::new(self, @def_layout, cellname.to_s, nil)
+            @def_output = LayoutOutputChannel::new(self, @def_layout, @def_layout.cell(cellname.to_s), nil)
           end
         else
           @def_output.cellname = cellname.to_s

diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc
@@ -1547,6 +1547,16 @@ TEST(60d_issue1216)
   run_test (_this, "60", true);
 }
 
+TEST(61_issue1485)
+{
+  run_test (_this, "61", false);
+}
+
+TEST(61d_issue1485)
+{
+  run_test (_this, "61", true);
+}
+
 TEST(70_props)
 {
   run_test (_this, "70", false);

diff --git a/testdata/drc/drcSimpleTests_61.drc b/testdata/drc/drcSimpleTests_61.drc
@@ -0,0 +1,23 @@
+
+# Moved implementation
+
+source($drc_test_source)
+target($drc_test_target)
+
+if $drc_test_deep
+  deep
+end
+
+input(1, 0).output(1, 0)
+input(2, 0).output(2, 0)
+
+cell("TOP")
+
+l1 = input(1, 0)
+l2 = input(2, 0)
+
+l1.output(10, 0)
+l2.output(11, 0)
+l1.sized(100.nm).output(20, 0)
+(l2 - l1).output(21, 0)
+
diff --git a/testdata/drc/drcSimpleTests_61.gds b/testdata/drc/drcSimpleTests_61.gds
diff --git a/testdata/drc/drcSimpleTests_au61.gds b/testdata/drc/drcSimpleTests_au61.gds
diff --git a/testdata/drc/drcSimpleTests_au61d.gds b/testdata/drc/drcSimpleTests_au61d.gds