From 42baaef0317f84fea4c1be3fdebdea35c9c0d598 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sun, 30 Jul 2023 11:40:24 +0200
Subject: [PATCH] Fixed #1433 (def syntax error not captured)

---
 .../streamers/lefdef/db_plugin/dbDEFImporter.cc |   2 ++
 testdata/lefdef/specialnets_geo/test.def        |   2 +-
 testdata/lefdef/viasize/test.def                |   2 +-
 testdata/lefdef/viasize2/au.oas.gz              | Bin 542 -> 548 bytes
 testdata/lefdef/viasize2/test.def               |   2 +-
 testdata/lefdef/viasize2/test_fail.map          |   2 ++
 testdata/lefdef/viasize2/test_ok.map            |   2 ++
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
index c72efceeed..7f6a1aba6c 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
@@ -526,6 +526,8 @@ DEFImporter::read_single_net (std::string &nondefaultrule, Layout &layout, db::C
           sn = get_long ();
         } else if (test ("SHAPE")) {
           take ();
+        } else {
+          error (tl::to_string (tr ("Expected STYLE OR SHAPE specification following '+'")));
         }
 
       }
diff --git a/testdata/lefdef/specialnets_geo/test.def b/testdata/lefdef/specialnets_geo/test.def
index b104eb3283..07af8dd26a 100644
--- a/testdata/lefdef/specialnets_geo/test.def
+++ b/testdata/lefdef/specialnets_geo/test.def
@@ -20,7 +20,7 @@ SPECIALNETS 1 ;
   + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 )
   + ROUTED + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 )
   + RECT M1 ( 0 0 ) ( 100 200 )
-  + ROUTED M1 30 + MASK 2 ( 0 0 15 ) ( 100 0 0 ) VIA1_dummy ( 100 100 10 )
+  + ROUTED M1 30 ( 0 0 15 ) MASK 2 ( 100 0 0 ) VIA1_dummy ( 100 100 10 )
   + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 )
   + ROUTED + MASK 2 + RECT M2 ( 250 0 ) ( 150 100 )
   + ROUTED + SHAPE RING + MASK 1 + VIA VIA1_dummy E ( 200 200 ) 
diff --git a/testdata/lefdef/viasize/test.def b/testdata/lefdef/viasize/test.def
index 10821b3116..bdf59bb1bd 100644
--- a/testdata/lefdef/viasize/test.def
+++ b/testdata/lefdef/viasize/test.def
@@ -26,7 +26,7 @@ SPECIALNETS 1 ;
   + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 )
   + ROUTED + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 )
   + RECT M1 ( 0 0 ) ( 100 200 )
-  + ROUTED M1 30 + MASK 2 ( 0 0 15 ) ( 100 0 0 ) VIA1_small ( 100 100 10 )
+  + ROUTED M1 30 ( 0 0 15 ) MASK 2 ( 100 0 0 ) VIA1_small ( 100 100 10 )
   + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 )
   + ROUTED + MASK 2 + RECT M2 ( 250 0 ) ( 150 100 )
   + ROUTED + SHAPE RING + MASK 1 + VIA VIA1_large E ( 200 200 ) 
