From bbd511bc8b09d2f0121ca2ef1154d71d5932f987 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 15 Jan 2021 17:32:39 +0100
Subject: [PATCH] Added some tests for 'switch', small bug fix.

---
 .../drc/built-in-macros/_drc_complex_ops.rb   |   4 ++--
 testdata/drc/drcGenericTests_5.drc            |  21 +++++++++++++++++-
 testdata/drc/drcGenericTests_au5.gds          | Bin 6666 -> 8682 bytes
 testdata/drc/drcGenericTests_au5d.gds         | Bin 6398 -> 8414 bytes
 4 files changed, 22 insertions(+), 3 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 892e7ae1d..99ec74641 100644
--- a/src/drc/drc/built-in-macros/_drc_complex_ops.rb
+++ b/src/drc/drc/built-in-macros/_drc_complex_ops.rb
@@ -1516,8 +1516,8 @@ class DRCOpNodeCase < DRCOpNode
         types << a.result_type
       end
     end
-    if types.sort.uniq.size > 1
-      raise("All result arguments need to have the same type (we got '" + types.collect(:to_s).join(",") + "')")
+    if types.uniq { |a,b| a.to_i <=> b.to_i }.size > 1
+      raise("All result arguments of 'switch' need to render the same type (got '" + types.map!(&:to_s).join(",") + "')")
     end
 
     RBA::CompoundRegionOperationNode::new_case(nodes)
diff --git a/testdata/drc/drcGenericTests_5.drc b/testdata/drc/drcGenericTests_5.drc
index 33216870a..5f061d5da 100644
--- a/testdata/drc/drcGenericTests_5.drc
+++ b/testdata/drc/drcGenericTests_5.drc
@@ -20,6 +20,9 @@ l3.output(3, 0)
 l1.drc(rectangles).output(100, 0)
 l1.drc(primary.rectangles).output(101, 0)
 l2.drc(secondary(l1).rectangles).output(102, 0)
+l1.drc(squares).output(103, 0)
+l1.drc(primary.squares).output(104, 0)
+l2.drc(secondary(l1).squares).output(105, 0)
 
 l1.drc(rectilinear).output(110, 0)
 l1.drc(primary.rectilinear).output(111, 0)
@@ -37,8 +40,24 @@ l1.drc(! rectilinear).output(140, 0)
 l1.drc(! rectangles).output(141, 0)
 
 l1.drc(if_all(! rectangles, area < 8.0)).output(150, 0)
-l1.drc(if_any(rectangles, area > 8.0)).output(151, 0)
+l1.drc(if_any(rectangles, area >= 8.0)).output(151, 0)
 
 l1.drc(if_any(corners.count > 4)).output(160, 0)
 l1.drc(if_any(corners.count == 4)).output(161, 0)
 
