From 92f6f2fb67595ca1c4e61e3df7f8865a75d2648e Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 26 Dec 2021 21:20:58 +0100
Subject: [PATCH 1/2] New tests

---
 testdata/drc/drcGenericTests_1.gds    | Bin 1020 -> 1118 bytes
 testdata/drc/drcGenericTests_au1.gds  | Bin 10542 -> 11986 bytes
 testdata/drc/drcGenericTests_au1d.gds | Bin 6020 -> 6742 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/testdata/drc/drcGenericTests_1.gds b/testdata/drc/drcGenericTests_1.gds
index 18c6261a138332ab52f1f70c58ab1464a815dc84..263f094b5de28f6ef8b45bc93b363fa7a7741b52 100644
GIT binary patch
delta 236
zcmeyvevd<mfsKKQDS|<Uk%|2&0}q1~gD8U#gFG^OqLQ*Gc8RE9>=GLfsWVRg%fzk0
zz#y!`z`(r&Lh~<RV31^BV1Usuaqb<H3z#J)e__m<T*fTq!@wYDz`($H1VRf=VPKH@
i0%SvJm^hGT5oBOsVP{~FVa4h8$qh{6o3}E#GXekt$|Jx4

delta 165
zcmcb|@rPZBfsKKQDS|<Uk%|2&10#^f$soZXh0LC)q%4YEA}ScW#KuGFjFUB)D&^Q2
o7-U#+8a#<vT!u}Gk%57MN1D}907!!Xj|{5=n8C1Fl-ZLJ0FhV{WdHyG

diff --git a/testdata/drc/drcGenericTests_au1.gds b/testdata/drc/drcGenericTests_au1.gds
index 8ffc55a48a1eec27f3fcbf0f33ca08d841254574..ebddcae68c378ede64ee03808c681d47f58640bf 100644
GIT binary patch
delta 1333
zcmZvb&1(};6vbcKm^9y$HffwrCYemyWELtV#$hNTp^M_us*563vlP+NRp_GFowzAz
zP8T8~#Xmr+h0=x9F1qv!H-1171y_Q&kkDN`Z^ksHx_I21JMaA7edpagI{WUTDFULe
zZ$@N&eZg-cDn>+F42lzf=XcCv`oABZT)5;jhem~nYziS`VpRxLbfZ^azvp}4Ge4e}
z``T?86RYj^=kadz>gyx@_kETSNq!0Kcrm#m#K<q^e`2Q|+Q9?=GQRi6O7H7(d%G=T
za;4q=!bUo=QxEN|=MK&I&<fPB!DWXhu{UrE8$ss5DLfmPKr46?i-8F=SZjnPu^Fzx
z3DvO2wJ=b_CZiKMj_=`VEGAB3FG78U`UF`q=27NRvSMUK$%>H0S|d(Yg4#G)TnjO>
z7#-?ci770m$Wo|Rs85kK$UMnBN!B1)NwO5OSZfTCm7;ctEUtw?vKSreTPd<sveMM2
zsaMI$Fdt?<Ojd@hVY1R>vDP?DmP+kmvbYv9WHCC_w^Xvi76O_X?|rzYX2pA-jupHu
zYlvy8;*CLf9OSop-u;H3BM#<_&c5C;X=<~G>N*~4YSYjq3iV<DKgKe+p3~eGx-)}%
z&I-#Oys^P-?#O|bu$Hyry#u*l>NY1!VcCaQk{tIUJkf1>E308mw~;e7cA;Y~TT#6E
z?ar}_?Y)aEHM2J6M>Sm5H9XH%c{dxY**KhH0$bU0Skx<6E9mZb>4`k*^q4$G!^?d2
z-(wWRyRzp3qK4OMBLA=F;9mBBjb_{K^}K(jt0CL<SvTmjz3=f0LvtPM+$*w)?SggC
z_U%H658O3O8pnOIc))9ld2J1^3L2Dxjk`q~Myd1LkK3gTUKsL?C+Mo`?#r3i@RWOB
z7pu5sI`EHH@!Wif4~9c4ui|yt#u>iCQkks>P_xFdU9ve<I+m?ze4>lXmX4F7Dvr|0
zH9Eh<sXRuRQjkZE^Ee&5r98e;tBlz^M#mfO_4B26+1`z@D(0;K!d9ip2a%<E-j6Hg
O3ie8=Ku`$3U;GAfw4IIs

delta 826
zcmZvYKWGzS7{>2vy!>xslk{@=dd>BkHkafslp2muS_wtEh{QUHV0CivU%MEBU=0qs
zh$zoiI&^lZO5|`*aC9hI+{F$$3LS57=yO*U2ZxvEeZTK{fA9N!U#{$4G$lnE8M!1)
z$Rp7ok}M^pf@DaO|K`ul>B4_6USD35hrT?Jhi^}8%IKZEJ8UTDWO(royl4kKh8J7G
zulNFbu@2n$BP=Et;m6LvW$h)F(N1*GPj=u_efry})3}*94?lSp@3IT<M(InD#qiQ(
zjgplnYm}@kS!uFZdl|AaWM#>r`t-LM{UFbhRUj)z-zl;f-WXXqvc|~DkyRjTj4ak(
zo~%533+$!(^tT!PATN+rBCAN>I9Uu&C96o5N>-7q5?Lx)tUZk^jlCuIQhoZ{jDC=p
z$VysJCJY=37lWpPCuJ4s2?4tz@RIt88q{-kpc-yX>7ib$=y<QM!mkQsj4t-=2wv0@
z_^w-6sOh*}7PvFj!d@kX3#N^%*}{&l<Lab9zAnQ1L8x5>EPbkrSEi2p6^*+b>z{qr
zr?tO#dlfh2tWO7gf%1&T{x&vdTpTzNd~B%r%AMZKy4dE<pJxR&nXi}v4=jOwD}tsG
zcpfu%u~^&T?mB&|*s@yKs43WWju}SP<*qlvc}tBlmYun9kDufoI4yjrD(E}&oGlQX
z8JxS+5UeA3R#n5ZZMy}d;lgW<<DPBey6xg&)5RM9H0T-BgPA(MH8jpqa9E%Fy~8}7
WvTw^uA@5jxqr$gkm8c{|BGM7@GZmNs

diff --git a/testdata/drc/drcGenericTests_au1d.gds b/testdata/drc/drcGenericTests_au1d.gds
index d3eb185b1d1894b8a526802d8df6994a27c92626..b518971d0ab1e02c377f008ed0e6b7437278ce17 100644
GIT binary patch
delta 787
zcmZ`%&ui0Q7=DwcNz)`>ezXzWtTL+1QpAl?!^ok8(W`9WWr!#5$_|@{f;aW7eLQ%Y
z`3IEAN*Psmkm1pz|AB%R*`e$(aQLP%{wNdj@&0(e_j%tu@Aqi=bGJz<$?_&GNV4{Y
zOsbPl9^Lrcf7ZP0pAX!=bw2Rs!&M1CJflTaxk6+dWY$iIYDARVJZ~Iet8x)jX$KE0
zX_31^q#tG0eNI%Lvj5BGdHo1?lueA}H9U~}7!+bmlx2J?+{B3-BUECH3q6dAF{Wya
zZgCAKN*|{jPm~DTD%Y_;W-L^D=$2w^>oG<e=QZZzIMO0aOI)Y%9md8b<|{Lw!F*-T
z>&(aTL}xyO>)0PN78=Y~xDLfy#CLNQi3ng=0p2+QUYfzsn}y<EX>ew?%74_sigh2y
zwvG3d0LNy4SJpb7S_%%G8v8R6HZzi3Pdh<kWh9xjOmc0$O@1RQLQk}L#s=Ps8g@na
zyG0tGxecs~tVg~p?(teIIrEFehTX<j`!VkM4eZ$=26hLry(-c_%4>Pg8+L1M<e|I7
z1E{#`cF=Mod}3Q?p)5DR6DORBm->lN5P2OIF&ujQDR|*Jmo%b<;(uT6{;szrp<fLl
f_zd{;s{xM~V6Pfs(eI#rp^DRLGsX4~{g2X54*|hk

delta 512
zcmZ{hy-NaN9LJwKJ@0(E<9xYJITbPJWvHZ%2RTd*2Z?Br8X{<EYjY5XrW;%Z>$^q$
z0ga_dG&V$IQ*%p8QA3D>L-bP#8f<#L&*%H&^Zej>wp(j?7GR>d&(eY@zcPV^n89)^
z`!}EF=Z)FL!S3wh`hHQsvgqO1SA*j#q3L(Qr43xsedKpw`zz=Z8;WH#0xkwp6?akz
zL&{t#!wyt&B0J~>D&Vq<Cb5CyqM=mbDC7&e=*wmF=spUPFGxOOLt>3E`9kCik&iMD
zkuOZX2>HU~i;$1lz_*H)nnzvba8w(jT7+U)SkVr}uRY|nCA?`iZnP<W*DXBh9Ot@?
zBYn!+Q458Hg?2Q9PCSK6)53PF2v1898+U$u$IVIJ(ky(?Y$3tv$=^Kg*Wtx1Y{qLS
z8wv3E0v?Ge2FC@>I%*;-GnSVA{hw~#s0-*M$E&B{nVHGCZ5DBBI%g>z#bh3zCdbR1
OHCb`T<lRp4LHGf3U60EE


From 029b7b9410728585c27c1c57df0b669c7e76c476 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 26 Dec 2021 21:23:58 +0100
Subject: [PATCH 2/2] Fixed generic DRC checks with == operations - this was
 sometimes not capturing the relevant cases.

---
 .../drc/built-in-macros/_drc_complex_ops.rb   | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/drc/drc/built-in-macros/_drc_complex_ops.rb b/src/drc/drc/built-in-macros/_drc_complex_ops.rb
index 48b534a37..8b9628842 100644
--- a/src/drc/drc/built-in-macros/_drc_complex_ops.rb
+++ b/src/drc/drc/built-in-macros/_drc_complex_ops.rb
@@ -1903,9 +1903,12 @@ class DRCOpNodeCheck < DRCOpNodeWithCompare
     end
       
     if self.gt || self.ge
-      dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
-      max_check = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args + [ true ]))
-      if res
+      if ! res
+        dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
+        res = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args + [ true ]))
+      elsif self.mode_or
+        dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
+        max_check = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args + [ true ]))
         if self.check == :width || self.check == :notch
           # Same polygon check - we need to take both edges of the result
           other = RBA::CompoundRegionOperationNode::new_edges(res)
@@ -1913,13 +1916,18 @@ class DRCOpNodeCheck < DRCOpNodeWithCompare
           other = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(res)
         end
         res_max = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(max_check)
-        if self.mode_or
-          res = RBA::CompoundRegionOperationNode::new_join([ other, res_max ])
-        else
-          res = RBA::CompoundRegionOperationNode::new_geometrical_boolean(RBA::CompoundRegionOperationNode::GeometricalOp::And, other, res_max)
-        end
+        res = RBA::CompoundRegionOperationNode::new_join([ other, res_max ])
       else
-        res = max_check
+        dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
+        max_check_for_not = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args))
+        if self.check == :width || self.check == :notch
+          # Same polygon check - we need to take both edges of the result
+          other = RBA::CompoundRegionOperationNode::new_edges(res)
+        else
+          other = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(res)
+        end
+        res_max_for_not = RBA::CompoundRegionOperationNode::new_edges(max_check_for_not)
+        res = RBA::CompoundRegionOperationNode::new_geometrical_boolean(RBA::CompoundRegionOperationNode::GeometricalOp::Not, other, res_max_for_not)
       end
     end