diff --git a/testdata/lefdef/viasize2/au.oas.gz b/testdata/lefdef/viasize2/au.oas.gz
index c1ab0c221a0f64ddf30e46b875986f89f7a0c222..eebbd86cc50e471dd27cc68f8fc8bdc26f652766 100644
GIT binary patch
delta 417
zcmV;S0bc%|1f&EEABzYGBqhdV00Uulkrt1CLkn{Y<KwjN{JbAOeko2(OG$g+_^jab
z52;r_cecG?XJ_zCD_daF#u3mfIEh0&f_E0jb_SOtrv#MJQaMCYpB&WU3eRQ{HD&5D
z`j{a4^clzJ5|b;;LT6+gssk(TBpJ*L-H<+Ib>qCoK$Z@MQ-+@&OnfYMTrZtzO3I^u
zgX$-B8x=E|rl&qTsLjp5%PeZm!OX~HU?3^U%LHUIGBRmsh>G$u0@+MJwt=K5FEBu+
zFxCkFIcCGi!D??XHz7q}&oPU}$R`HMho#g4UCZ2-ah_3^NWCIyDe+U%l{X?nY@=>M
z^ue;8=WN|;Zn*o^l?l2X6L!$h&N_I1sIKd!Krs7%#%0Am$7fXiaIHSD$iwQI!NI9>
z6S5w#Yg!-P()y9hW5z_zlr!RKY>|PAY73lz4zM#we&%uRgieS4N&SRpoS#d2*pm+b
zSaL)u&CX)Ig}I@6dnC)b^PW0h{=Mcs<{jn?3`~q$nHd=vl^Kf}TNoJ`8b%fjU|;|M
L-aJ4%=>h-%5(L9o

delta 410
zcmV;L0cHNA1fB#IABzYGF-PrV00VSwa9=THW@RxpIbo3ukAK4&ri{mF-}!kze*99L
znwFCG!0}nZ=O0q9e(r30!OqU$nO3&Iq>Uq>S8x)CdIaw*4s-Vz%NH+{n~?B~;nd;}
zJB}vUtWG$u5zcJOyqH6PaZ2)&gUZKs`(n?rXq-IK>^~`*$@vnC-sv;V;bIKD%%avD
z%#2J129lDzOn*Q&BO{ZBhNvhnBaqDmWE)6|@&f(b$5<}>=a>y62dllo+=LW?J;y8>
zBcB*3AC^)JbS-mR#(73vBK3--rNmE3SKf#Sv5mS3(Fe<Vp0jnYx#8|tS0?CoOxQs~
zJL}+~x~`W3!R-GTmlgXQpHcP0wfev!536ei2dB<W$a{Lgu4#REOY282j~Np=Q_hH|
zu|)#y4s%L==5g+XPKW+U{Rx8U4`!S?az^;sO9}oXZ67^5T@^O^sioQNh$zfU^5gUP
zqOZJ}BgRC1qlT^NJ%f7+_ZU>ZPZVTeVw}v($iS$~Sj^bM$jHzzvH$}E02kfczu5u+
E03eIYcmMzZ

diff --git a/testdata/lefdef/viasize2/test.def b/testdata/lefdef/viasize2/test.def
index 8e41b462b2..1e4d24a9d4 100755
--- a/testdata/lefdef/viasize2/test.def
+++ b/testdata/lefdef/viasize2/test.def
@@ -28,7 +28,7 @@ SPECIALNETS 1 ;
   + POLYGON M1 ( 300 0 ) ( 300 50 ) ( 350 50 ) ( 400 100 ) ( 400 0 )
   + ROUTED + POLYGON M2 ( 300 150 ) ( 300 200 ) ( 350 200 ) ( 400 250 ) ( 400 150 )
   + RECT M1 ( 0 0 ) ( 100 200 ) + VIA VIA1_bar E ( 100 200 )
-  + ROUTED M1 30 + MASK 2 ( 0 0 15 ) ( 100 0 0 ) VIA1_small ( 100 100 10 )
+  + ROUTED M1 30 ( 0 0 15 ) MASK 2 ( 100 0 0 ) VIA1_small ( 100 100 10 )
   + ROUTED M2 50 + SHAPE RING + STYLE 1 ( 0 100 ) ( 100 200 ) ( 200 200 )
   + ROUTED + MASK 2 + RECT M2 ( 250 0 ) ( 150 100 )
   + ROUTED + SHAPE RING + MASK 1 + VIA VIA1_large E ( 200 200 ) 
diff --git a/testdata/lefdef/viasize2/test_fail.map b/testdata/lefdef/viasize2/test_fail.map
index 07b69f430d..4b71cee3d4 100755
--- a/testdata/lefdef/viasize2/test_fail.map
+++ b/testdata/lefdef/viasize2/test_fail.map
@@ -3,6 +3,8 @@ DIEAREA ALL 1 0
 COMP ALL 2 0
 M1 NET,SPNET 7 0
 M2 NET,SPNET 9 0
+M2 NET,SPNET:MASK:1 9 1
+M2 NET,SPNET:MASK:2 9 2
 VIA1 VIA 8 0
 VIA1 VIA:SIZE:0.02x0.02 8 1
 VIA1 VIA:SIZE:0.02x0.024 8 2
diff --git a/testdata/lefdef/viasize2/test_ok.map b/testdata/lefdef/viasize2/test_ok.map
index 7b5a37a114..6c665c5d4e 100755
--- a/testdata/lefdef/viasize2/test_ok.map
+++ b/testdata/lefdef/viasize2/test_ok.map
@@ -3,6 +3,8 @@ DIEAREA ALL 1 0
 COMP ALL 2 0
 M1 NET,SPNET 7 0
 M2 NET,SPNET 9 0
+M2 NET,SPNET:MASK:1 9 1
+M2 NET,SPNET:MASK:2 9 2
 VIA1 VIA 8 0
 VIA1 VIA:SIZE:0.02x0.02 8 1
 VIA1 VIA:SIZE:0.024x0.02 8 2