+l1.drc(switch(! rectangles, primary.sized(100.nm))).output(170, 0)
+l1.drc(switch(! rectangles, primary.sized(100.nm), primary.sized(200.nm))).output(171, 0)
+
+error = ""
+begin
+  l1.drc(switch(! rectangles, primary.sized(100.nm), squares, primary.sized(200.nm).edges))
+rescue => ex
+  error = ex.to_s
+end
+if error != "'drc': All result arguments of 'switch' need to render the same type (got 'Region,Edges')"
+  raise "switch did not give the right error when having different types. Was:\n" + error
+end
+
+l1.drc(switch(! rectangles, primary.sized(100.nm), squares, primary.sized(200.nm))).output(172, 0)
+l1.drc(switch(! rectangles, primary.sized(100.nm), squares, primary.sized(200.nm), primary)).output(173, 0)
+
diff --git a/testdata/drc/drcGenericTests_au5.gds b/testdata/drc/drcGenericTests_au5.gds
index c904d68d31c7ae09901f9bf87c2bedd0f976b851..54c61c071ad4c3e93a054e92219ce6ee472c8c46 100644
GIT binary patch
literal 8682
zcmd5>J!@1!6us_lcB4j(7%>403kwTD3qgb+Di(?XQ=||pi}+E9rVvp{r4|Yb7NUg~
zu`>A4S){ZOvGfO6h(-`mS)v5L$9vv=$2XhoggE;iynvkbzIX22x#!NE*;%PerE*Bt
zFR3)%$r4#5tEFEy`Jbh`QXksCN2IUXwR88??FXLUZ|>MTwPoVY;SpKiwE(YPA2~QI
zQtK9}uc)Z^`pSxkZ0xOyG+sLQt6yZ*gh=&0(Egv=Ypdt;HuqMY`?^nL?YQB<sB_=8
ziV$gEJ1#-~=aVAq#+(C!2Y*D`*Nuhv7Wd4E;q0KrO{85hIR1}~7C&%c)aFh^{PsM|
ze}6+{`IK|OHCLSbcrHWQmrsTG7|*#6mkkjw@=l~(F&O`!9`Kz5BKIO0(jMj`Z;0P;
z%@vUqj}X5h?F+?^5&5S&C$&SQT`>?p-mv-eUDO`_n3wc<fN%QX9qRa}$Mgi!t{;N@
zH%}~oz?l)$VTQ<`JrDE2!F#}OTT#Cm(jLygbJLSnKS0zEG$*2d?0I;6tQ*V|h<Zis
z5NTg%{+KV~q#y9X<Gk#7czmo^yw5&>8pQalMSI@DucUn^=^xXR&NYu<p3cn<V*O-D
zd-F(`k9;kCW_iQ7%ma}2rO!fqk*-&G&k%Ks{zs&JVZLe9^$PRAy2%jQ!LI1nU(5X8
zJh3=|h#&ofi1_V!n2)^iAM%C#5ow<@el^R##fLH5#ZSAUAOC2^x4E-U+x5RT_3QDY
z`p?l0$M^VA;~(?KkLVvQ{D}R-<7a&m{gV3z5o;suqrQF~f4+W;=szAmDu2iQ{8@ci
z9E+@<6CLtTrTihBU&8v?I?VcM*4NqR1N#I05AuA({+OL-tWWWrMC5zgP<_4VZyf%@
z`@O~6e*d%mk>?sis~4Q_Fh?NIO+?Jk#%mi-+P_=(FZ2xR$i6V={J{ArKdOFC7px!s
z=cOP0l|?_s6RV%ckJ4|<U%%n?XXlbO=dTuiME~^o|N3LnC)qcNf&S_7qxz@EkILV<
zg6p6D^QwRPD@*+|p4j?7UvU2EKd=1LUs>|ccsk90?EY~f>pxNJ?_$CF(|=z2(_dNi
zXFRd`Un)5N^q*J$>8~vLXFQ$eKX(0H?r{BGOZoqMZ+X2#-cUi`7Z_Jw^+tbXskd8^
zc_%NgyxdOXC`w2AFH7DTPwYDP_)+`hM8Wx{|Gesh{>q}?y)=KZ`g!~){T`&_Z%e+X
z>pk&Ly`yaG$$lrQofYY=>1D+bFnw<C`S%y}W9x2Mzt?Thdl$tSz2E-aP1O5~*Z54-
z`<9z}udMf}MDjjtXt|G||D+DSOgrc9I`?H-e^=^({|pCSz?c5clOW#%w)L0P!S6|n
z7l=6E+fd`|*ZYw%qCNZml!$RGH-<L1hUN!z1kUPRGxA2n{A|3Icpm1Y1N{`G1O4Zv
z1O1gvhh#mzeJ!%A=^U_6Yx&cz3~681Y^$U4Re!BZeV$<7u*k|Y;2Y9DhyN(2I-sAT
z>VW?9sss8fOC2zt*gANelaBOLl#cYDmyYyT79AN+r#dQM*YV56|Bl|!ZJ{QA0lSr}
A+yDRo

delta 78
zcmaFm+-0J~z{bGD6u}_F$i)7XfsuieL7c&uK^2)jQAt%8i}1#%PL9pVoQi^M><kPn
GEDQk8!3!e*

diff --git a/testdata/drc/drcGenericTests_au5d.gds b/testdata/drc/drcGenericTests_au5d.gds
index cd162191ca4f8b78f5b19190ce2b7995a6ae810c..7ed51c6ee815397f3329988fccf12b74a37d2fef 100644
GIT binary patch
literal 8414
zcmd5>zi$**5FX#1*T=<Rei&gR7Zfy+kV1hJMY5vcP=K%$3tbUWQJ5q}6kH%g5CtL>
zL`tL-C@Dg5R6&X9T)3n_D5d`Z3Pc>qLSR`2S>zX!nVtK1Z<k$z-|kB5!ryszzj?Fs
zeQy@tQACZ#r!+Cp82Xb2XoPmr7`^L%rgkHmJ~2f!+8q4w=(q2my#LGE2gerQ>-~JX
zOA~{e@S<qu=&3HX+C<UzhGdU+G>GWX&ZhkKe)e7_YOW9gy-TfKM6Ds(be&EVeSG}H
z^f9@!L)6}Fs}6gs#93ay#{BpiWn5$a`(Ru{d@ZZ`=1R<!s+rfjL?b<ik~5AY_v?J-
zm&3|8d~sOUVg@3f&nFsMB6?@haL;w3?ej!H#0CBO8-Di(9}sQ3N2I7-AL%(nTyPUU
z^YU%wGq0V|^&KKE81vttUOS4qpUjwco!w9}OFefr+COlGXn109YC&43KXSh*AfNrJ
z;kkqAhM^_qf5+@;)o-er{@ssf@x-gl&yQ<&4990pDIns~#a#aCmqh#Km=%?$`GAP;
zo6F-{ed;o;b7Ru#1|lw)yS}<v>r@<{wY>&Je6#vjeo(hDEAF|@{N$oT#Pi*zPEmIl
zZcHj)pTiJwagkrY=T_Tk+wK`^z1l}0;wiT_lWw<~v)roBqH#fg{aMF1r|Wa7v$LLG
z<EiKO_^R8Mck9`L>wEm5^*{61f3#rJN^!lb{dcI-%C0B+m*A^jI^m$3dRFyQL|i`j
z{ZH@%{FmUHK2ATK(5j;%bWQ2!@r(BF)!SezZ;Q|U{-^6t@4pQHeNmAARi8hJ`KLPR
z+;a2E%`<&-VIJbXl%B|US@Y$;{md6HhaGA@dmCrXFY}PjMa)6WMPSa`6!lDNJ^B82
zJ~hAU?AJax%<(_+$M25-{XBk<|IU@HAM({jKh#r|e#jrHpT`f<Z_eMp`TlfsIrXo_
z1V3Q@CinsKH^EQ)|1IXP$1mEyp!s{T<o$zub=g0tr>gyf{Gt2j>yrDAe0AwR>Zz*#
z$X~So!VlVim)!gc;$JOUf8?u+{-~!a{gFRZ|8Gj}Kl0V3|EQ;`{v&_U{tG{7|6D7$
z|Gw+<w|Z{!eaXH-zR)`A;x{};Ret-i<h~={R{Q=_zmB@}9raYzcjOP<=N><3pZ7}E
z9r@~_AL^+}zgzwOh3e<=gY^5=*YDXfGv8!>wk+o?@(sai+u``{a^`SD&RJr_eTs>5
zGvqrGzc=KZ?w<vzYs#H_w=NLvY{_BUv||6d-RGabAy4ds|8C3wGY>E;zPMp)8_M~}
zn4IU#0qxpfcY#{3tz{_ZG>cM?o*(vcqi1yhvCiWIna^cDn6Y{u39iez>}ne*bv(4(
zhF0(Md54-`d8z!rm8=8u71aTG>Y@Ycsal74KmPHMsI$hbI4YVw{m3EWowbBdP@nL{
zXR?3fdW@qpL_5wa-w^Q>f4*cNAYV}*AWvO<fO@L(0rH3X;7-XpB41G*k*6*?qMoXB
WME;^W3Sai|(%XNJCf_=@TJ%5rC;kTj

delta 126
zcmccT_|H&@fsKKQDS|<Uk%|2&10w?`gE)gRgDNt6qLQjGHsPpHY{DB4t!Bg~zPW)(
SoOQD}N1`AbI|Bm?3j+YY%@S<@