From f88e8e550c35e57b6726f4d932df0a8cb06e2079 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Wed, 8 Nov 2023 15:58:05 +0100
Subject: [PATCH 01/20] Remove file level functions and variable from namespace
 rewrite

---
 .../contracts/test/NamespacedToModify.sol     |  10 ++
 .../core/src/utils/make-namespaced.test.ts.md |  12 +-
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1013 -> 957 bytes
 packages/core/src/utils/make-namespaced.ts    | 103 ++++++++++--------
 4 files changed, 79 insertions(+), 46 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 91863fc3b..2f58391cf 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -83,6 +83,8 @@ library Lib {
 }
 
 contract Consumer {
+  bytes4 public variableFromConstant = CONSTANT_USING_SELECTOR;
+
   function usingFreeFunction() pure public returns (bytes4) {
     return FreeFunctionUsingSelector();
   }
@@ -100,6 +102,14 @@ function plusTwo(uint x) pure returns (uint) {
   return x + 2;
 }
 
+function plusThree(uint x) pure returns (uint) {
+  return x + 3;
+}
+
+function plusThree(uint x, uint y) pure returns (uint) {
+  return x + y + 3;
+}
+
 using {plusTwo} for uint;
 
 contract UsingForDirectives {
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index bdcf08b29..fb58ca41d 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -82,9 +82,9 @@ Generated by [AVA](https://avajs.dev).
             ␊
           }␊
           ␊
-          uint256 constant FreeFunctionUsingSelector = 0;␊
           ␊
-          uint256 constant CONSTANT_USING_SELECTOR = 0;␊
+          ␊
+          ␊
           ␊
           library Lib {␊
             ␊
@@ -98,9 +98,15 @@ Generated by [AVA](https://avajs.dev).
             ␊
           ␊
             ␊
+          ␊
+            ␊
           }␊
           ␊
-          uint256 constant plusTwo = 0;␊
+          ␊
+          ␊
+          ␊
+          ␊
+          ␊
           ␊
           ␊
           ␊
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 760ce4135a3d057f59ab08d0d02979f71be5092b..6c4b4427684b62003263d0564828f274cd037173 100644
GIT binary patch
literal 957
zcmV;u148^kRzV<BZeeh9Xm4~Nb~6eC07mRWwgHpFAz`?bUZRdiwVL-C4dNc4vhITZ
zV6%qNiXV#z00000000B!RZnjdM-<=LjU8hM4r<jChfxSL4)_nQnxF)sP{N-`2_QL0
z?S*Q*J5HzGov~(Skqt^KI3Uqe4;A9TC5RJWq3Qu~$>%^(g@6Mefw$w0y<R5@NNq12
z>Fv(U`@J{sy_xskR<q#?x1}CDqnc@-h5>0&%t=61o4C}&jJHG06en%<lhEq^mgf;o
ze#lNc*0>c7ltW{4@IMbkfqn)00%eb(?2X3H)YS;}r<0SD7Mie-W1#|I>@TBP<`~NP
zgl~jogZ4M-!e<`ST?-vW=m}`-a}?E@@eO4-uM(VbB|_;^6&d8b1;z)U!zg8pJ#0)4
z*=GP!OT%&_HrwVvh6V>75^c=_c9%-S`Xj+Ah)_e=>eL4fOmL$C8Q7l**hyD#Es3jD
zMN_3K*ZW~#7i+>}&2Cu<-#GLd#NGg9?Ubd?h(jj;QcT0fMquXw@?9EsXfMBq?rNNJ
z((tKg)^;Jq9g`tfW-(@OTM4(XW(IDf*<Hr4<|rDJ>v(PN*p&*d-(3E_w8~t{6)mlJ
zz-CQG<pN$?S<km6*$4<$@ngZatL1a$T6Hm>-wiCj+#x~Rr}$nT!>EA9B{x)B1Pky1
zaaw}sPog`*RJ!xE>e&U_6DbFTaU-R)3_;Zztm{3YSY0$i#&zx6Iow$s+3NPTHismq
z6N?`u;hqS<-U!$G>^)7I(XIC;_sl`Kv4}VGv3IydU6-`r@EOuzWy)RQ(V5tunE`Vu
z>El$fh)eh^d{5zD8eMpa-_-gt)lRcnEG{MuN_<T`xzKPwU>-Q*3m#Put=iNbaRtBz
zL=4IkF`_a%+Y8-nLI-fMsZ24evQJ<(6L)=$s4F2i31==SpW@$AP&oPsrbYz-9Sxr~
zB#~Xb${M}>w5Cgft1zH)z)hfbN9tT5mzj*p!5yj+T1|FK$c_%sqf9CvGyBw`r-O8|
z%*M-9enEo&4O{Pb6=p6<NxFksp-?a&D+@IxI}92h0_9Dn9*Huwe}Y4l-kUQKr`0Oy
zLJf?YN(b-RRp8Y@>bkgEo*!*6&i4PZ!L;^oFpod2!TgngeSKhqsm}LX%nk^?1<D=V
zVon0&^uaCW0zj7kvljEt{_Ga>(E8jK18=oF2j%detvV+DUpba_9H``cVi8z!Qbm9|
fBSqjh*!tZ$pa?t%zzgT!Dgqw?A?YJ@V+sHO1GmA3

literal 1013
zcmV<R0}A{>RzV<BZeeh9Xm4~Nb~6eC0Gs%%z0{fW=I)fxJZc5e8YUqVsgAx~^lLlM
zGVvXF9v_Pc00000000B!Rn2c3MHJuJjUCqzoQjH552HdM4)~+4nxLehmL!Ep`KYiX
z-~iEhcbrbWJLAsG(wHhBIB?*^0T9<BPW%N(RZm>{cK`<{7tTHP?Rc|Z?<Pts0T)(!
zvorI4@6CJj@q2fBU0=9;^~DcVGwstbAbpBC38)$nmwK4-L8zJHWT0*ctv<i&c|?;B
zir+fcv=x1*gr*kYe;I^=d<OD7DxOBg?e0zLYJ`&R?Ch+CW-R1br~(-KOw=o!MkSx{
zy^!qDWTGv6<}p3A&~pfV4;~YZqFOV)r;O&8lxA9qP`Xq_0XYvr@i)jbC=-l58B7V;
zuK}c$g_UwK+h#$A#tWVj1I+^V36)0mO-fY}p@wa1Qy)Aq!HoxGVE0n6^RD1p5?8B+
zrb;)ql5OvZP2sWLu&#t}68aU){s1Z3nMj>nLN5ZOnuSf}V3z^%Ru*>ZsJti6YMOG=
z^{HpZb|s^ok|9@SFl9fmQfdEO7^jWq4;7Q1qurof$76fPX*6*A`s(|&4dzm=Xl>mC
zHR~}dm+<C#r#z5kFCbXOmj!>+tiN7wHJ8if!;Qsj`y?3n6yGUh_!{8xiW@2|f+c9c
zoYvs_ljw{vmF{Azd0~l;OzHt)+*m0sLvXbT<MzlXb{Bmi<GOWe0q-y8riP=bg9*!*
zQiEMdxF-ULH^PmYqr2%ahV4=3j#&tIm+?V4&JOpf>ykb!K1aH&PPr>QIv2+?H&&iY
z=XkDK#Wj2Z+L!UC-67n>i><__x!>zmtIO$tQmxrfE;O7Ega^s^f=BG3)quLWQ~+#1
z#GpJ8BO3Gbqph1y`2a08%oM8{$85|&>a5=(>RQOngEI$I&ggd(5J!SwDsKSj!@~os
zC>o8gNlFh<#>41U3yI&r(N)VCtZZ+!J6E?lyF2amt+#jEYa44To$YsHxX-$h$RXZf
z-O-xaC|AHw7*ILZ9v9ib4^`*3h#lt=6>^oyh<`q&Dz%iMli%Pu{t5D^kRgD=F~m1h
zOx~|$CR)YG2Mvt!9!z~$j2#xPN=b&}UZqkopj!aAodHcxfXap%o{gv>S-~MnAFY{*
z-|+?+0_nz8Y#$$4#^9O*SGc%YU(8oD=fVH7qV<ojXx}|qMZ2GZy>enjYc3`=?RPMI
z2vRz^rkw}Kt0&jAHvzKxpVhR#?5D12Us_LF)8MYw7l42NS(-EZ|AJ##XF+Pt6OzCc
jCqn|%$&tWUF!i-_0tx&GfS;Uyiv%766wNAS)CvFq$<gdK

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index 282c2dde5..532c73720 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -44,52 +44,69 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
     const modifications: Modification[] = [];
 
     for (const node of output.sources[sourcePath].ast.nodes) {
-      if (isNodeType('ContractDefinition', node)) {
-        const contractDef = node;
-
-        // Remove any calls to parent constructors from the inheritance list
-        const inherits = contractDef.baseContracts;
-        for (const inherit of inherits) {
-          if (Array.isArray(inherit.arguments)) {
-            assert(inherit.baseName.name !== undefined);
-            modifications.push(makeReplace(inherit, orig, inherit.baseName.name));
-          }
-        }
-
-        const contractNodes = contractDef.nodes;
-        for (const contractNode of contractNodes) {
-          if (
-            isNodeType('FunctionDefinition', contractNode) ||
-            isNodeType('ModifierDefinition', contractNode) ||
-            isNodeType('VariableDeclaration', contractNode)
-          ) {
-            if (contractNode.documentation) {
-              modifications.push(makeDelete(contractNode.documentation, orig));
+      switch (node.nodeType) {
+        case 'ContractDefinition':
+          const contractDef = node;
+
+          // Remove any calls to parent constructors from the inheritance list
+          const inherits = contractDef.baseContracts;
+          for (const inherit of inherits) {
+            if (Array.isArray(inherit.arguments)) {
+              assert(inherit.baseName.name !== undefined);
+              modifications.push(makeReplace(inherit, orig, inherit.baseName.name));
             }
-            modifications.push(makeDelete(contractNode, orig));
-          } else if (isNodeType('UsingForDirective', contractNode)) {
-            modifications.push(makeDelete(contractNode, orig));
-          } else if (isNodeType('StructDefinition', contractNode)) {
-            const storageLocation = getStorageLocationAnnotation(contractNode);
-            if (storageLocation !== undefined) {
-              const structName = contractNode.name;
-              const variableName = `$${structName}_${(Math.random() * 1e6).toFixed(0)}`;
-              const insertText = ` ${structName} ${variableName};`;
-
-              modifications.push(makeInsertAfter(contractNode, insertText));
+          }
+
+          const contractNodes = contractDef.nodes;
+          for (const contractNode of contractNodes) {
+            switch(contractNode.nodeType) {
+              case 'FunctionDefinition':
+              case 'ModifierDefinition':
+              case 'VariableDeclaration':
+                if (contractNode.documentation) {
+                  modifications.push(makeDelete(contractNode.documentation, orig));
+                }
+                modifications.push(makeDelete(contractNode, orig));
+                break;
+
+              case 'UsingForDirective':
+                modifications.push(makeDelete(contractNode, orig));
+                break;
+
+              case 'StructDefinition':
+                const storageLocation = getStorageLocationAnnotation(contractNode);
+                if (storageLocation !== undefined) {
+                  const structName = contractNode.name;
+                  const variableName = `$${structName}_${(Math.random() * 1e6).toFixed(0)}`;
+                  const insertText = ` ${structName} ${variableName};`;
+
+                  modifications.push(makeInsertAfter(contractNode, insertText));
+                }
+                break;
+
+              case 'EnumDefinition':
+              case 'ErrorDefinition':
+              case 'EventDefinition':
+              case 'UserDefinedValueTypeDefinition':
+                // nothing
+                break;
             }
           }
-        }
-      } else if (isNodeType('FunctionDefinition', node) || isNodeType('VariableDeclaration', node)) {
-        if (node.documentation) {
-          modifications.push(makeDelete(node.documentation, orig));
-        }
-        // Replace with a dummy variable of arbitrary type
-        const name = node.name;
-        const insertText = `uint256 constant ${name} = 0;`;
-        modifications.push(makeReplace(node, orig, insertText));
-      } else if (isNodeType('UsingForDirective', node)) {
-        modifications.push(makeDelete(node, orig));
+          break;
+
+        case 'FunctionDefinition':
+        case 'UsingForDirective':
+        case 'VariableDeclaration':
+          modifications.push(makeDelete(node, orig));
+          break;
+
+        case 'EnumDefinition':
+        case 'ErrorDefinition':
+        case 'ImportDirective':
+        case 'PragmaDirective':
+        case 'StructDefinition':
+        case 'UserDefinedValueTypeDefinition':
+          break;
       }
     }
 

From 49fa93e9586a6f6d5cfdcb9e2a50562a0520bdf1 Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Wed, 8 Nov 2023 16:04:15 +0100
Subject: [PATCH 02/20] lint

---
 packages/core/src/utils/make-namespaced.ts | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index 532c73720..ea530f560 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -45,7 +45,7 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
 
     for (const node of output.sources[sourcePath].ast.nodes) {
       switch (node.nodeType) {
-        case 'ContractDefinition':
+        case 'ContractDefinition': {
           const contractDef = node;
 
           // Remove any calls to parent constructors from the inheritance list
@@ -59,21 +59,21 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
 
           const contractNodes = contractDef.nodes;
           for (const contractNode of contractNodes) {
-            switch(contractNode.nodeType) {
+            switch (contractNode.nodeType) {
               case 'FunctionDefinition':
               case 'ModifierDefinition':
-              case 'VariableDeclaration':
+              case 'VariableDeclaration': {
                 if (contractNode.documentation) {
                   modifications.push(makeDelete(contractNode.documentation, orig));
                 }
                 modifications.push(makeDelete(contractNode, orig));
                 break;
-
-              case 'UsingForDirective':
+              }
+              case 'UsingForDirective': {
                 modifications.push(makeDelete(contractNode, orig));
                 break;
-
-              case 'StructDefinition':
+              }
+              case 'StructDefinition': {
                 const storageLocation = getStorageLocationAnnotation(contractNode);
                 if (storageLocation !== undefined) {
                   const structName = contractNode.name;
@@ -83,30 +83,33 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
                   modifications.push(makeInsertAfter(contractNode, insertText));
                 }
                 break;
-
+              }
               case 'EnumDefinition':
               case 'ErrorDefinition':
               case 'EventDefinition':
-              case 'UserDefinedValueTypeDefinition':
+              case 'UserDefinedValueTypeDefinition': {
                 // nothing
                 break;
+              }
             }
           }
           break;
-
+        }
         case 'FunctionDefinition':
         case 'UsingForDirective':
-        case 'VariableDeclaration':
+        case 'VariableDeclaration': {
           modifications.push(makeDelete(node, orig));
           break;
-
+        }
         case 'EnumDefinition':
         case 'ErrorDefinition':
         case 'ImportDirective':
         case 'PragmaDirective':
         case 'StructDefinition':
-        case 'UserDefinedValueTypeDefinition':
+        case 'UserDefinedValueTypeDefinition': {
+          // nothing
           break;
+        }
       }
     }
 

From 2af8660e78397d5e46bd5860eb0e2a1839195d4d Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Wed, 8 Nov 2023 16:10:31 +0100
Subject: [PATCH 03/20] up

---
 packages/core/src/utils/make-namespaced.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index ea530f560..fd9be1aaa 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -60,6 +60,8 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           const contractNodes = contractDef.nodes;
           for (const contractNode of contractNodes) {
             switch (contractNode.nodeType) {
+              case 'ErrorDefinition':
+              case 'EventDefinition':
               case 'FunctionDefinition':
               case 'ModifierDefinition':
               case 'VariableDeclaration': {
@@ -85,16 +87,15 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
                 break;
               }
               case 'EnumDefinition':
-              case 'ErrorDefinition':
-              case 'EventDefinition':
               case 'UserDefinedValueTypeDefinition': {
-                // nothing
+                // keep: it may be used in structures with storage locations
                 break;
               }
             }
           }
           break;
         }
+        case 'ErrorDefinition':
         case 'FunctionDefinition':
         case 'UsingForDirective':
         case 'VariableDeclaration': {
@@ -102,12 +103,15 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           break;
         }
         case 'EnumDefinition':
-        case 'ErrorDefinition':
         case 'ImportDirective':
         case 'PragmaDirective':
         case 'StructDefinition':
         case 'UserDefinedValueTypeDefinition': {
-          // nothing
+          // - EnumDefinition may be used in structures with storage locations
+          // - ImportDirective may import types used in structures with storage locations
+          // - PragmaDirective is necessary for compilation
+          // - StructDefinition may be used in structures with storage locations
+          // - UserDefinedValueTypeDefinition may be used in structures with storage locations
           break;
         }
       }

From 66f197699e9212dea083ac0bb38abc2f8cdb1f2a Mon Sep 17 00:00:00 2001
From: Hadrien Croubois <hadrien.croubois@gmail.com>
Date: Wed, 8 Nov 2023 17:04:24 +0100
Subject: [PATCH 04/20] add default cases

---
 packages/core/src/utils/make-namespaced.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index fd9be1aaa..a7f2bb9fe 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -87,31 +87,29 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
                 break;
               }
               case 'EnumDefinition':
-              case 'UserDefinedValueTypeDefinition': {
-                // keep: it may be used in structures with storage locations
+              case 'UserDefinedValueTypeDefinition':
+              default: {
+                // - EnumDefinition may be used in structures with storage locations
+                // - UserDefinedValueTypeDefinition may be used in structures with storage locations
+                // - default: in case unexpected ast nodes show up
                 break;
               }
             }
           }
           break;
         }
-        case 'ErrorDefinition':
-        case 'FunctionDefinition':
-        case 'UsingForDirective':
-        case 'VariableDeclaration': {
-          modifications.push(makeDelete(node, orig));
-          break;
-        }
         case 'EnumDefinition':
         case 'ImportDirective':
         case 'PragmaDirective':
         case 'StructDefinition':
-        case 'UserDefinedValueTypeDefinition': {
+        case 'UserDefinedValueTypeDefinition':
+        default: {
           // - EnumDefinition may be used in structures with storage locations
           // - ImportDirective may import types used in structures with storage locations
           // - PragmaDirective is necessary for compilation
           // - StructDefinition may be used in structures with storage locations
           // - UserDefinedValueTypeDefinition may be used in structures with storage locations
+          // - default: in case unexpected ast nodes show up (file-level events since 0.8.22)
           break;
         }
       }

From 02645046b1d2b961b35d2ba043735e959a8aae6f Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 8 Nov 2023 12:01:22 -0500
Subject: [PATCH 05/20] Add test for importing free fn and constant

---
 packages/core/contracts/test/NamespacedToModifyImported.sol | 6 ++++++
 packages/core/src/utils/make-namespaced.test.ts             | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/contracts/test/NamespacedToModifyImported.sol

diff --git a/packages/core/contracts/test/NamespacedToModifyImported.sol b/packages/core/contracts/test/NamespacedToModifyImported.sol
new file mode 100644
index 000000000..afc07ecc8
--- /dev/null
+++ b/packages/core/contracts/test/NamespacedToModifyImported.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {CONSTANT_USING_SELECTOR, plusTwo} from "./NamespacedToModify.sol";
+
+contract Example {}
\ No newline at end of file
diff --git a/packages/core/src/utils/make-namespaced.test.ts b/packages/core/src/utils/make-namespaced.test.ts
index da02b8418..95a1c8b85 100644
--- a/packages/core/src/utils/make-namespaced.test.ts
+++ b/packages/core/src/utils/make-namespaced.test.ts
@@ -12,7 +12,7 @@ import { SolcInput, SolcOutput } from '../solc-api';
 import { BuildInfo } from 'hardhat/types';
 
 test('make namespaced input', async t => {
-  const origBuildInfo = await artifacts.getBuildInfo('contracts/test/NamespacedToModify.sol:Example');
+  const origBuildInfo = await artifacts.getBuildInfo('contracts/test/NamespacedToModifyImported.sol:Example');
   await testMakeNamespaced(origBuildInfo, t, '0.8.20');
 });
 

From 0a49f9b1331ed66ffcb099956727fc809d6540d5 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 8 Nov 2023 12:03:01 -0500
Subject: [PATCH 06/20] Add overloaded import

---
 packages/core/contracts/test/NamespacedToModifyImported.sol | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/contracts/test/NamespacedToModifyImported.sol b/packages/core/contracts/test/NamespacedToModifyImported.sol
index afc07ecc8..594bba0de 100644
--- a/packages/core/contracts/test/NamespacedToModifyImported.sol
+++ b/packages/core/contracts/test/NamespacedToModifyImported.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {CONSTANT_USING_SELECTOR, plusTwo} from "./NamespacedToModify.sol";
+import {CONSTANT_USING_SELECTOR, plusTwo, plusThree} from "./NamespacedToModify.sol";
 
 contract Example {}
\ No newline at end of file

From 6fbc54fba7926492a0b2d753fd82ae44d3a230c5 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 14:51:55 -0500
Subject: [PATCH 07/20] Replace errors, free fns, vars with dummy variable

---
 .../contracts/test/NamespacedToModify.sol     |  12 +++++-
 .../test/NamespacedToModifyImported.sol       |   6 ++-
 .../core/src/utils/make-namespaced.test.ts.md |  36 +++++++++---------
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1245 -> 1218 bytes
 packages/core/src/utils/make-namespaced.ts    |  17 +++++++++
 5 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index ad33b703e..88a15bf80 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -61,6 +61,11 @@ contract Example {
      * @notice some natspec
      */
     function foo4() public {}
+
+    /**
+     * @dev a custom error inside a contract
+     */
+    error CustomErrorInsideContract(address a);
 }
 
 contract HasFunction {
@@ -124,4 +129,9 @@ contract UsingForDirectives {
   function usingFor(uint x) pure public returns (uint) {
     return x.plusOne() + x.plusTwo();
   }
-}
\ No newline at end of file
+}
+
+/**
+ * @dev a custom error outside a contract
+ */
+error CustomErrorOutsideContract(address a);
\ No newline at end of file
diff --git a/packages/core/contracts/test/NamespacedToModifyImported.sol b/packages/core/contracts/test/NamespacedToModifyImported.sol
index 594bba0de..b3f5301ca 100644
--- a/packages/core/contracts/test/NamespacedToModifyImported.sol
+++ b/packages/core/contracts/test/NamespacedToModifyImported.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {CONSTANT_USING_SELECTOR, plusTwo, plusThree} from "./NamespacedToModify.sol";
+import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract} from "./NamespacedToModify.sol";
 
-contract Example {}
\ No newline at end of file
+contract Example {
+  using {plusTwo} for uint;
+}
\ No newline at end of file
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 111e17859..715a2aff6 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -78,6 +78,9 @@ Generated by [AVA](https://avajs.dev).
           ␊
               ␊
               ␊
+          ␊
+              ␊
+              ␊
           }␊
           ␊
           contract HasFunction {␊
@@ -89,11 +92,9 @@ Generated by [AVA](https://avajs.dev).
             ␊
           }␊
           ␊
-          function FreeFunctionUsingSelector() pure returns (bytes4) {␊
-              return HasFunction.foo.selector;␊
-          }␊
+          uint256 constant FreeFunctionUsingSelector = 0;␊
           ␊
-          bytes4 constant CONSTANT_USING_SELECTOR = HasFunction.foo.selector;␊
+          uint256 constant CONSTANT_USING_SELECTOR = 0;␊
           ␊
           library Lib {␊
             ␊
@@ -111,33 +112,34 @@ Generated by [AVA](https://avajs.dev).
             ␊
           }␊
           ␊
-          function plusTwo(uint x) pure returns (uint) {␊
-            return x + 2;␊
-          }␊
+          uint256 constant plusTwo = 0;␊
           ␊
-          function plusThree(uint x) pure returns (uint) {␊
-            return x + 3;␊
-          }␊
+          uint256 constant plusThree = 0;␊
+          ␊
+          uint256 constant plusThree = 0;␊
           ␊
-          function plusThree(uint x, uint y) pure returns (uint) {␊
-            return x + y + 3;␊
-          }␊
           ␊
-          using {plusTwo} for uint;␊
           ␊
           contract UsingForDirectives {␊
             ␊
           ␊
             ␊
-          }`,
+          }␊
+          ␊
+          /**␊
+           * @dev a custom error outside a contract␊
+           */␊
+          uint256 constant CustomErrorOutsideContract = 0;`,
         },
         'contracts/test/NamespacedToModifyImported.sol': {
           content: `// SPDX-License-Identifier: MIT␊
           pragma solidity ^0.8.20;␊
           ␊
-          import {CONSTANT_USING_SELECTOR, plusTwo, plusThree} from "./NamespacedToModify.sol";␊
+          import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract} from "./NamespacedToModify.sol";␊
           ␊
-          contract Example {}`,
+          contract Example {␊
+            ␊
+          }`,
         },
       },
     }
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 52c8007f5fb4d81a3f655b2e61ca6988b75438e7..1be1b4b6bbd6844542b08fa45457de832e305064 100644
GIT binary patch
literal 1218
zcmV;z1U>sfRzV<BZeeh9Xm4~Nb~6eC0EEUKhpe;qSfuj<YyYc4nH<N3kK7^IKm+=V
znYxfJDIbdn00000000BcR!wLmMHKFzWM?wEP8LNFJQQJ9lQHwN5fe#t$&zF>kRNqs
zWd+$#(_ND-)7>>xRmU0QtmwgmCr_dv$ciV=UR1<`f{Q2dv{%8?dJ*y9(bv^IGd<lI
zJCPL}sGhER-+T4dd)4o~Tdk(UtON1Rr$kce5Z}cI1bNscqKz$LBkHw%Nri{o;s%rA
z?OV2uC4Ob<O;gKh!B5ZY6N~Ww3=9I}Ef^2#XU^$ocAKveOX~XIb$WVQ)6Z(Usp&<)
z7!L(+ljrojgS~wp?~}noojKH|va9J2==z6XaUc;yO6u(kCHWyH$qD9jiwH&N4-otX
z1L>N!q9+I$qlEIh`6@t~Fg{8`^O@WW<j{SYa6y^ZUz%)VPD6rs^dZ41)|S+zZxF6T
zrZE&1nJ>Z3b>hHIU`g#{C|D^5yI?U-a%@Ral|;zu&LB(;w#{tX>Q)4El-i3iwQ{D~
zrrTy*5<64}hjc*wCXA1bghR}v?~E@2@@*0}k%IjUkUL4(R0{S5T&k~f30NT&1tSrK
z9Px0|A-0+u#e{T%`<_sf3FEe=4Cu;BpX7&L(o228sO7+U#FNq7_<EvRMfDffua&o`
zMLa>un>L7PixR$!wl^DvHplxeMk2bx=z6X4bY-EoQYiG}fHpeVZ94=V6%hQYU~$#*
zg=FqBJV2e4;iJUCO+bWOOAED&%Oq5(xR`oMOGxg6sco3oL#4=E@bjrB7oJ)~ot4y5
zH(ctCXr7Nv_Bi%z<^tbSlM@7vXk*@uGpzR)$J4}Vn$14Vl=}JP$|&LRar|rCZ=kJS
zj?|X0AL{i_j1Gup;RB#Ci<`7UJd4?6HexnA6wbthGBY=a%IG3IA44~rUHH<TTo~xo
zI<3~++)A8K?5TY0F$ot6=)qwe<^@SuiZ-!QM**+`VTH0;gs7HEp%Y6n8z4n0!AGKM
zwvT$Td-^;USA0*UBo(znLVi_1Djp!HNGkxkA5qW>h)HyX6VgX13t`@496gJI&m^U=
zw!2erT;6HyU9E5KJhxZh*xFcY?7kGi9opn@8PFDOhI=Miu7MrjC44B2p;DW*9bYtF
zXXCgi@eMe^NdYN$F}_ZDkmnDH7$K}8SVF5dIYbzR-yD2m92^7nK~S3n%aO4{5X`iv
zl+s3^vm2_c^*0aLoG8P6ul@TBM^zy~M`I#3-}mnP&`tCIK)Q!o9DFcS8B^+J#wFE4
zPnEGBA;13w<ClD*qD&rFQJ^6FIV=d8T6kn?v_e3Mx&%w>Q<1^R%berx@U2)ZD$q3m
zTu*><BcOtc#Qi}e20NHo$m1nvqujfNyKonxX03yc?baX-fp08St1P7(H}m%Yp>g|e
zOyg$W1;Oty?#pc2jCp`8WH)SKU=PMOVjt)kjab+#d=rB`p4m~=mIl4lub_ArMn1cj
zx&V+TvU{mZ09nuIrS4sm^qX<&Ch6T%rx3WSl|`tJ_qO&Z|37SM+M_Va<_VL)s+mXv
g#7rfD_h9LLGb0In27u4a|0)Um4VYbbsk;pT0Qw<LTmS$7

literal 1245
zcmV<31S0!ERzV<BZeeh9Xm4~Nb~6eC0612IwH_@epk|`PRCq}YvfM)L+Z@^Qnjdz*
z-d+!P1RskC00000000BcR^4kHRTQ6(q}g4qn^F-3g-c8|yUl)dtBGW-v?Qqp@}cfl
z6vS|M=59J>X6|tBow{pCMIRId!6#AhrBV?54}1_Gq}XSl`Um(R^+kO0(KB~uXJ==!
z-9#!laA)tF^E>CBkGtobTiuRLjeY*{w?tUNCccCB339PRxQ7j5BFpuBVR09G{5lo<
zqg$ql1%5k!M^|Q);8Anx)Drx@1dG7>5Y}1s)EV{EPUk&h2vv=@v$L~`dRkF+MJ)nG
zdpy`ppHXu*cK3X|M`A*Y+LmdFzM?*+s$YS|n8S$>mb=F#=a&R$hEtyzgiC||0><C4
zkg6z6HD!=CYEVwq-vLMm*4JrhZldi4a>IF(Fm6$IK$`Y2vqA&!sY3(v)DxCteL$FG
z>DrK0q`rVKw}=fVfhKv9CSm0S?3_Ve!LT8CO%N_>+i{xObc>o+w_oMdmSV3b#3~cT
zHXM&KLCjDb0@4HVo3OsoQUTG^vD1D4$WLk5R0j4dK<=es`3&sooT5CFOTh}6ENH1L
z%n%oMY+}l9t(f9YG2i9#V@kWLNCm2l((k!pl+^NoF{(KT9&ttVt<6u@YN++v+FO-P
z%OEZ%l?@ZvR@WkI1#NA#3m(IJ4n{n>!sy+4^~GwV-YgUbc|hwu?07ao2L%LA4K!Xh
zd@iW70xu9J75G!);3go#jO9lC!U_pRst&eXDa8fzLDd#~w?d&vUGVspD;h5>p<XjX
z>W8Gm5y|<)$1cOJNgc5F#Kv&~E}EG2lNPoH#PMe0teKsGnHll<G-cG_@OAVy88?uY
zn*(_yoQDnv9;1C?7<eDdSil{tN?e1QWFfL_VaS|ICS|TvLKSoY-p`_&oj&~2E;eGB
zdav6pm6}O|5^ot}mkPL0U>-PQQ#UBWf_ucsxB_4a!V+cD2vIAS!yuLuI)IC0fsa_V
zF@ZTuT+UZ9zv{cP4#`v%Qv7Qi>Tis&cvb+=-2ve$BV@ppl3|gfY@viapAp1}@R`fe
zf{fYorRaKu<fQIumr}T4p>#7iB$Pm4S>Ulit2^7R_Lc4S?zPs&_A9%s_09Fw_RbsV
z(gV~KY^%fIE}>1U6I!44cNNt84q-!X0u}q|**<T-Pi4kYFYQ}E4Lyte>Y?+f(adVN
z4&ge9j*Ac0u^3+N{;_oRV|{**D0C3{bcni?Nkz@fHK1(GVnNfoL3kp3$10__m49DK
zE!nZq!I+dU4)U=$3<<cwsDtLJWBTUYkrnz-_QSJzMR^idIiG4x(?_)?=q#7=ac5B^
zp_3nNHPGum1=8mOh0|9U!~Nl|SS(7=EdYF%0?mwo3Nq4<29b_W&@mTBb52J^d=vL!
z=!mAi9y)UDgL(#WF;Km_oSgvmyZ?s?@aHiTpne}1f5LiX;`FC20;Dl{@(UBYKYpV7
zQk^i-g+s@W3D|QJN3;5JJe2(gg7;zNCJ$xj0CIlvQ1&uF)+P*P4{zG~Lp$-b^~s4#
z1l-l?5;WR}+s|bDpU@TMDOeT#m_^{So+<)F&lG{rfb@kvp$Oat!1wxpRRsP4!h&YW
H1P%ZI8}MJh

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index a7f2bb9fe..e30147db6 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -98,6 +98,23 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           }
           break;
         }
+        // - UsingFor can be deleted since its result only takes effect in functions
+        case 'UsingForDirective': {
+          modifications.push(makeDelete(node, orig));
+          break;
+        }
+        // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files,
+        //   so they cannot be deleted. Instead, they are converted to dummy variables if one of the same name
+        //   does not already exist.
+        case 'ErrorDefinition':
+        case 'FunctionDefinition':
+        case 'VariableDeclaration': {
+          // Replace with a dummy variable of arbitrary type
+          const name = node.name;
+          const insertText = `uint256 constant ${name} = 0;`;
+          modifications.push(makeReplace(node, orig, insertText));
+          break;
+        }
         case 'EnumDefinition':
         case 'ImportDirective':
         case 'PragmaDirective':

From aca3a01cdd353d9b43b2e4f738250590e8a81e9c Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 15:27:47 -0500
Subject: [PATCH 08/20] Check for duplicate identifiers

---
 .../contracts/test/NamespacedToModify.sol     |   2 +-
 .../test/NamespacedToModifyImported.sol       |   3 ++-
 .../core/src/utils/make-namespaced.test.ts.md |   8 ++++---
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1218 -> 1230 bytes
 packages/core/src/utils/make-namespaced.ts    |  21 +++++++++++++-----
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 88a15bf80..e7446bde9 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -134,4 +134,4 @@ contract UsingForDirectives {
 /**
  * @dev a custom error outside a contract
  */
-error CustomErrorOutsideContract(address a);
\ No newline at end of file
+error CustomErrorOutsideContract(Example a);
diff --git a/packages/core/contracts/test/NamespacedToModifyImported.sol b/packages/core/contracts/test/NamespacedToModifyImported.sol
index b3f5301ca..2961c1238 100644
--- a/packages/core/contracts/test/NamespacedToModifyImported.sol
+++ b/packages/core/contracts/test/NamespacedToModifyImported.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract} from "./NamespacedToModify.sol";
+import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract, Example as ParentExample} from "./NamespacedToModify.sol";
 
 contract Example {
   using {plusTwo} for uint;
+  error ChildCustomError(ParentExample a);
 }
\ No newline at end of file
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 715a2aff6..a531b3cc5 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -116,7 +116,7 @@ Generated by [AVA](https://avajs.dev).
           ␊
           uint256 constant plusThree = 0;␊
           ␊
-          uint256 constant plusThree = 0;␊
+          ␊
           ␊
           ␊
           ␊
@@ -129,16 +129,18 @@ Generated by [AVA](https://avajs.dev).
           /**␊
            * @dev a custom error outside a contract␊
            */␊
-          uint256 constant CustomErrorOutsideContract = 0;`,
+          uint256 constant CustomErrorOutsideContract = 0;␊
+          `,
         },
         'contracts/test/NamespacedToModifyImported.sol': {
           content: `// SPDX-License-Identifier: MIT␊
           pragma solidity ^0.8.20;␊
           ␊
-          import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract} from "./NamespacedToModify.sol";␊
+          import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract, Example as ParentExample} from "./NamespacedToModify.sol";␊
           ␊
           contract Example {␊
             ␊
+            ␊
           }`,
         },
       },
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 1be1b4b6bbd6844542b08fa45457de832e305064..c84b022de8f87f8938a930bddfd147692223805b 100644
GIT binary patch
literal 1230
zcmV;<1Tp(TRzV<BZeeh9Xm4~Nb~6eC0J?A+!g}|3WHIIc1L8g^Het{PNPKbuf{g-N
zenw&4&L4{i00000000BcR?Tl4MHJtUq_GXfsX&MWhf&l*;>I5hB0&j7shkud<)dJi
z4+)6IyW@25?v6Dx8)Bjq!GQxOP8CQ6sfZK*0SCl^1LcIosYj4FwHE{zj=Y^++w0w!
zZBUU|Y4&5@@4flWd$aGoTkV#^td98bOCqUsi0|SKK^}IA=wgf5h<aULQsLpQxW=UT
z;FfJ;iQmW{n%a~WTzXEQScK>EFbItIVLYmzI-{T3X}v=%sq2H+>FH@rKdtGerWXNY
zJQlo7p3!p-_V#?dM+OrO=1`l;o~A#d>z{(ffkY4~skbMT<cFAKN-&>WL?}XkfZ#6}
zNY}I#JweDAC6v?6Hv!Uu@mUg@%j8}l`|hiR3(CCy)MOWP8WOyt4+-X3S5lY0N4OH1
z#!ysbz63WnhyyEuCAE^FV5J!BoW(rJu_Z-S5+SSGgD^GO7PD!)R}sunYA?ss%9&~#
zZkKUM>`)yXascYrVcawl4l$FyGrj@HcS+bp3idNV?j&LP6zm2Zs+&^@SRoY!BN2ru
z;^CG<Z1rsv6VeIpdqRCo7`HWLKv!P+A~*DsUg`@*EeFmco{YYY&nK!?)VQ+tdU=yt
z#1o{vVS|{qDdEd#Yol4{a=hnaB%&jX-mX=it1Q%33Wa_g(E0&(yADBz1q4?WEUsF<
zkj!0%8>o{q{FFF235alOX`yyunS?487gJAZ3CVphwFTdeP$@DOTt4;W!n2F$U?nxx
z3#X1oG|$F9b~*NJ<^tanlM@8CXk*@sGi>xH$J4}Vnyo&~l=|7^%qZdTcKmDHZ=kJS
z4%L#d9y;pp7<Gtc;SSK4#VuMPp2ci38!?+53TNU$nVFkIWpn}VPoe9r9{g#~EDUsN
z2krLU+)A8K?5=$5F$o6>=)q<j<^@SuiY~EITLG{FVTH0;gs7HEp%Y6n8z4n0!AGKM
zwvUct=kz5kF8iKJNh)fEg#4<2R6IaXkyZe7Kcb)&5R>RKC!~*37Q(#8IJ$^}-z23_
z-`Q?7FKst>uQoQeU)*i1Z?4yyJFi4=hqgEz2DC|A;hIU7b+F^Rgb$@LRBExV<BR6I
zY#bLQz6Lvp0Kt{;2jgp$2Z?;2h!I9AL?yIplYN9y_*20@#9`-900gy3FdZ2y1kp;n
zLMg2WIy<3Cy}!8Pb6+{^SMA^DFse!gIvf*|`M&?=hn|}M2iEh0T!;m_f;rHLCXP^>
zgL`HwW6IpjxP+>lt*Y3MklufS@k=gIP$rKnC{Pdn9M%I(O+1kwEf7$lF2Ynj9~qpy
z#5wK_--^Ye0=))+w-TVK5l}&e>ER$ugB46H<nfZzQR>~qJvb>*uXccrZPp+QfqN`e
zt1PAaHuLuXp>O+sOy6eS1;Oty9?I<5jCp`8WcO=fU_0acup4?t9~QO>-^O51XEs!|
zr9mt88z|m|k;`tS&H?0nb}RJ)K-Mx^sR!31-7`+yBYkw@`~qjSvIynz!ImE7|Hn;D
sdlE+3yw4=CY9^8ZF;hw4W0?BH%t!)X0pM%%ze)ms1H1QAIl2u10F#eHyZ`_I

literal 1218
zcmV;z1U>sfRzV<BZeeh9Xm4~Nb~6eC0EEUKhpe;qSfuj<YyYc4nH<N3kK7^IKm+=V
znYxfJDIbdn00000000BcR!wLmMHKFzWM?wEP8LNFJQQJ9lQHwN5fe#t$&zF>kRNqs
zWd+$#(_ND-)7>>xRmU0QtmwgmCr_dv$ciV=UR1<`f{Q2dv{%8?dJ*y9(bv^IGd<lI
zJCPL}sGhER-+T4dd)4o~Tdk(UtON1Rr$kce5Z}cI1bNscqKz$LBkHw%Nri{o;s%rA
z?OV2uC4Ob<O;gKh!B5ZY6N~Ww3=9I}Ef^2#XU^$ocAKveOX~XIb$WVQ)6Z(Usp&<)
z7!L(+ljrojgS~wp?~}noojKH|va9J2==z6XaUc;yO6u(kCHWyH$qD9jiwH&N4-otX
z1L>N!q9+I$qlEIh`6@t~Fg{8`^O@WW<j{SYa6y^ZUz%)VPD6rs^dZ41)|S+zZxF6T
zrZE&1nJ>Z3b>hHIU`g#{C|D^5yI?U-a%@Ral|;zu&LB(;w#{tX>Q)4El-i3iwQ{D~
zrrTy*5<64}hjc*wCXA1bghR}v?~E@2@@*0}k%IjUkUL4(R0{S5T&k~f30NT&1tSrK
z9Px0|A-0+u#e{T%`<_sf3FEe=4Cu;BpX7&L(o228sO7+U#FNq7_<EvRMfDffua&o`
zMLa>un>L7PixR$!wl^DvHplxeMk2bx=z6X4bY-EoQYiG}fHpeVZ94=V6%hQYU~$#*
zg=FqBJV2e4;iJUCO+bWOOAED&%Oq5(xR`oMOGxg6sco3oL#4=E@bjrB7oJ)~ot4y5
zH(ctCXr7Nv_Bi%z<^tbSlM@7vXk*@uGpzR)$J4}Vn$14Vl=}JP$|&LRar|rCZ=kJS
zj?|X0AL{i_j1Gup;RB#Ci<`7UJd4?6HexnA6wbthGBY=a%IG3IA44~rUHH<TTo~xo
zI<3~++)A8K?5TY0F$ot6=)qwe<^@SuiZ-!QM**+`VTH0;gs7HEp%Y6n8z4n0!AGKM
zwvT$Td-^;USA0*UBo(znLVi_1Djp!HNGkxkA5qW>h)HyX6VgX13t`@496gJI&m^U=
zw!2erT;6HyU9E5KJhxZh*xFcY?7kGi9opn@8PFDOhI=Miu7MrjC44B2p;DW*9bYtF
zXXCgi@eMe^NdYN$F}_ZDkmnDH7$K}8SVF5dIYbzR-yD2m92^7nK~S3n%aO4{5X`iv
zl+s3^vm2_c^*0aLoG8P6ul@TBM^zy~M`I#3-}mnP&`tCIK)Q!o9DFcS8B^+J#wFE4
zPnEGBA;13w<ClD*qD&rFQJ^6FIV=d8T6kn?v_e3Mx&%w>Q<1^R%berx@U2)ZD$q3m
zTu*><BcOtc#Qi}e20NHo$m1nvqujfNyKonxX03yc?baX-fp08St1P7(H}m%Yp>g|e
zOyg$W1;Oty?#pc2jCp`8WH)SKU=PMOVjt)kjab+#d=rB`p4m~=mIl4lub_ArMn1cj
zx&V+TvU{mZ09nuIrS4sm^qX<&Ch6T%rx3WSl|`tJ_qO&Z|37SM+M_Va<_VL)s+mXv
g#7rfD_h9LLGb0In27u4a|0)Um4VYbbsk;pT0Qw<LTmS$7

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index e30147db6..bc4f5df8b 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -41,6 +41,7 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
 
     const orig = Buffer.from(source.content, 'utf8');
 
+    const replacedIdentifiers = new Set<string>();
     const modifications: Modification[] = [];
 
     for (const node of output.sources[sourcePath].ast.nodes) {
@@ -103,16 +104,24 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           modifications.push(makeDelete(node, orig));
           break;
         }
-        // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files,
-        //   so they cannot be deleted. Instead, they are converted to dummy variables if one of the same name
-        //   does not already exist.
+        // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files, so they cannot be deleted.
+        //   However, we need to remove their values to avoid referencing other deleted nodes.
+        //   We do this by converting them to dummy variables, but avoiding duplicate names.
         case 'ErrorDefinition':
         case 'FunctionDefinition':
         case 'VariableDeclaration': {
-          // Replace with a dummy variable of arbitrary type
+          // If an identifier with the same name was not previously written, replace with a dummy variable.
+          // Otherwise delete to avoid duplicate names, which can happen if there was overloading.
+          // This does not need to check all identifiers from the original contract, since the original compilation
+          // should have failed if there were conflicts in the first place.
           const name = node.name;
-          const insertText = `uint256 constant ${name} = 0;`;
-          modifications.push(makeReplace(node, orig, insertText));
+          if (!replacedIdentifiers.has(name)) {
+            const insertText = `uint256 constant ${name} = 0;`;
+            modifications.push(makeReplace(node, orig, insertText));
+            replacedIdentifiers.add(name);
+          } else {
+            modifications.push(makeDelete(node, orig));
+          }
           break;
         }
         case 'EnumDefinition':

From e72d9914d8a93955be9af6f7b1fc48551e5b2f96 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 15:37:24 -0500
Subject: [PATCH 09/20] Simplify tests

---
 .../test/NamespacedToModifyImported.sol       |   7 ++-----
 .../core/src/utils/make-namespaced.test.ts.md |   8 +++-----
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1230 -> 1216 bytes
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModifyImported.sol b/packages/core/contracts/test/NamespacedToModifyImported.sol
index 2961c1238..23828588d 100644
--- a/packages/core/contracts/test/NamespacedToModifyImported.sol
+++ b/packages/core/contracts/test/NamespacedToModifyImported.sol
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract, Example as ParentExample} from "./NamespacedToModify.sol";
+import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract} from "./NamespacedToModify.sol";
 
-contract Example {
-  using {plusTwo} for uint;
-  error ChildCustomError(ParentExample a);
-}
\ No newline at end of file
+contract Example {}
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index a531b3cc5..b927b1d2c 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -136,12 +136,10 @@ Generated by [AVA](https://avajs.dev).
           content: `// SPDX-License-Identifier: MIT␊
           pragma solidity ^0.8.20;␊
           ␊
-          import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract, Example as ParentExample} from "./NamespacedToModify.sol";␊
+          import {CONSTANT_USING_SELECTOR, plusTwo, plusThree, CustomErrorOutsideContract} from "./NamespacedToModify.sol";␊
           ␊
-          contract Example {␊
-            ␊
-            ␊
-          }`,
+          contract Example {}␊
+          `,
         },
       },
     }
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index c84b022de8f87f8938a930bddfd147692223805b..dafc432beb6f1a99f30fda03ae1b93965b10f9fc 100644
GIT binary patch
literal 1216
zcmV;x1V8&hRzV<BZeeh9Xm4~Nb~6eC01HH50C_X~T7``nmJJFhGL}AvKbc12EU_la
zy~omWkROW(00000000BcR?TnRL=^W&(*1z4sX&}S8if{;CHv7J5|mJsDoG(yK7idK
z5Qu2jo=u0fJ*$~<$Py(84jedfsz54-A}(;@%mD%Ffu7;gKY&xYAWl8<JofH-?JRCk
zk+3xOc;4^5`OSMXZ{E#z%VAbWeEb!WR64|WafcueyF_%cMQlX9t}m(Za93PoQhapN
zwz0%-72Y<roEAKKUY}Ti?~Bj~v=5;@s-HQhpV?`>M=Yu9gYMMSl%}86bW_tyfH58m
zdXwk$yo0?xAMcUDK!Z8drn0B$kLdd6U~wQ3L`v%I2_^X@CdmorbBhQ?=r0i5gNAfX
zTh<eVj8Q^)-FyciEofgPq4`YiMY8X{LAapI>kmzKF{dHHJNl4dfpsNy=?8=>k!cJ?
zCFV<TbAvcA6IfC+846a8!7f<LlN?)8)FctIwmk?_lWj4ZwtH2<9HsVJOs$fsw&8Xe
zm&6X$!665rehlq~k#LBa^quiNKz>ZZCQ`6p0dgk^E2Lo8VN>16C1Ax=6pTa^a>T<e
zhuG@hC?%v5-1mg~nJ{i^%7CuCbetc0NiX*Wqm~2b5l=?{#+MVd8fv_{_GV?1TEr8i
zvSEXmwkhFDXltWc>~g&4VkDw1jNYwRU#QO4my5-I9MJj!cDoKiheZTW4J@u$zL3ma
zf)}Wh3LHut>;y!(wK!kDxI{vgs*9<ow1nh7nA(E>MyM2-3m%_(a{l=Rbg-Nn>V-o`
zBbw)9Kf4@zHgkdRsmTcfOSCcX#ThpGgX3x9G|g6@W=j2ha%7Zn_&T{8_Zw)d&Y_wT
z=0ivQ6{8NZEZhMaGq^>o#Iu-9W+G-YL*aBhDATjEsDduS`)PFC>cL5SZhoLsKWMjS
zXP4uIVsGVRk4e~2Ko1t<FfT~LQgn%xS_*&_2rHD$B1ElR4xLzz*#Ie02|g0lvVC+E
z+o!K!amDvkN>WiPCgfKIq~ZaBinIct`w<1LfS5#AI3azMvJmDy#?d7d9Fvs7>dtnf
zd3n3Jd$qB#{qk;OeRF-ax$}AicW8^lW<Z;?70#Jtxe9iCm++x9hDuG=b$ro$pN-?9
z#MfX25g>RH{$PBK@*t7#6EVU_g{X{HY_g9q3J(>WAr32t3qVkt1jCWBVi2vgE0ofD
zptBRItoA2YeC{iU{jB}_97feufey#SWUlYOxuK`#{(<!oYIAVHbal*SHhp5+JSwVN
z>KjPk-$DB+pSUn4Pr5K5-~Tqu_nI2Gm$(4n270ofX-^d*gOisz$Gu^%R4OUZA^<KW
zK)Df6QH9~*APj>UOf2NdlCx22-NZfE2~jO}fKDvNAj^PbEL5*9rt32E_Wz+SyEUdR
zGw*`nPiPNi)?~&UK<2aSu`sZm@paa9J)_PFOMxF^uxBz0ruyQbRQeqh??TIGmr54^
z@@#gg^b$bUGD@WfR|EZFoVo`3<ka~C_G)zjuD=I+wJ85TZfe>S&?@GACV>?*kpzgD
eN&=t4&}U{w68IVb-<tnb68IZ>tIm*`4FCW!-9i%p

literal 1230
zcmV;<1Tp(TRzV<BZeeh9Xm4~Nb~6eC0J?A+!g}|3WHIIc1L8g^Het{PNPKbuf{g-N
zenw&4&L4{i00000000BcR?Tl4MHJtUq_GXfsX&MWhf&l*;>I5hB0&j7shkud<)dJi
z4+)6IyW@25?v6Dx8)Bjq!GQxOP8CQ6sfZK*0SCl^1LcIosYj4FwHE{zj=Y^++w0w!
zZBUU|Y4&5@@4flWd$aGoTkV#^td98bOCqUsi0|SKK^}IA=wgf5h<aULQsLpQxW=UT
z;FfJ;iQmW{n%a~WTzXEQScK>EFbItIVLYmzI-{T3X}v=%sq2H+>FH@rKdtGerWXNY
zJQlo7p3!p-_V#?dM+OrO=1`l;o~A#d>z{(ffkY4~skbMT<cFAKN-&>WL?}XkfZ#6}
zNY}I#JweDAC6v?6Hv!Uu@mUg@%j8}l`|hiR3(CCy)MOWP8WOyt4+-X3S5lY0N4OH1
z#!ysbz63WnhyyEuCAE^FV5J!BoW(rJu_Z-S5+SSGgD^GO7PD!)R}sunYA?ss%9&~#
zZkKUM>`)yXascYrVcawl4l$FyGrj@HcS+bp3idNV?j&LP6zm2Zs+&^@SRoY!BN2ru
z;^CG<Z1rsv6VeIpdqRCo7`HWLKv!P+A~*DsUg`@*EeFmco{YYY&nK!?)VQ+tdU=yt
z#1o{vVS|{qDdEd#Yol4{a=hnaB%&jX-mX=it1Q%33Wa_g(E0&(yADBz1q4?WEUsF<
zkj!0%8>o{q{FFF235alOX`yyunS?487gJAZ3CVphwFTdeP$@DOTt4;W!n2F$U?nxx
z3#X1oG|$F9b~*NJ<^tanlM@8CXk*@sGi>xH$J4}Vnyo&~l=|7^%qZdTcKmDHZ=kJS
z4%L#d9y;pp7<Gtc;SSK4#VuMPp2ci38!?+53TNU$nVFkIWpn}VPoe9r9{g#~EDUsN
z2krLU+)A8K?5=$5F$o6>=)q<j<^@SuiY~EITLG{FVTH0;gs7HEp%Y6n8z4n0!AGKM
zwvUct=kz5kF8iKJNh)fEg#4<2R6IaXkyZe7Kcb)&5R>RKC!~*37Q(#8IJ$^}-z23_
z-`Q?7FKst>uQoQeU)*i1Z?4yyJFi4=hqgEz2DC|A;hIU7b+F^Rgb$@LRBExV<BR6I
zY#bLQz6Lvp0Kt{;2jgp$2Z?;2h!I9AL?yIplYN9y_*20@#9`-900gy3FdZ2y1kp;n
zLMg2WIy<3Cy}!8Pb6+{^SMA^DFse!gIvf*|`M&?=hn|}M2iEh0T!;m_f;rHLCXP^>
zgL`HwW6IpjxP+>lt*Y3MklufS@k=gIP$rKnC{Pdn9M%I(O+1kwEf7$lF2Ynj9~qpy
z#5wK_--^Ye0=))+w-TVK5l}&e>ER$ugB46H<nfZzQR>~qJvb>*uXccrZPp+QfqN`e
zt1PAaHuLuXp>O+sOy6eS1;Oty9?I<5jCp`8WcO=fU_0acup4?t9~QO>-^O51XEs!|
zr9mt88z|m|k;`tS&H?0nb}RJ)K-Mx^sR!31-7`+yBYkw@`~qjSvIynz!ImE7|Hn;D
sdlE+3yw4=CY9^8ZF;hw4W0?BH%t!)X0pM%%ze)ms1H1QAIl2u10F#eHyZ`_I


From f3af40237e98fc8d8ee9a7393770d705d8888660 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 15:44:10 -0500
Subject: [PATCH 10/20] Add natspec which causes compilation failure

---
 .../contracts/test/NamespacedToModify.sol     |  12 +++++++++++-
 .../core/src/utils/make-namespaced.test.ts.md |  10 ++++++++++
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1216 -> 1257 bytes
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index e7446bde9..7edec66ba 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -113,10 +113,19 @@ function plusTwo(uint x) pure returns (uint) {
   return x + 2;
 }
 
+/**
+ * @dev plusThree
+ * @param x x
+ */
 function plusThree(uint x) pure returns (uint) {
   return x + 3;
 }
 
+/**
+ * @dev plusThree overloaded
+ * @param x x
+ * @param y y
+ */
 function plusThree(uint x, uint y) pure returns (uint) {
   return x + y + 3;
 }
@@ -133,5 +142,6 @@ contract UsingForDirectives {
 
 /**
  * @dev a custom error outside a contract
+ * @param example example parameter
  */
-error CustomErrorOutsideContract(Example a);
+error CustomErrorOutsideContract(Example example);
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index b927b1d2c..12455c572 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -114,8 +114,17 @@ Generated by [AVA](https://avajs.dev).
           ␊
           uint256 constant plusTwo = 0;␊
           ␊
+          /**␊
+           * @dev plusThree␊
+           * @param x x␊
+           */␊
           uint256 constant plusThree = 0;␊
           ␊
+          /**␊
+           * @dev plusThree overloaded␊
+           * @param x x␊
+           * @param y y␊
+           */␊
           ␊
           ␊
           ␊
@@ -128,6 +137,7 @@ Generated by [AVA](https://avajs.dev).
           ␊
           /**␊
            * @dev a custom error outside a contract␊
+           * @param example example parameter␊
            */␊
           uint256 constant CustomErrorOutsideContract = 0;␊
           `,
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index dafc432beb6f1a99f30fda03ae1b93965b10f9fc..e1462ecbdc926a0343ec16b35a50948afc4d789d 100644
GIT binary patch
literal 1257
zcmV<F1Qz>2RzV<BZeeh9Xm4~Nb~6eC0MWp;sg?q;<Cf`qE)uW;+zKZB6S)bW@KJ+R
z0hfhq0w0SA00000000BcR?TnRL=^W&(rmVrO$Fk_VH8?Omh4A^NKjHxsw9O-`2co{
zKthCBdo~?ndsZ{!uuGI8kl?_H69S1#5vQKGazF@yM8%O){{RlCTo5OYJdf>Nuf1D0
zs7P2E+w<P<y?OKA%zN)<yX7$JP<;3mkyJXwckv-X9(IZ7V2jv@dL3U<;o*+B&ZPL@
zrfp-1-<ba0)TXrH(F^*-5_~ViATZvC@rZurynbe{^$xM5uJ?auW@a?~oTi(aUIL8q
zXz(|AUN1P<JMi%V=@S~vp*EF0O@CO|KL?F{jv!J}??5Qd&k4?yU_Q5qPzL=4jK5(Z
zUDH<eltIR@K?U7>6Cf=ZU!<XhT-%G}$bF4)L75kmCOeqZ(7-$Tz`$wNk<_K{5w2LK
zF<_OLFTu?X;=oFvNv&ikSUCZ^XfaQ6Y)Mg*M9A81KTJ)w!))5_RRwdD*eeOKO0L+J
z+hJT1I}`_pbV2+Ej4zFpL(H`AjBf$*eHu2Af&B`QJ89T-2KGcj)8-2)STPd?BNc@y
z;^CG<Y&ADZDeeUKJ)tHO#%)b0(3O|YP7l1Kmt)4T=D>NxlhNELPu6Ov@$$y&m2GMf
zPms!%4Q$$`gs-5Tt!A;q@qvqxh>kFNt6qJsx>#Q=7UMXe%`SF34nfC71Wye#u35g2
z%w2&Oh?5FjN*tU7M7XuQSiiJFLXoPAsi&lb<UXj{fq5eoiqr*<Pd&N#>=Np(W=Oq|
zbTTA)Au-wK*t3}n_MX}}L12qE=DnnajhHyzOq?~d6`Pq6zmTR38yvny|0ewg((30}
zEeY$PlX%DIkXRNz1T*Gvi&lweF`LXqmdy>Av&o>$&d;L?x&-eh(T!FQZrU@8eVKZ<
z-JYLcO&XMVD<6AI!hr(wU^5Q$f+Q?Ohgg}d09b*rLfI@r)XL@1iRFY2;3AdaBUUZn
zM<<DM`VtmbeNUw%6}4iDe@#Ft?jxwk3IIBeC`bi{NpzJH5~GxcFz+#ro=3qo$q20P
z?KYZMcANXx8e6+B?l(5KH`kkcuSRf(wm2LHv`t&#nrSQ7L67eeKHw%$nZ-JeFPiVN
zNV)QA8LipmDCArR;}r#xJa$nRb&G*pN2>|I_fmw|5#bKQHnB50<5>^&)C$3qay;W3
zlm`{#h=`%BCl|vgyuEN)Ik*@qji5FO$dR(dTG4s#e-)KT!bk6MT`ArS^zMaf*JA_K
zrtd4E{-FK)gi2N2LdRnc$U+><g@MZ#?qT%_YIAVZY;{a!ogJCOPl~E!E<r813}a_H
zRlO!hRWB$$Zx4!(rU)OUsu7gKTR{3IRycWubKD#Jl}aTA`UwEPq(D<cprQ)HLqQn&
zE0|cw(VTNpp5MkjI4x0Q*hM2dLr8hx7z@>_%h@K;y#0S@5`P@iB${`D@h6P4xecPR
z0FcG}<}eKG;rOQSGd-v23;UAq60oOoySMsszi;~u1n<Hq<o9hC0rGTy-}VAPHgfv5
z2iK7OVVt@l`}oxP1I}u732O0!t#iu%kC~eGIE;#UpGjcNOeFzgW|F`sK>F0oNdjL3
T;FkGcC4qkc_L1M5Ck_ArFgIS?

literal 1216
zcmV;x1V8&hRzV<BZeeh9Xm4~Nb~6eC01HH50C_X~T7``nmJJFhGL}AvKbc12EU_la
zy~omWkROW(00000000BcR?TnRL=^W&(*1z4sX&}S8if{;CHv7J5|mJsDoG(yK7idK
z5Qu2jo=u0fJ*$~<$Py(84jedfsz54-A}(;@%mD%Ffu7;gKY&xYAWl8<JofH-?JRCk
zk+3xOc;4^5`OSMXZ{E#z%VAbWeEb!WR64|WafcueyF_%cMQlX9t}m(Za93PoQhapN
zwz0%-72Y<roEAKKUY}Ti?~Bj~v=5;@s-HQhpV?`>M=Yu9gYMMSl%}86bW_tyfH58m
zdXwk$yo0?xAMcUDK!Z8drn0B$kLdd6U~wQ3L`v%I2_^X@CdmorbBhQ?=r0i5gNAfX
zTh<eVj8Q^)-FyciEofgPq4`YiMY8X{LAapI>kmzKF{dHHJNl4dfpsNy=?8=>k!cJ?
zCFV<TbAvcA6IfC+846a8!7f<LlN?)8)FctIwmk?_lWj4ZwtH2<9HsVJOs$fsw&8Xe
zm&6X$!665rehlq~k#LBa^quiNKz>ZZCQ`6p0dgk^E2Lo8VN>16C1Ax=6pTa^a>T<e
zhuG@hC?%v5-1mg~nJ{i^%7CuCbetc0NiX*Wqm~2b5l=?{#+MVd8fv_{_GV?1TEr8i
zvSEXmwkhFDXltWc>~g&4VkDw1jNYwRU#QO4my5-I9MJj!cDoKiheZTW4J@u$zL3ma
zf)}Wh3LHut>;y!(wK!kDxI{vgs*9<ow1nh7nA(E>MyM2-3m%_(a{l=Rbg-Nn>V-o`
zBbw)9Kf4@zHgkdRsmTcfOSCcX#ThpGgX3x9G|g6@W=j2ha%7Zn_&T{8_Zw)d&Y_wT
z=0ivQ6{8NZEZhMaGq^>o#Iu-9W+G-YL*aBhDATjEsDduS`)PFC>cL5SZhoLsKWMjS
zXP4uIVsGVRk4e~2Ko1t<FfT~LQgn%xS_*&_2rHD$B1ElR4xLzz*#Ie02|g0lvVC+E
z+o!K!amDvkN>WiPCgfKIq~ZaBinIct`w<1LfS5#AI3azMvJmDy#?d7d9Fvs7>dtnf
zd3n3Jd$qB#{qk;OeRF-ax$}AicW8^lW<Z;?70#Jtxe9iCm++x9hDuG=b$ro$pN-?9
z#MfX25g>RH{$PBK@*t7#6EVU_g{X{HY_g9q3J(>WAr32t3qVkt1jCWBVi2vgE0ofD
zptBRItoA2YeC{iU{jB}_97feufey#SWUlYOxuK`#{(<!oYIAVHbal*SHhp5+JSwVN
z>KjPk-$DB+pSUn4Pr5K5-~Tqu_nI2Gm$(4n270ofX-^d*gOisz$Gu^%R4OUZA^<KW
zK)Df6QH9~*APj>UOf2NdlCx22-NZfE2~jO}fKDvNAj^PbEL5*9rt32E_Wz+SyEUdR
zGw*`nPiPNi)?~&UK<2aSu`sZm@paa9J)_PFOMxF^uxBz0ruyQbRQeqh??TIGmr54^
z@@#gg^b$bUGD@WfR|EZFoVo`3<ka~C_G)zjuD=I+wJ85TZfe>S&?@GACV>?*kpzgD
eN&=t4&}U{w68IVb-<tnb68IZ>tIm*`4FCW!-9i%p


From 40bee1a8ff8db048c46a7c2c9f194de7d89ead44 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 16:08:05 -0500
Subject: [PATCH 11/20] Delete documentation from dummy vars

---
 .../contracts/test/NamespacedToModify.sol     |   3 +++
 .../core/src/utils/make-namespaced.test.ts.md |  19 ++++++------------
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1257 -> 1213 bytes
 packages/core/src/utils/make-namespaced.ts    |   4 ++++
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 7edec66ba..067411b50 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -130,6 +130,9 @@ function plusThree(uint x, uint y) pure returns (uint) {
   return x + y + 3;
 }
 
+/**
+ * @dev using for directive
+ */
 using {plusTwo} for uint;
 
 contract UsingForDirectives {
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 12455c572..6f7d8171c 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -114,20 +114,16 @@ Generated by [AVA](https://avajs.dev).
           ␊
           uint256 constant plusTwo = 0;␊
           ␊
-          /**␊
-           * @dev plusThree␊
-           * @param x x␊
-           */␊
+          ␊
           uint256 constant plusThree = 0;␊
           ␊
-          /**␊
-           * @dev plusThree overloaded␊
-           * @param x x␊
-           * @param y y␊
-           */␊
           ␊
           ␊
           ␊
+          /**␊
+           * @dev using for directive␊
+           */␊
+          ␊
           ␊
           contract UsingForDirectives {␊
             ␊
@@ -135,10 +131,7 @@ Generated by [AVA](https://avajs.dev).
             ␊
           }␊
           ␊
-          /**␊
-           * @dev a custom error outside a contract␊
-           * @param example example parameter␊
-           */␊
+          ␊
           uint256 constant CustomErrorOutsideContract = 0;␊
           `,
         },
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index e1462ecbdc926a0343ec16b35a50948afc4d789d..4f58f9a1953039ed590524c46677e7650f4e7f34 100644
GIT binary patch
literal 1213
zcmV;u1VZ~kRzV<BZeeh9Xm4~Nb~6eC0823zHSMpQxR0@ZCPX(8Hg9#suWD6xH20v!
zL8zaRT_1}G00000000BcR?Tl4MHJtUq;VFCQ$UCVhf&l*V&ab)k)Q-nsw9O-`6$>$
zAR(gh?l>Ld-LYn7Lrjz+IB<Xqa6lj-q@td<bKrmw>Vcj)^$*}wgoHS8<n8RPz23Fi
z1{DcQZ#_Hj_ul;Gz1cVKM!VHv_JR1|8zQOf5Z}cI1bNscqKj?fAnJ8}Nri{I;u@3U
z{Tq&hC4OW2im6R$!A~#f6N~WwJO}}K59AU3%sKtcZtHDgOI_~|XJ%$J{j8>&nqCBq
z@n|rbJf{~r*xUE<KIu<1Scf`P_B8z=UH<|+_BDb?NxglcG(RUaQ-b;2CPESV6BK`e
zAYIc|^b{dum{37C-vmet<jXX)kjvd7hwf{H3(CBBYO;$t4GG@S2Lz{CS5lY0OSn>*
z#z0kMzJxG0NC#E|PiiGY!Ac3(1)F)2V_S-<Btlkq`e|yiZRXH+uOe7SnZ1%QE9aVR
zx?RR4aYAzl$Pt)d2l>iK1;k9p&iEc6Kc-<58Q3oXxs!%XXJ8-0q55<x1+y|)Fj85V
zA|7sah@;+(VoE!~eNU*D3FEe=9Ox=aqA-Y(UWygNo`c{KPe$*?XA{*bYFt@=y}U(j
z;t5jTbU;npl<;M=z1g(79PhgriRcKUw`!H=D)rimWyN_w8%Nmfb_hDQ5d5m(an<&P
zWbQINz?_ufqr|~UK!n>%_1eW{5}H(8Og&{KB=^D9HoP}NqsU$G^QkB6&n}{)mCRHx
zoH`k@JfC>k<JfbU3w%#aP7v6lgLyB>un|v=r-`#PTQSXy`T6wBFyZhqdYFtGSgXOY
zS`yYnC-IKa0kLg-05s-si&ltdGl$GY%;pBl*<?~?=jTxwU4-Y8=z6OMU)nSEzD@0@
z-JYLcNfJstRg66*;XnaB*i46cK@pasOYF>60IWb*p&S+=s-;pG#8ScsXpt)Lk*b;>
zqm#rreHn|(zNbo(%9@qZUlmY_`v@ws27rz;3RVFzi7s<OVwCa_);-423n=(ZG6rkA
zJB{Y0o#x)v#^%mTdyS2)jkV_Ps}a0ITO1Ap+M=y+%{0q3@Z-CL53~tXX0dL^7tMEA
z<a~_&8f+m(Se6QX39UNh5c$D|P#ZSmP##qCLt?48r=!OBdJGUlyhrR`eSRC9GrsFf
zK^?Ld`%)b4sc`+I{rkd2)%}2u$0TAQ4%)&XIt%~6`UJH(bJ1*N%ndd>vR0m0>T3EL
zYW7W#?+U3~Vsg|i0Y(1ypvY@#;`db5him8IX-#{4I&wI9iF4c=jEcpg0xbZbo&rq`
zfh?7V2ZJ>9S1_@Vqcvxvdb)*saQ{aQ*by4pfkA13z}To(S;{tJ=I#GOGj?lCGiKfe
z#UCIK<Thf)0zm5dO<0)NgYnJP=Xy?a72f|pBw$bFc1g9Ret+~U7~Tab<o8Dx0P=Kx
zfAk_i)^qx!``7sVW}Le5`S8^B1I}t?5$?SEd!MNIKW1v$6Ch>t9*e-LnJNOr%oKr-
bVCoYyrwH5xz_;dqRRsP9;{=SRj|~6-0HICj

literal 1257
zcmV<F1Qz>2RzV<BZeeh9Xm4~Nb~6eC0MWp;sg?q;<Cf`qE)uW;+zKZB6S)bW@KJ+R
z0hfhq0w0SA00000000BcR?TnRL=^W&(rmVrO$Fk_VH8?Omh4A^NKjHxsw9O-`2co{
zKthCBdo~?ndsZ{!uuGI8kl?_H69S1#5vQKGazF@yM8%O){{RlCTo5OYJdf>Nuf1D0
zs7P2E+w<P<y?OKA%zN)<yX7$JP<;3mkyJXwckv-X9(IZ7V2jv@dL3U<;o*+B&ZPL@
zrfp-1-<ba0)TXrH(F^*-5_~ViATZvC@rZurynbe{^$xM5uJ?auW@a?~oTi(aUIL8q
zXz(|AUN1P<JMi%V=@S~vp*EF0O@CO|KL?F{jv!J}??5Qd&k4?yU_Q5qPzL=4jK5(Z
zUDH<eltIR@K?U7>6Cf=ZU!<XhT-%G}$bF4)L75kmCOeqZ(7-$Tz`$wNk<_K{5w2LK
zF<_OLFTu?X;=oFvNv&ikSUCZ^XfaQ6Y)Mg*M9A81KTJ)w!))5_RRwdD*eeOKO0L+J
z+hJT1I}`_pbV2+Ej4zFpL(H`AjBf$*eHu2Af&B`QJ89T-2KGcj)8-2)STPd?BNc@y
z;^CG<Y&ADZDeeUKJ)tHO#%)b0(3O|YP7l1Kmt)4T=D>NxlhNELPu6Ov@$$y&m2GMf
zPms!%4Q$$`gs-5Tt!A;q@qvqxh>kFNt6qJsx>#Q=7UMXe%`SF34nfC71Wye#u35g2
z%w2&Oh?5FjN*tU7M7XuQSiiJFLXoPAsi&lb<UXj{fq5eoiqr*<Pd&N#>=Np(W=Oq|
zbTTA)Au-wK*t3}n_MX}}L12qE=DnnajhHyzOq?~d6`Pq6zmTR38yvny|0ewg((30}
zEeY$PlX%DIkXRNz1T*Gvi&lweF`LXqmdy>Av&o>$&d;L?x&-eh(T!FQZrU@8eVKZ<
z-JYLcO&XMVD<6AI!hr(wU^5Q$f+Q?Ohgg}d09b*rLfI@r)XL@1iRFY2;3AdaBUUZn
zM<<DM`VtmbeNUw%6}4iDe@#Ft?jxwk3IIBeC`bi{NpzJH5~GxcFz+#ro=3qo$q20P
z?KYZMcANXx8e6+B?l(5KH`kkcuSRf(wm2LHv`t&#nrSQ7L67eeKHw%$nZ-JeFPiVN
zNV)QA8LipmDCArR;}r#xJa$nRb&G*pN2>|I_fmw|5#bKQHnB50<5>^&)C$3qay;W3
zlm`{#h=`%BCl|vgyuEN)Ik*@qji5FO$dR(dTG4s#e-)KT!bk6MT`ArS^zMaf*JA_K
zrtd4E{-FK)gi2N2LdRnc$U+><g@MZ#?qT%_YIAVZY;{a!ogJCOPl~E!E<r813}a_H
zRlO!hRWB$$Zx4!(rU)OUsu7gKTR{3IRycWubKD#Jl}aTA`UwEPq(D<cprQ)HLqQn&
zE0|cw(VTNpp5MkjI4x0Q*hM2dLr8hx7z@>_%h@K;y#0S@5`P@iB${`D@h6P4xecPR
z0FcG}<}eKG;rOQSGd-v23;UAq60oOoySMsszi;~u1n<Hq<o9hC0rGTy-}VAPHgfv5
z2iK7OVVt@l`}oxP1I}u732O0!t#iu%kC~eGIE;#UpGjcNOeFzgW|F`sK>F0oNdjL3
T;FkGcC4qkc_L1M5Ck_ArFgIS?

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index bc4f5df8b..d53c1a31b 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -110,6 +110,10 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
         case 'ErrorDefinition':
         case 'FunctionDefinition':
         case 'VariableDeclaration': {
+          // First delete documentation, otherwise it may reference deleted parameters or be orphaned
+          if (node.documentation) {
+            modifications.push(makeDelete(node.documentation, orig));
+          }
           // If an identifier with the same name was not previously written, replace with a dummy variable.
           // Otherwise delete to avoid duplicate names, which can happen if there was overloading.
           // This does not need to check all identifiers from the original contract, since the original compilation

From 0105e419663fdd0bb73188f02cde510c27c45a80 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 17:25:46 -0500
Subject: [PATCH 12/20] Add another failing scenario

---
 .../contracts/test/NamespacedToModify.sol     |   2 +-
 .../core/src/utils/make-namespaced.test.ts.md |   2 +-
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1213 -> 1205 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 067411b50..9a91a77c5 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -131,7 +131,7 @@ function plusThree(uint x, uint y) pure returns (uint) {
 }
 
 /**
- * @dev using for directive
+ * @param foo foo
  */
 using {plusTwo} for uint;
 
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 6f7d8171c..d478ae695 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -121,7 +121,7 @@ Generated by [AVA](https://avajs.dev).
           ␊
           ␊
           /**␊
-           * @dev using for directive␊
+           * @param foo foo␊
            */␊
           ␊
           ␊
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 4f58f9a1953039ed590524c46677e7650f4e7f34..670298e761e86c8ee9a187a8e96e267d45ac5ccc 100644
GIT binary patch
literal 1205
zcmV;m1WNlsRzV<BZeeh9Xm4~Nb~6eC0AybdZwuamp|?E?Xd|`?r7&W!V<s+qy?P_M
z&6=6&ARmhe00000000BcR?TnRL=^W&(rgUvrUG%|Fp648mh4A^NKgVORX!k6K7idK
zkPy+VJ(~`(J*$~<$r7cg8~}0RfDj-qMV#O--~b45pl43K!>L>lCyqRi?Om_Ei(6DA
zR(js?yx)8C=DqQ6-px+iW%iMH_e&zFbV=ahBZ7SF5z)mqaS-*pfuzF6U2&C3apR`r
zV2NLw-ZHf*E&S;vePRjzp8+8t?|?j{pE<9e*>Ar|Y^m%0;mpj8rk~YxQ`5_UF&+*_
zljrr4i~Yj@ACmq=leyHPvZv|ibp2EC*w+XmCG`)5()^s#ObHfnn+O%qpP={)1nHW#
zs%HW+h65_;=Ia1ygM5~SmI`CH$Tja3!Ubi1GBw%7oJIlO)&~Jjv#z8beVcHlGL3<%
z%mN8%ZW0$(0#9lsL%}L3*hQQ9l4Dznx+Fr@_xfdOv0diSPOm1ItIS?XnN<tTw!JRn
zk~on$B;**(uY-JHWD;U#b7y=DkRP(Ji5%<~fZWc)rgN|xaH!s&%D}8#6^u+3rihQ*
zE^*YmQO;;5c;E~5GGW}(lmlI5iIxUg(kqE#*mIaX;>-Bm_+X-5N6i;EUajs>oA`oM
zw;fQ^4kdgA?QXZMF2{!+Mj}4K=#570>Dppr)v}U0pv`0KbzOo^ECjzgcwDmsA(^)V
z4=^WH_$YCB5)k3`@?zuC3W-c=9;Uvs5|RhtY8T#{kx}d}`~}pPi%%_~<JH_$FPb_X
zvb>ObIpElLm<RFRb8v#d79Grc=?I(2<oGagKFoF!X3qRVc4j!>=rMYj&Kp>(!HHTD
z)<dVsj?odZZF~e_%;7ez5#MGGnTsQv8z^VfMVXzSM^$tQo{ypH?H+t-PcHUt8poZ^
z{QPP<pwv_4*k=+B6odzxahV^IuoPWl=e7c11;PsDuozLVRH7tSQa(V76v4-;dU1|U
zQ|I&rEVcq)QIe{fmC;`jK*fCo6?p?dClv*&FffU>I3Wp2d5CzAar7(-Ka-rn`u<+C
zb$PFKaHYAu_xwR~b7ynCwf}MqcWIl$VL&^y9j%#-avl5x9^nIR3YA-|>jt9r7K@#a
z(O-ovBnZn=sjr|l;C<|&4r8HMD%;syF}^{0Nb=W+7>ahpuGL4k$vNZuffUps>xnP5
z@?Fu@kJ`VdE2?e<bTTIW3rVUL202;yhp10chcge&*2dghvm+Vu)KVAH$H3H|gM3rU
z+zpeX?gpUt?+4Vbsfk}RTo0E`X<F0HO~(!=FLRE2gHgF$R-jn`%w<4RLm*3);lZ#B
z{S{0s<Y>*=m_>JR4{rUq?K(yy`z|09NQ{jdwdH&ZX5RWgv|vAtX~E1pp!fsifx`C7
zSOCakaqATo_Go-d^@(24Qbo7^cPZH8g}qT@x!)E228MS)O2u8#MSwg}+!Z|skd1<_
z=>D}kzZ>`5?!0%;`~hdRwgflb{k=t0{vR<l?NN}bd6y)xW@bo$m^l*o5T-sd3rOHA
T0DNu!S0wN^lI2kFg$)1zto2F%

literal 1213
zcmV;u1VZ~kRzV<BZeeh9Xm4~Nb~6eC0823zHSMpQxR0@ZCPX(8Hg9#suWD6xH20v!
zL8zaRT_1}G00000000BcR?Tl4MHJtUq;VFCQ$UCVhf&l*V&ab)k)Q-nsw9O-`6$>$
zAR(gh?l>Ld-LYn7Lrjz+IB<Xqa6lj-q@td<bKrmw>Vcj)^$*}wgoHS8<n8RPz23Fi
z1{DcQZ#_Hj_ul;Gz1cVKM!VHv_JR1|8zQOf5Z}cI1bNscqKj?fAnJ8}Nri{I;u@3U
z{Tq&hC4OW2im6R$!A~#f6N~WwJO}}K59AU3%sKtcZtHDgOI_~|XJ%$J{j8>&nqCBq
z@n|rbJf{~r*xUE<KIu<1Scf`P_B8z=UH<|+_BDb?NxglcG(RUaQ-b;2CPESV6BK`e
zAYIc|^b{dum{37C-vmet<jXX)kjvd7hwf{H3(CBBYO;$t4GG@S2Lz{CS5lY0OSn>*
z#z0kMzJxG0NC#E|PiiGY!Ac3(1)F)2V_S-<Btlkq`e|yiZRXH+uOe7SnZ1%QE9aVR
zx?RR4aYAzl$Pt)d2l>iK1;k9p&iEc6Kc-<58Q3oXxs!%XXJ8-0q55<x1+y|)Fj85V
zA|7sah@;+(VoE!~eNU*D3FEe=9Ox=aqA-Y(UWygNo`c{KPe$*?XA{*bYFt@=y}U(j
z;t5jTbU;npl<;M=z1g(79PhgriRcKUw`!H=D)rimWyN_w8%Nmfb_hDQ5d5m(an<&P
zWbQINz?_ufqr|~UK!n>%_1eW{5}H(8Og&{KB=^D9HoP}NqsU$G^QkB6&n}{)mCRHx
zoH`k@JfC>k<JfbU3w%#aP7v6lgLyB>un|v=r-`#PTQSXy`T6wBFyZhqdYFtGSgXOY
zS`yYnC-IKa0kLg-05s-si&ltdGl$GY%;pBl*<?~?=jTxwU4-Y8=z6OMU)nSEzD@0@
z-JYLcNfJstRg66*;XnaB*i46cK@pasOYF>60IWb*p&S+=s-;pG#8ScsXpt)Lk*b;>
zqm#rreHn|(zNbo(%9@qZUlmY_`v@ws27rz;3RVFzi7s<OVwCa_);-423n=(ZG6rkA
zJB{Y0o#x)v#^%mTdyS2)jkV_Ps}a0ITO1Ap+M=y+%{0q3@Z-CL53~tXX0dL^7tMEA
z<a~_&8f+m(Se6QX39UNh5c$D|P#ZSmP##qCLt?48r=!OBdJGUlyhrR`eSRC9GrsFf
zK^?Ld`%)b4sc`+I{rkd2)%}2u$0TAQ4%)&XIt%~6`UJH(bJ1*N%ndd>vR0m0>T3EL
zYW7W#?+U3~Vsg|i0Y(1ypvY@#;`db5him8IX-#{4I&wI9iF4c=jEcpg0xbZbo&rq`
zfh?7V2ZJ>9S1_@Vqcvxvdb)*saQ{aQ*by4pfkA13z}To(S;{tJ=I#GOGj?lCGiKfe
z#UCIK<Thf)0zm5dO<0)NgYnJP=Xy?a72f|pBw$bFc1g9Ret+~U7~Tab<o8Dx0P=Kx
zfAk_i)^qx!``7sVW}Le5`S8^B1I}t?5$?SEd!MNIKW1v$6Ch>t9*e-LnJNOr%oKr-
bVCoYyrwH5xz_;dqRRsP9;{=SRj|~6-0HICj


From 15526b8c1d85c78777b05fae7c630a26fd5a0657 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 17:52:32 -0500
Subject: [PATCH 13/20] Replace using-for directives with dummy enums

---
 .../core/src/utils/make-namespaced.test.ts    |  10 ++++++----
 .../core/src/utils/make-namespaced.test.ts.md |   4 ++--
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1205 -> 1236 bytes
 packages/core/src/utils/make-namespaced.ts    |  15 ++++++++++++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.test.ts b/packages/core/src/utils/make-namespaced.test.ts
index 3f938bc37..d2434f239 100644
--- a/packages/core/src/utils/make-namespaced.test.ts
+++ b/packages/core/src/utils/make-namespaced.test.ts
@@ -35,7 +35,7 @@ async function testMakeNamespaced(
   const origInput = JSON.parse(JSON.stringify(origBuildInfo.input));
 
   const modifiedInput = makeNamespacedInput(origBuildInfo.input, origBuildInfo.output);
-  normalizeStateVariableNames(modifiedInput);
+  normalizeIdentifiers(modifiedInput);
   t.snapshot(modifiedInput);
 
   t.deepEqual(origBuildInfo.input, origInput);
@@ -46,12 +46,14 @@ async function testMakeNamespaced(
   t.is(modifiedOutput.errors, undefined);
 }
 
-function normalizeStateVariableNames(input: SolcInput): void {
+function normalizeIdentifiers(input: SolcInput): void {
   for (const source of Object.values(input.sources)) {
     if (source.content !== undefined) {
       source.content = source.content
-        .replace(/\$MainStorage_\d{1,6};/g, '$MainStorage_random;')
-        .replace(/\$SecondaryStorage_\d{1,6}/g, '$SecondaryStorage_random');
+        .replace(/\$MainStorage_\d{1,6}/g, '$MainStorage_random')
+        .replace(/\$SecondaryStorage_\d{1,6}/g, '$SecondaryStorage_random')
+        .replace(/\$UsingForDirective_\d+_\d{1,6}/, '$UsingForDirective_1_random')
+        .replace(/\$UsingForDirective_\d+_\d{1,6}/, '$UsingForDirective_2_random');
     }
   }
 }
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index d478ae695..7210fa3a2 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -123,10 +123,10 @@ Generated by [AVA](https://avajs.dev).
           /**␊
            * @param foo foo␊
            */␊
-          ␊
+          enum $UsingForDirective_1_random { dummy }␊
           ␊
           contract UsingForDirectives {␊
-            ␊
+            enum $UsingForDirective_2_random { dummy }␊
           ␊
             ␊
           }␊
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 670298e761e86c8ee9a187a8e96e267d45ac5ccc..b35b1938cc9c47e8757eb3f4944a0086a6e73395 100644
GIT binary patch
literal 1236
zcmV;_1S|VNRzV<BZeeh9Xm4~Nb~6eC08t7VX?s4%SU^jmmTevBPykl@<%^1|I+89k
zFI~kIX&;LS00000000BcR?Tl4MHJtUq_G!@Q$U<JjG`106Mw{r1SNn{B`HM82VfV0
zR1uAL$LSF7jx{qIVnT}Gz=0Dd1c*x!C;kHt2q6yij8v%-966vOA;gIryq#U!>s^~|
zP?50o*0b||@6B)Cn|<?cw3=;ZABy)rCz8rG@m+jKkcV9&I@l%-qF%?BRCu@}t}!Xz
zz2P`m;@9$@n%a~W{PdhYu>}9mfDn*(KpxW1UC__%HQyk%)b;*wdU{&Z&uhA==>@<T
z4+o>k3wo}Ny#pT~kp4uSwW&j8SJNNR^^d`0Un7W=)H@JL^L<P+C791`A{3!NK=CIC
z(lu>WPY^PO3FUP2DnObbpCqBVOzsvra$g}_Q0DcfCOeqZkl<~7KrqiblDhOQ!j;N2
z2C4${C4{+7+OQIMQY#q>R*b<e+RT$2+fq~{5wfz|Pg8^KFo(9fWx?9Y?4_7lDbsAr
z?JzEh6PiOnj=}so$Y(|(AZ9Xl##aFOCJCEJ!F~Y9?IbLpg582c_2X0mW~H)VB(g9?
zJlt#(N4*<`gm!}ao=`6n#!XE*&{dSa&JCiZ7ki3f&q45rC!=@cr-@1h)nD9rwX{ub
z;t5jPazIU6l<*a_v(>OV93QwCiRcKU*Q@2H%eCsNW%craHjlB}X%lo}A^26m<C^UY
z$=nrqfH^6_M~Q=zfC#sjYt_XS5}K4<Og&{KB=^D94!qYxqsU$G^Qk9mPc5P2)znls
zoH`w{oQ=KgbL=_H1-@q{CkSlO!Mq!1Sno}ar-{=vn?0H-^V#IgFyZhqdKixzSgXN_
zS`yYnr@bAcLt@+b5NOQdCM^@sW)7K)n9U88Gx4O%%+I3|T7>6g=z6mYU)qzkzD@PG
z)taAQjT4GJRg66*;XnaB*i4&wK@pasL+sR60IWb*p&S+=D#c<L#A3_`Xpt)Lk*bm%
zqtn<qeF2NhzNbo(%9@qXUlCA>`v@x127vBm6s!Vb5?$tm^iaw}Soau5&!XTnNg1r~
z?baKYb{qRw>RY?d@7FiCH`g0`FGuh;ZE`paXqz^}HIppY!H@3}KG4Qcsl_^NUo_ri
zk@GS7Yp{hL!m?E8i)an%K6X)yu|TXK+Qjo+G#iGA@eRs@`hG<A7o#%^r_b?Sw~NwI
zjlqRtKF(Kdgs*UKBO<9j<W0^Q-}9xQ4q5N5s&;c%CGcDA-<LqDZW?qlCZ!9#@GlJF
zyzmdKPf?4*&S%PF?!uXoRrl0Vm)tK<{eJ`bE0?%$CP&>ja9uo@?_U?1npn;c-yd*+
zU4^M;K5{sDiF4c?j0%N<0v!S1?F49Q2xO@=+#jT&zk-Q{9IZJYRpxEng-#-B<&M$F
zUJi;B1ja_y@^ZSZGjIMM+Pd$?v~}hkQ2Y*ZUuH{ZEC8gI-Oh!HJsjVreWYi!X;CK;
zgFT+vZ&jE3oz~A_cn2hx-DzC}$P?L})^h;a$mq20T?_TAapo54{WI4OIIHC)xIORf
y&7|W0h^c9hf|Sg=ECOq0q6iQ(RRlhOsSnMJBJc$OzBK=<BJej0QuCGB4FCX!OI6GO

literal 1205
zcmV;m1WNlsRzV<BZeeh9Xm4~Nb~6eC0AybdZwuamp|?E?Xd|`?r7&W!V<s+qy?P_M
z&6=6&ARmhe00000000BcR?TnRL=^W&(rgUvrUG%|Fp648mh4A^NKgVORX!k6K7idK
zkPy+VJ(~`(J*$~<$r7cg8~}0RfDj-qMV#O--~b45pl43K!>L>lCyqRi?Om_Ei(6DA
zR(js?yx)8C=DqQ6-px+iW%iMH_e&zFbV=ahBZ7SF5z)mqaS-*pfuzF6U2&C3apR`r
zV2NLw-ZHf*E&S;vePRjzp8+8t?|?j{pE<9e*>Ar|Y^m%0;mpj8rk~YxQ`5_UF&+*_
zljrr4i~Yj@ACmq=leyHPvZv|ibp2EC*w+XmCG`)5()^s#ObHfnn+O%qpP={)1nHW#
zs%HW+h65_;=Ia1ygM5~SmI`CH$Tja3!Ubi1GBw%7oJIlO)&~Jjv#z8beVcHlGL3<%
z%mN8%ZW0$(0#9lsL%}L3*hQQ9l4Dznx+Fr@_xfdOv0diSPOm1ItIS?XnN<tTw!JRn
zk~on$B;**(uY-JHWD;U#b7y=DkRP(Ji5%<~fZWc)rgN|xaH!s&%D}8#6^u+3rihQ*
zE^*YmQO;;5c;E~5GGW}(lmlI5iIxUg(kqE#*mIaX;>-Bm_+X-5N6i;EUajs>oA`oM
zw;fQ^4kdgA?QXZMF2{!+Mj}4K=#570>Dppr)v}U0pv`0KbzOo^ECjzgcwDmsA(^)V
z4=^WH_$YCB5)k3`@?zuC3W-c=9;Uvs5|RhtY8T#{kx}d}`~}pPi%%_~<JH_$FPb_X
zvb>ObIpElLm<RFRb8v#d79Grc=?I(2<oGagKFoF!X3qRVc4j!>=rMYj&Kp>(!HHTD
z)<dVsj?odZZF~e_%;7ez5#MGGnTsQv8z^VfMVXzSM^$tQo{ypH?H+t-PcHUt8poZ^
z{QPP<pwv_4*k=+B6odzxahV^IuoPWl=e7c11;PsDuozLVRH7tSQa(V76v4-;dU1|U
zQ|I&rEVcq)QIe{fmC;`jK*fCo6?p?dClv*&FffU>I3Wp2d5CzAar7(-Ka-rn`u<+C
zb$PFKaHYAu_xwR~b7ynCwf}MqcWIl$VL&^y9j%#-avl5x9^nIR3YA-|>jt9r7K@#a
z(O-ovBnZn=sjr|l;C<|&4r8HMD%;syF}^{0Nb=W+7>ahpuGL4k$vNZuffUps>xnP5
z@?Fu@kJ`VdE2?e<bTTIW3rVUL202;yhp10chcge&*2dghvm+Vu)KVAH$H3H|gM3rU
z+zpeX?gpUt?+4Vbsfk}RTo0E`X<F0HO~(!=FLRE2gHgF$R-jn`%w<4RLm*3);lZ#B
z{S{0s<Y>*=m_>JR4{rUq?K(yy`z|09NQ{jdwdH&ZX5RWgv|vAtX~E1pp!fsifx`C7
zSOCakaqATo_Go-d^@(24Qbo7^cPZH8g}qT@x!)E228MS)O2u8#MSwg}+!Z|skd1<_
z=>D}kzZ>`5?!0%;`~hdRwgflb{k=t0{vR<l?NN}bd6y)xW@bo$m^l*o5T-sd3rOHA
T0DNu!S0wN^lI2kFg$)1zto2F%

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index d53c1a31b..c28f2abb2 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -72,8 +72,11 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
                 modifications.push(makeDelete(contractNode, orig));
                 break;
               }
+              // - UsingForDirective isn't needed, but it might have NatSpec documentation which is not included in the AST.
+              //   We convert it to a dummy enum to avoid orphaning any possible documentation.
               case 'UsingForDirective': {
-                modifications.push(makeDelete(contractNode, orig));
+                const insertText = getUsingForReplacement(contractNode.id);
+                modifications.push(makeReplace(contractNode, orig, insertText));
                 break;
               }
               case 'StructDefinition': {
@@ -99,9 +102,11 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           }
           break;
         }
-        // - UsingFor can be deleted since its result only takes effect in functions
+        // - UsingForDirective isn't needed, but it might have NatSpec documentation which is not included in the AST.
+        //   We convert it to a dummy enum to avoid orphaning any possible documentation.
         case 'UsingForDirective': {
-          modifications.push(makeDelete(node, orig));
+          const insertText = getUsingForReplacement(node.id);
+          modifications.push(makeReplace(node, orig, insertText));
           break;
         }
         // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files, so they cannot be deleted.
@@ -157,6 +162,10 @@ interface Modification {
   text?: string;
 }
 
+function getUsingForReplacement(astId: number) {
+  return `enum $UsingForDirective_${astId}_${(Math.random() * 1e6).toFixed(0)} { dummy }`;
+}
+
 function getPositions(node: Node) {
   const [start, length] = node.src.split(':').map(Number);
   const end = start + length;

From 4ac6b27810bd40118f54523c12081111214ca237 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Fri, 24 Nov 2023 17:59:58 -0500
Subject: [PATCH 14/20] Update function docs

---
 packages/core/src/utils/make-namespaced.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index c28f2abb2..dba25f958 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -17,10 +17,9 @@ const OUTPUT_SELECTION = {
  *
  * This makes the following modifications to the input:
  * - Adds a state variable for each namespaced struct definition
- * - Deletes all contracts' functions since they are not needed for storage layout
- * - Deletes all contracts' modifiers, variables, and parent constructor invocations to avoid compilation errors due to deleted functions and constructors
- * - Deletes all using for directives (at file level and in contracts) since they may reference deleted functions
- * - Converts all free functions and constants (at file level) to dummy variables (do not delete them since they might be imported by other files)
+ * - For each contract, deletes the node types that are not needed for storage layout or may reference deleted functions and constructors
+ * - Converts all using for directives (at file level and in contracts) to dummy enums (do not delete them to avoid orphaning possible NatSpec documentation)
+ * - Converts all custom errors, free functions and constants (at file level) to dummy variables (do not delete them since they might be imported by other files)
  *
  * Also sets the outputSelection to only include storageLayout and ast, since the other outputs are not needed.
  *

From a5d1d8815a68296ae860a1aa32d3ef9e45c29da6 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 27 Nov 2023 18:19:03 -0500
Subject: [PATCH 15/20] Add failing testcases

---
 .../contracts/test/NamespacedToModify.sol     |  16 ++++++++++++++++
 .../core/src/utils/make-namespaced.test.ts.md |  16 ++++++++++++++++
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1236 -> 1297 bytes
 3 files changed, 32 insertions(+)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 9a91a77c5..6ff2dcb7c 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -113,6 +113,13 @@ function plusTwo(uint x) pure returns (uint) {
   return x + 2;
 }
 
+/**
+ * @notice originally orphaned natspec
+ * @dev d
+ * @param p p
+ * @return r r
+ */
+
 /**
  * @dev plusThree
  * @param x x
@@ -121,6 +128,13 @@ function plusThree(uint x) pure returns (uint) {
   return x + 3;
 }
 
+/**
+ * @notice originally orphaned natspec 2
+ * @dev d
+ * @param p p
+ * @return r r
+ */
+
 /**
  * @dev plusThree overloaded
  * @param x x
@@ -130,6 +144,8 @@ function plusThree(uint x, uint y) pure returns (uint) {
   return x + y + 3;
 }
 
+function originallyNoDocumentation() pure {}
+
 /**
  * @param foo foo
  */
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 7210fa3a2..7a1fc22ba 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -114,11 +114,27 @@ Generated by [AVA](https://avajs.dev).
           ␊
           uint256 constant plusTwo = 0;␊
           ␊
+          /**␊
+           * @notice originally orphaned natspec␊
+           * @dev d␊
+           * @param p p␊
+           * @return r r␊
+           */␊
+          ␊
           ␊
           uint256 constant plusThree = 0;␊
           ␊
+          /**␊
+           * @notice originally orphaned natspec 2␊
+           * @dev d␊
+           * @param p p␊
+           * @return r r␊
+           */␊
+          ␊
+          ␊
           ␊
           ␊
+          uint256 constant originallyNoDocumentation = 0;␊
           ␊
           /**␊
            * @param foo foo␊
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index b35b1938cc9c47e8757eb3f4944a0086a6e73395..816c953976245721c16388041877f5ecb5b25797 100644
GIT binary patch
literal 1297
zcmV+s1@8JmRzV<BZeeh9Xm4~Nb~6eC0Qg}`=%D~ub;1}}L#M(ry?X*hDlrnz8=7vL
zni=ZTl^=@;00000000BcR?TZ9MHKIkWHV`9CyOE;JQN|TNz8m?#6%KTc1f}t$R_H{
z`T=UF>8?r2baypX)iGnpiXJ?8@+1l(ta$Pd5Cj(y54)ZOPkZ#>X}ySEJo>u2XQron
z#@WaU4pdK7z2Ez&_p07|*IP}O*$3kNFNmblC83882=cK<M1XDLAnFI9q{7F6*k@9_
zcinNY#IIS$rZ%BPKfR!jEy4dYFbIryVLYgxIj5i5X}(2lsq5Y8)YO!wpVf3z(~E#H
z9*Sn;=k$V${k;(Hk?uyFxzwSut?3Ww`X?Z<OA$m$>hB3fxtXF&2o`di2xZV8K==y=
z(lu>W&lqI%8&uHE*8$Rm@o5%X7-_pj4!xHN7nJ#(t?>YJ8XI_9?-@AB0!cmk4&jPq
z8a+~xg%aFcCoX6LNlKHUVDl;1d7Jr?V_S-fBtllUyJ2duE6ky-c3Ci2vAvjLD~)8^
z^a92uabk9G$Put#gYlV>afq4qo$(DozRSYKa<HEPaytu~%)!1cXxg`h49v<!!N^2m
zg7~=U5=X6#Vum`#Ltm)Hm~l%}0(9l2&nJ6c(&sybe#w#Zh%b}1abvtvLG>5bUoCA>
zoA`p1HXR_-7A1TIUD<3{0mpkDMk2Yw=*?>R>2j^QYFV8)pp7H!1uj9y7J^>|Bwn;b
zA(^)VA7CdXc$7H035alexmI0VAu&tY!_-$?Lh=wqU4eByW=h0GzmWQ}_S6zOTFq^>
z<E@iE&Y9F=mt)^y9@u+o;{<^tI+(Z97S=nP!_CBbGn*YVbL=zOoqmJk&){j=Z@{f4
z$4VvWLnoaRqXS~w_yEk9#Z6i!zResmn^-p6BTlD-GCenkN@x+jkD+VLHoUYaYh9k|
zQL8mKx0*I6^;JIhnS=`k=D}fH=0{0bih$U;qX1ZeutGU3K~(1FV<*n1WB?VZ1fP&9
zqkVLex~I=$aXIu=N>Wj?GW4qgQgIhSMV<lBornTgWSB&kIUyaCk`U)T#?b{7J(C>6
z+Rk>pacR4;d$qo~{oHPSV{2orvGY;_cWINuWk6fB8SBhixdw7VkMJHfg~}-l+)y;$
zW{Gg+)%k987^i#G$FAFkX|RudsF0mFMKFgPB1g@j24D{bC{Qa-WXOHQ5w}zjhN#^K
z&zxE@s+~^t0OdXD+iacL;4ELpFTCHFSaOT8Xee>S4?Q#!-vh?iDUS-+A=zC_9wj_4
zC-l5F%3qrlT&U0tlT{laD-Pa(tD-X12Iq|Lgi=t4taY@iquf=F|6cp|Ii9LgijIfe
z*@e#iTIfZ5;UBC%K`jm^pDqt6_R|B)%88|__>WNDeuDAKWTv2w4=Sio5C81dLrrZw
zV)YkDsL&T+Yt2doj$h&&w|lc<v8X_=0N{-bXrd2fsW99hg`um##6k|HoJ~s47H&hU
zl=P}cXkfDnSr{B+qiT6M-?y5#{ttcY4@3G^^9~SxhjHJ?p4C_YNNse#8VB}Zcpv()
zKB5neTcsN**yAG`%Ib2rmHZVL@4zUGZY9qH<cZO(<g)--AJIzQyB_g3<J3Lk2dB;-
za97Jq&>q~|(yRRcu&HT}!YG+{nFKDHnIu5WToU*YwmvdPB!Mph@Rj*rC4s*I9O+|a
Hx()yUW(99g

literal 1236
zcmV;_1S|VNRzV<BZeeh9Xm4~Nb~6eC08t7VX?s4%SU^jmmTevBPykl@<%^1|I+89k
zFI~kIX&;LS00000000BcR?Tl4MHJtUq_G!@Q$U<JjG`106Mw{r1SNn{B`HM82VfV0
zR1uAL$LSF7jx{qIVnT}Gz=0Dd1c*x!C;kHt2q6yij8v%-966vOA;gIryq#U!>s^~|
zP?50o*0b||@6B)Cn|<?cw3=;ZABy)rCz8rG@m+jKkcV9&I@l%-qF%?BRCu@}t}!Xz
zz2P`m;@9$@n%a~W{PdhYu>}9mfDn*(KpxW1UC__%HQyk%)b;*wdU{&Z&uhA==>@<T
z4+o>k3wo}Ny#pT~kp4uSwW&j8SJNNR^^d`0Un7W=)H@JL^L<P+C791`A{3!NK=CIC
z(lu>WPY^PO3FUP2DnObbpCqBVOzsvra$g}_Q0DcfCOeqZkl<~7KrqiblDhOQ!j;N2
z2C4${C4{+7+OQIMQY#q>R*b<e+RT$2+fq~{5wfz|Pg8^KFo(9fWx?9Y?4_7lDbsAr
z?JzEh6PiOnj=}so$Y(|(AZ9Xl##aFOCJCEJ!F~Y9?IbLpg582c_2X0mW~H)VB(g9?
zJlt#(N4*<`gm!}ao=`6n#!XE*&{dSa&JCiZ7ki3f&q45rC!=@cr-@1h)nD9rwX{ub
z;t5jPazIU6l<*a_v(>OV93QwCiRcKU*Q@2H%eCsNW%craHjlB}X%lo}A^26m<C^UY
z$=nrqfH^6_M~Q=zfC#sjYt_XS5}K4<Og&{KB=^D94!qYxqsU$G^Qk9mPc5P2)znls
zoH`w{oQ=KgbL=_H1-@q{CkSlO!Mq!1Sno}ar-{=vn?0H-^V#IgFyZhqdKixzSgXN_
zS`yYnr@bAcLt@+b5NOQdCM^@sW)7K)n9U88Gx4O%%+I3|T7>6g=z6mYU)qzkzD@PG
z)taAQjT4GJRg66*;XnaB*i4&wK@pasL+sR60IWb*p&S+=D#c<L#A3_`Xpt)Lk*bm%
zqtn<qeF2NhzNbo(%9@qXUlCA>`v@x127vBm6s!Vb5?$tm^iaw}Soau5&!XTnNg1r~
z?baKYb{qRw>RY?d@7FiCH`g0`FGuh;ZE`paXqz^}HIppY!H@3}KG4Qcsl_^NUo_ri
zk@GS7Yp{hL!m?E8i)an%K6X)yu|TXK+Qjo+G#iGA@eRs@`hG<A7o#%^r_b?Sw~NwI
zjlqRtKF(Kdgs*UKBO<9j<W0^Q-}9xQ4q5N5s&;c%CGcDA-<LqDZW?qlCZ!9#@GlJF
zyzmdKPf?4*&S%PF?!uXoRrl0Vm)tK<{eJ`bE0?%$CP&>ja9uo@?_U?1npn;c-yd*+
zU4^M;K5{sDiF4c?j0%N<0v!S1?F49Q2xO@=+#jT&zk-Q{9IZJYRpxEng-#-B<&M$F
zUJi;B1ja_y@^ZSZGjIMM+Pd$?v~}hkQ2Y*ZUuH{ZEC8gI-Oh!HJsjVreWYi!X;CK;
zgFT+vZ&jE3oz~A_cn2hx-DzC}$P?L})^h;a$mq20T?_TAapo54{WI4OIIHC)xIORf
y&7|W0h^c9hf|Sg=ECOq0q6iQ(RRlhOsSnMJBJc$OzBK=<BJej0QuCGB4FCX!OI6GO


From 8badccedb36f428a298397bb1fb699a64071b0b5 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 28 Nov 2023 11:50:58 -0500
Subject: [PATCH 16/20] Change deletions to replacements with dummy enum

---
 .../core/src/utils/make-namespaced.test.ts    |  12 ++--
 .../core/src/utils/make-namespaced.test.ts.md |  64 +++++++++---------
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1297 -> 1306 bytes
 packages/core/src/utils/make-namespaced.ts    |  44 ++++++------
 4 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.test.ts b/packages/core/src/utils/make-namespaced.test.ts
index d2434f239..6dbfa7bae 100644
--- a/packages/core/src/utils/make-namespaced.test.ts
+++ b/packages/core/src/utils/make-namespaced.test.ts
@@ -35,15 +35,16 @@ async function testMakeNamespaced(
   const origInput = JSON.parse(JSON.stringify(origBuildInfo.input));
 
   const modifiedInput = makeNamespacedInput(origBuildInfo.input, origBuildInfo.output);
+
+  // Run hardhat compile on the modified input and make sure it has no errors
+  const modifiedOutput = await hardhatCompile(modifiedInput, solcVersion);
+  t.is(modifiedOutput.errors, undefined);
+
   normalizeIdentifiers(modifiedInput);
   t.snapshot(modifiedInput);
 
   t.deepEqual(origBuildInfo.input, origInput);
   t.notDeepEqual(modifiedInput, origInput);
-
-  // Run hardhat compile on the modified input and make sure it has no errors
-  const modifiedOutput = await hardhatCompile(modifiedInput, solcVersion);
-  t.is(modifiedOutput.errors, undefined);
 }
 
 function normalizeIdentifiers(input: SolcInput): void {
@@ -52,8 +53,7 @@ function normalizeIdentifiers(input: SolcInput): void {
       source.content = source.content
         .replace(/\$MainStorage_\d{1,6}/g, '$MainStorage_random')
         .replace(/\$SecondaryStorage_\d{1,6}/g, '$SecondaryStorage_random')
-        .replace(/\$UsingForDirective_\d+_\d{1,6}/, '$UsingForDirective_1_random')
-        .replace(/\$UsingForDirective_\d+_\d{1,6}/, '$UsingForDirective_2_random');
+        .replace(/\$dummy_astId_\d+_\d{1,6}/g, '$dummy_astId_id_random');
     }
   }
 }
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 7a1fc22ba..0e57eb765 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -46,26 +46,26 @@ Generated by [AVA](https://avajs.dev).
               } SecondaryStorage $SecondaryStorage_random;␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
               struct MyStruct { uint b; }␊
           ␊
               // keccak256(abi.encode(uint256(keccak256("example.main")) - 1)) & ~bytes32(uint256(0xff));␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
               /// @notice standlone natspec␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
               // standalone doc␊
           ␊
@@ -74,45 +74,45 @@ Generated by [AVA](https://avajs.dev).
                */␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           ␊
               ␊
-              ␊
+              enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
           contract HasFunction {␊
-            ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
           contract UsingFunction is HasFunction {␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
-          uint256 constant FreeFunctionUsingSelector = 0;␊
+          enum FreeFunctionUsingSelector { dummy }␊
           ␊
-          uint256 constant CONSTANT_USING_SELECTOR = 0;␊
+          enum CONSTANT_USING_SELECTOR { dummy }␊
           ␊
           library Lib {␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
           contract Consumer {␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
-          uint256 constant plusTwo = 0;␊
+          enum plusTwo { dummy }␊
           ␊
           /**␊
            * @notice originally orphaned natspec␊
@@ -122,7 +122,7 @@ Generated by [AVA](https://avajs.dev).
            */␊
           ␊
           ␊
-          uint256 constant plusThree = 0;␊
+          enum plusThree { dummy }␊
           ␊
           /**␊
            * @notice originally orphaned natspec 2␊
@@ -132,23 +132,23 @@ Generated by [AVA](https://avajs.dev).
            */␊
           ␊
           ␊
+          enum $dummy_astId_id_random { dummy }␊
           ␊
-          ␊
-          uint256 constant originallyNoDocumentation = 0;␊
+          enum originallyNoDocumentation { dummy }␊
           ␊
           /**␊
            * @param foo foo␊
            */␊
-          enum $UsingForDirective_1_random { dummy }␊
+          enum $dummy_astId_id_random { dummy }␊
           ␊
           contract UsingForDirectives {␊
-            enum $UsingForDirective_2_random { dummy }␊
+            enum $dummy_astId_id_random { dummy }␊
           ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
           ␊
-          uint256 constant CustomErrorOutsideContract = 0;␊
+          enum CustomErrorOutsideContract { dummy }␊
           `,
         },
         'contracts/test/NamespacedToModifyImported.sol': {
@@ -191,12 +191,12 @@ Generated by [AVA](https://avajs.dev).
           pragma solidity 0.7.6;␊
            ␊
           contract HasFunction {␊
-            ␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
           contract UsingFunction is HasFunction {␊
-            ␊
+            enum $dummy_astId_id_random { dummy }␊
           }␊
           `,
         },
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 816c953976245721c16388041877f5ecb5b25797..a1496cc79b844451e175f7623676bd625ef5668f 100644
GIT binary patch
literal 1306
zcmV+#1?BodRzV<BZeeh9Xm4~Nb~6eC072TE^LCz3ZTgY{HQ_x+Lsp``z~0D0{?k&d
zEzMf2C?AUm00000000BkSIuiAMHKIk$!2zvI9b<&-inab&6v#0j+jUy;*w-FkdM`w
z6%{embk`(hx~rP1>X<QPMZwda^dJh0u;Sg52M;3R!96b?_7Cv1Ac!F7N#E3bb$Svz
zGdQp|)J#>q-}|Wd>f^mTwW`ORJ^A66L{a6D(8qfOG3*l=V28MfvLIAcG91WVuH*-I
zTo)_+#>92o7&RK7nKo1N@c%qC0_}Zh7tM1Q%yV1ScZj1*v(ufNoHWb{!?X=E3mEIM
zMsMVTnf5T-3Goi;Oq97tU8?Ga`G{$L1`<0INtB{&M{3GX5z46Kp>T-Q2K^3%KcOMh
zFqX`iLDq4D(x&|uK&sF_k3-Xmwr9w`{~8gJa@L+239z6|1Miz%1JCn7QJ=m?geKWm
zmz3q90yme52bw^V)?{f|E&{vcaHa%ylq@JBRbjIerV8KSF0Iw`l6#u%l?dBhBHNlD
zaG{9XWCw>F0Q*g7x2>2%?6~i&Zvpas9G2>V-2=$|IP826?ADlJd^{F|WqP7u#iB4u
z7_NH6)nh9gqozd2q#mTKyM`8EYA?z0u9wVQn{Zrm!+C_M*4X+aT_~XP^_AD>)~Q37
zBy(#nkZFw)v4}R-Dw#mw9Umjv+QR7VV*a^&skoHMwBvwQ53nD21RZ7&d<BsBq7zER
z{YCfzb}|Qt5;t}NBEnfH6|XFkCQIJOlxZ%hL<pibU|eo8wZt{PkTO+zb{-up^-R^9
zQ%A=*rz3-HftkyFu(xmHB!MNmSk$8ymfMr3n~8hPthUYUVV{oA95-115ElAq+6{fb
zzKx|?bGND6f}umC=h4y7@zF4WvAT1pR|v~%%LD)J5y!!Mu<FaWO7ny{+$EP=j=0<<
zPDS^?)XWT;Ls#JUNp!PXhlBl0sl!t|sMTg>mik@VaG-hzF|OdafHwf*an^WZlnjV7
zSPVd-mV~t^m$$?ea=GR{%0(0b73nvwMJhaW+vF&6GrWxDwUFsYK%bMdZnXY2-H`B%
zc63oWplT4Qf!72fZFViX`IvDLb&N(XZ*7(<S2ru$H_B_9FKw4s*H@P-TdziO9<2&E
z-)Nmy`!Ho7H!O1|L!XFY=oyOT8W?z?th~#kBJ}3Zbxs-=bcZtRd3ERpyO=>P*FJL%
zm`nDNt9y{GV33FcJrYEPf+2xKMxT|4zFi3MU>Z?r0G-KR)3C1EO}@e%h$U0a*XaaP
zn|f=UH=0&<Mpdz6!^H{}ja+S?$RX{})?v{v@2U`7Y=ufvmn^p}>7vh+xcp!Yp14q*
zAELukj_z!GKhAbH%Iv?GeuQcQmOGU{C4-$hF;{A=6H?PJAZPmu+Bf5|EOF$dED@5t
zyWJ$u&=bGLvOY*VADu9a$0u3>N3IHi>)l>9o7JFM0F+{&(PN;D4#RjO3>^(NMEPXO
zL@S?K$92g6TLstwI<W$Sw;mkhpkjWZw-`$;JPgIykEax4_5&dN25l^{5VK|hQc5nu
znt|Ory}0_+Oen6J`Tutj*i(sBQgNYEAN>N151^%!>!V8mc{;g1dI2CS3H8x`SNObX
z_g(n>(f9oUdo@1~N$CGNyV2qP2;6lG+HL!cch1*#?9Tbw?zwaRf~mjlggfVA$}pZt
Q4eQSN2Sx5`XZ{fY0NYZ9kpKVy

literal 1297
zcmV+s1@8JmRzV<BZeeh9Xm4~Nb~6eC0Qg}`=%D~ub;1}}L#M(ry?X*hDlrnz8=7vL
zni=ZTl^=@;00000000BcR?TZ9MHKIkWHV`9CyOE;JQN|TNz8m?#6%KTc1f}t$R_H{
z`T=UF>8?r2baypX)iGnpiXJ?8@+1l(ta$Pd5Cj(y54)ZOPkZ#>X}ySEJo>u2XQron
z#@WaU4pdK7z2Ez&_p07|*IP}O*$3kNFNmblC83882=cK<M1XDLAnFI9q{7F6*k@9_
zcinNY#IIS$rZ%BPKfR!jEy4dYFbIryVLYgxIj5i5X}(2lsq5Y8)YO!wpVf3z(~E#H
z9*Sn;=k$V${k;(Hk?uyFxzwSut?3Ww`X?Z<OA$m$>hB3fxtXF&2o`di2xZV8K==y=
z(lu>W&lqI%8&uHE*8$Rm@o5%X7-_pj4!xHN7nJ#(t?>YJ8XI_9?-@AB0!cmk4&jPq
z8a+~xg%aFcCoX6LNlKHUVDl;1d7Jr?V_S-fBtllUyJ2duE6ky-c3Ci2vAvjLD~)8^
z^a92uabk9G$Put#gYlV>afq4qo$(DozRSYKa<HEPaytu~%)!1cXxg`h49v<!!N^2m
zg7~=U5=X6#Vum`#Ltm)Hm~l%}0(9l2&nJ6c(&sybe#w#Zh%b}1abvtvLG>5bUoCA>
zoA`p1HXR_-7A1TIUD<3{0mpkDMk2Yw=*?>R>2j^QYFV8)pp7H!1uj9y7J^>|Bwn;b
zA(^)VA7CdXc$7H035alexmI0VAu&tY!_-$?Lh=wqU4eByW=h0GzmWQ}_S6zOTFq^>
z<E@iE&Y9F=mt)^y9@u+o;{<^tI+(Z97S=nP!_CBbGn*YVbL=zOoqmJk&){j=Z@{f4
z$4VvWLnoaRqXS~w_yEk9#Z6i!zResmn^-p6BTlD-GCenkN@x+jkD+VLHoUYaYh9k|
zQL8mKx0*I6^;JIhnS=`k=D}fH=0{0bih$U;qX1ZeutGU3K~(1FV<*n1WB?VZ1fP&9
zqkVLex~I=$aXIu=N>Wj?GW4qgQgIhSMV<lBornTgWSB&kIUyaCk`U)T#?b{7J(C>6
z+Rk>pacR4;d$qo~{oHPSV{2orvGY;_cWINuWk6fB8SBhixdw7VkMJHfg~}-l+)y;$
zW{Gg+)%k987^i#G$FAFkX|RudsF0mFMKFgPB1g@j24D{bC{Qa-WXOHQ5w}zjhN#^K
z&zxE@s+~^t0OdXD+iacL;4ELpFTCHFSaOT8Xee>S4?Q#!-vh?iDUS-+A=zC_9wj_4
zC-l5F%3qrlT&U0tlT{laD-Pa(tD-X12Iq|Lgi=t4taY@iquf=F|6cp|Ii9LgijIfe
z*@e#iTIfZ5;UBC%K`jm^pDqt6_R|B)%88|__>WNDeuDAKWTv2w4=Sio5C81dLrrZw
zV)YkDsL&T+Yt2doj$h&&w|lc<v8X_=0N{-bXrd2fsW99hg`um##6k|HoJ~s47H&hU
zl=P}cXkfDnSr{B+qiT6M-?y5#{ttcY4@3G^^9~SxhjHJ?p4C_YNNse#8VB}Zcpv()
zKB5neTcsN**yAG`%Ib2rmHZVL@4zUGZY9qH<cZO(<g)--AJIzQyB_g3<J3Lk2dB;-
za97Jq&>q~|(yRRcu&HT}!YG+{nFKDHnIu5WToU*YwmvdPB!Mph@Rj*rC4s*I9O+|a
Hx()yUW(99g

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index dba25f958..d3d54fd56 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -17,9 +17,9 @@ const OUTPUT_SELECTION = {
  *
  * This makes the following modifications to the input:
  * - Adds a state variable for each namespaced struct definition
- * - For each contract, deletes the node types that are not needed for storage layout or may reference deleted functions and constructors
- * - Converts all using for directives (at file level and in contracts) to dummy enums (do not delete them to avoid orphaning possible NatSpec documentation)
- * - Converts all custom errors, free functions and constants (at file level) to dummy variables (do not delete them since they might be imported by other files)
+ * - For each contract, for all node types that are not needed for storage layout or may reference deleted functions and constructors, converts them to dummy enums with random id
+ * - Converts all using for directives (at file level and in contracts) to dummy enums with random id (do not delete them to avoid orphaning possible NatSpec documentation)
+ * - Converts all custom errors, free functions and constants (at file level) to dummy enums with the same name (do not delete them since they might be imported by other files)
  *
  * Also sets the outputSelection to only include storageLayout and ast, since the other outputs are not needed.
  *
@@ -64,18 +64,14 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
               case 'EventDefinition':
               case 'FunctionDefinition':
               case 'ModifierDefinition':
+              case 'UsingForDirective':
               case 'VariableDeclaration': {
-                if (contractNode.documentation) {
+                if ('documentation' in contractNode && contractNode.documentation) {
+                  // Delete documentation for efficiency reasons only
                   modifications.push(makeDelete(contractNode.documentation, orig));
                 }
-                modifications.push(makeDelete(contractNode, orig));
-                break;
-              }
-              // - UsingForDirective isn't needed, but it might have NatSpec documentation which is not included in the AST.
-              //   We convert it to a dummy enum to avoid orphaning any possible documentation.
-              case 'UsingForDirective': {
-                const insertText = getUsingForReplacement(contractNode.id);
-                modifications.push(makeReplace(contractNode, orig, insertText));
+                // Replace with an enum based on astId (the original name is not needed, since nothing should reference it)
+                modifications.push(makeReplace(contractNode, orig, toDummyWithAstId(contractNode.id)));
                 break;
               }
               case 'StructDefinition': {
@@ -104,31 +100,29 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
         // - UsingForDirective isn't needed, but it might have NatSpec documentation which is not included in the AST.
         //   We convert it to a dummy enum to avoid orphaning any possible documentation.
         case 'UsingForDirective': {
-          const insertText = getUsingForReplacement(node.id);
-          modifications.push(makeReplace(node, orig, insertText));
+          modifications.push(makeReplace(node, orig, toDummyWithAstId(node.id)));
           break;
         }
         // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files, so they cannot be deleted.
         //   However, we need to remove their values to avoid referencing other deleted nodes.
-        //   We do this by converting them to dummy variables, but avoiding duplicate names.
+        //   We do this by converting them to dummy enums, but avoiding duplicate names.
         case 'ErrorDefinition':
         case 'FunctionDefinition':
         case 'VariableDeclaration': {
-          // First delete documentation, otherwise it may reference deleted parameters or be orphaned
           if (node.documentation) {
+            // Delete documentation for efficiency reasons only
             modifications.push(makeDelete(node.documentation, orig));
           }
-          // If an identifier with the same name was not previously written, replace with a dummy variable.
-          // Otherwise delete to avoid duplicate names, which can happen if there was overloading.
+          // If an identifier with the same name was not previously written, replace with a dummy enum using its name.
+          // Otherwise replace with an enum based on astId to avoid duplicate names, which can happen if there was overloading.
           // This does not need to check all identifiers from the original contract, since the original compilation
           // should have failed if there were conflicts in the first place.
           const name = node.name;
           if (!replacedIdentifiers.has(name)) {
-            const insertText = `uint256 constant ${name} = 0;`;
-            modifications.push(makeReplace(node, orig, insertText));
+            modifications.push(makeReplace(node, orig, toDummyWithName(name)));
             replacedIdentifiers.add(name);
           } else {
-            modifications.push(makeDelete(node, orig));
+            modifications.push(makeReplace(node, orig, toDummyWithAstId(node.id)));
           }
           break;
         }
@@ -161,8 +155,12 @@ interface Modification {
   text?: string;
 }
 
-function getUsingForReplacement(astId: number) {
-  return `enum $UsingForDirective_${astId}_${(Math.random() * 1e6).toFixed(0)} { dummy }`;
+function toDummyWithName(name: string) {
+  return `enum ${name} { dummy }`;
+}
+
+function toDummyWithAstId(astId: number) {
+  return `enum $dummy_astId_${astId}_${(Math.random() * 1e6).toFixed(0)} { dummy }`;
 }
 
 function getPositions(node: Node) {

From 3e5e24587174d7312a7aa44de0fb7d43e882e8fe Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 28 Nov 2023 12:59:09 -0500
Subject: [PATCH 17/20] Test enum with all natspec tags

---
 .../contracts/test/NamespacedToModify.sol     |  22 +++++++++++-------
 .../core/src/utils/make-namespaced.test.ts.md |  22 +++++++++++-------
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1306 -> 1352 bytes
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/packages/core/contracts/test/NamespacedToModify.sol b/packages/core/contracts/test/NamespacedToModify.sol
index 6ff2dcb7c..d30458f8b 100644
--- a/packages/core/contracts/test/NamespacedToModify.sol
+++ b/packages/core/contracts/test/NamespacedToModify.sol
@@ -115,9 +115,6 @@ function plusTwo(uint x) pure returns (uint) {
 
 /**
  * @notice originally orphaned natspec
- * @dev d
- * @param p p
- * @return r r
  */
 
 /**
@@ -128,12 +125,7 @@ function plusThree(uint x) pure returns (uint) {
   return x + 3;
 }
 
-/**
- * @notice originally orphaned natspec 2
- * @dev d
- * @param p p
- * @return r r
- */
+/// @notice originally orphaned natspec 2
 
 /**
  * @dev plusThree overloaded
@@ -159,6 +151,18 @@ contract UsingForDirectives {
   }
 }
 
+/**
+ * @title a
+ * @author a
+ * @inheritdoc Example
+ * @dev a
+ * @custom:a a
+ * @notice a
+ * @param a a
+ * @return a a
+ */
+enum FreeEnum { MyEnum }
+
 /**
  * @dev a custom error outside a contract
  * @param example example parameter
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 0e57eb765..8117e6047 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -116,20 +116,12 @@ Generated by [AVA](https://avajs.dev).
           ␊
           /**␊
            * @notice originally orphaned natspec␊
-           * @dev d␊
-           * @param p p␊
-           * @return r r␊
            */␊
           ␊
           ␊
           enum plusThree { dummy }␊
           ␊
-          /**␊
-           * @notice originally orphaned natspec 2␊
-           * @dev d␊
-           * @param p p␊
-           * @return r r␊
-           */␊
+          /// @notice originally orphaned natspec 2␊
           ␊
           ␊
           enum $dummy_astId_id_random { dummy }␊
@@ -147,6 +139,18 @@ Generated by [AVA](https://avajs.dev).
             enum $dummy_astId_id_random { dummy }␊
           }␊
           ␊
+          /**␊
+           * @title a␊
+           * @author a␊
+           * @inheritdoc Example␊
+           * @dev a␊
+           * @custom:a a␊
+           * @notice a␊
+           * @param a a␊
+           * @return a a␊
+           */␊
+          enum FreeEnum { MyEnum }␊
+          ␊
           ␊
           enum CustomErrorOutsideContract { dummy }␊
           `,
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index a1496cc79b844451e175f7623676bd625ef5668f..79ac3d3b8606406292eab9c56cfb70bef347c704 100644
GIT binary patch
literal 1352
zcmV-O1-JS^RzV<BZeeh9Xm4~Nb~6eC04mIta9$hwJ~*{jWan@52#3<Z-R2Qdq1-V@
z_KV0<3LlFI00000000BkSIuu5MHJulI*seZI90iD8$~H3CjO`q2}%&6N>YfFCQ!Sm
zAVf6Y9VbI}XRMjo5EG>cBu-p7A&`10{{RP091ubrK;lHjp{JgD>IorLf)hNCckT5$
zspAMsWu>ua=KbEAH}AcfdGAiW=5l*ae)2U@RJp|W@E$=7dqg&{O&mm7!&g)?+>pCm
z$&c?i4p#W>%;%OdZnQo#WhNKk|7B<d+DFhXn&&Q<=eBC^6I+>Pr#m$@WtbVmv<x!~
zn8eeq-q-~*<zlwu;~mnOsBo7$R5cCrDbxHCBz7p0C`H+h)RdnilyS*@VH2qp`V$C$
zK|`itESoWf61@tgOzT~M)S!J8ho%PVo+kU=TSQ38SvWP;z=F0Fyk~Y5JkJ}7dh|mg
zG|5VINm=eIFmr{tuo6hpD<w267lB=}Ia31LN){E7s<_#4Q<Y!i4y`u}lDnGi%?Mk5
zAltgv;6f3n%?<`R0QOtZZYN>}vEsH%d<T#p;;>{N>@Gm=#bM|BV82cn#%~ibSh~*(
ziI^A03Bxs)IC`AO#;8f*GpPs3#4m;xU}`IUJK438nF|TMl3T_jOa<e_-BhuNDsQab
z%x_SeFiG<34v=Y`60wA?tyj|xfp<KNWDvsWy;9+&Lb<e@PKSO#YX{hCxC9-h5qw3E
z_^Rzo#l0o?0d|syLy23FfQYac%caXpq|H+BFlCxcD&d2uYcQ^~nF4XG&!<e4UtB;3
z%Y9SL_S8`i=S*a<EiiMq2l@`JoFuSC2a9G@!%8@LvYNPG&045tANx#vrdMJ8LzwTO
z8OQg$<~EjU-Pxv207HjJ&!eM}<D+f@Wp(FJ?+~^Z$^-lE5!=Rlu<Kb|qXoij?vUBQ
z5VKw4bTkI0=jKozU54Lh(XCn&4)zP>4o~TzUZ0y=9(HS^f$9iiT)}YxYXHRMto6hw
z*&z1Wd;k))B&<a_JP=dN<=SzSi!20Gq~ExJRD9yX<S248ypH8npXo<HpOe!D+VCsg
zknoIl)}r!^OM^%ayebF@*|q5QW5z|)FdDhCwOOfN*{p8gsH|_kwq04<SX-%XU60~i
zS`%=-(FUyzp~{)eu)>-2Jt9W2&PX)Zz=rF~>IXb3LI;1YbJDn=JCtG9Z9=!Piy7o{
z;hEEiAR=fNeAgo?a$+AN2bDu9gEy#QU0IuamD^x;rrHn5G5dfd3VW!|d8=uaPq|bq
z!ns(bqLo(d6FH(_3RTt_G{U-%eYFe0-yTr5O9WM|t0;K-^|V9w13>V=;$Rrq9!Crj
zk_1t{V8O81J$q}d&LO-rx^onIW<?8L6M~B^UrFkamC!uhEu1Rx`O!Fg;zM<Qi4IRV
z`txBt&v)Z-{xPZ_p}GJcOczebfTxemwOadx)b>8)d=H>Knv7+cW5;EgkR+xuog~rF
z6ZuSU)(C0qb(p%D2?UN^5dt^6y=*qCK`sD93^d*YN^3Vvw%pKJ!Gh2`o{|aju?^gW
z`XMOb4$!d`9OMdM7#o!ei~Yr1a`8zh=6*V%n6n-N;SXpN0}HvtJV45Wi@3I9_f9U(
zzAy(AXYKmo`v~m0fmK#%u~T0?0LF*VQiJQOO8|L(aDDX(KvoCTSN~n%^o})j;q++e
z`vYRNumDNy|2jL;?*0_a^%=C=)+z6tZ>-pz^Sjk|=ll&*|5yX=oQp}rcqTcjJLg}c
Kq5Abc5&!^zK#chS

literal 1306
zcmV+#1?BodRzV<BZeeh9Xm4~Nb~6eC072TE^LCz3ZTgY{HQ_x+Lsp``z~0D0{?k&d
zEzMf2C?AUm00000000BkSIuiAMHKIk$!2zvI9b<&-inab&6v#0j+jUy;*w-FkdM`w
z6%{embk`(hx~rP1>X<QPMZwda^dJh0u;Sg52M;3R!96b?_7Cv1Ac!F7N#E3bb$Svz
zGdQp|)J#>q-}|Wd>f^mTwW`ORJ^A66L{a6D(8qfOG3*l=V28MfvLIAcG91WVuH*-I
zTo)_+#>92o7&RK7nKo1N@c%qC0_}Zh7tM1Q%yV1ScZj1*v(ufNoHWb{!?X=E3mEIM
zMsMVTnf5T-3Goi;Oq97tU8?Ga`G{$L1`<0INtB{&M{3GX5z46Kp>T-Q2K^3%KcOMh
zFqX`iLDq4D(x&|uK&sF_k3-Xmwr9w`{~8gJa@L+239z6|1Miz%1JCn7QJ=m?geKWm
zmz3q90yme52bw^V)?{f|E&{vcaHa%ylq@JBRbjIerV8KSF0Iw`l6#u%l?dBhBHNlD
zaG{9XWCw>F0Q*g7x2>2%?6~i&Zvpas9G2>V-2=$|IP826?ADlJd^{F|WqP7u#iB4u
z7_NH6)nh9gqozd2q#mTKyM`8EYA?z0u9wVQn{Zrm!+C_M*4X+aT_~XP^_AD>)~Q37
zBy(#nkZFw)v4}R-Dw#mw9Umjv+QR7VV*a^&skoHMwBvwQ53nD21RZ7&d<BsBq7zER
z{YCfzb}|Qt5;t}NBEnfH6|XFkCQIJOlxZ%hL<pibU|eo8wZt{PkTO+zb{-up^-R^9
zQ%A=*rz3-HftkyFu(xmHB!MNmSk$8ymfMr3n~8hPthUYUVV{oA95-115ElAq+6{fb
zzKx|?bGND6f}umC=h4y7@zF4WvAT1pR|v~%%LD)J5y!!Mu<FaWO7ny{+$EP=j=0<<
zPDS^?)XWT;Ls#JUNp!PXhlBl0sl!t|sMTg>mik@VaG-hzF|OdafHwf*an^WZlnjV7
zSPVd-mV~t^m$$?ea=GR{%0(0b73nvwMJhaW+vF&6GrWxDwUFsYK%bMdZnXY2-H`B%
zc63oWplT4Qf!72fZFViX`IvDLb&N(XZ*7(<S2ru$H_B_9FKw4s*H@P-TdziO9<2&E
z-)Nmy`!Ho7H!O1|L!XFY=oyOT8W?z?th~#kBJ}3Zbxs-=bcZtRd3ERpyO=>P*FJL%
zm`nDNt9y{GV33FcJrYEPf+2xKMxT|4zFi3MU>Z?r0G-KR)3C1EO}@e%h$U0a*XaaP
zn|f=UH=0&<Mpdz6!^H{}ja+S?$RX{})?v{v@2U`7Y=ufvmn^p}>7vh+xcp!Yp14q*
zAELukj_z!GKhAbH%Iv?GeuQcQmOGU{C4-$hF;{A=6H?PJAZPmu+Bf5|EOF$dED@5t
zyWJ$u&=bGLvOY*VADu9a$0u3>N3IHi>)l>9o7JFM0F+{&(PN;D4#RjO3>^(NMEPXO
zL@S?K$92g6TLstwI<W$Sw;mkhpkjWZw-`$;JPgIykEax4_5&dN25l^{5VK|hQc5nu
znt|Ory}0_+Oen6J`Tutj*i(sBQgNYEAN>N151^%!>!V8mc{;g1dI2CS3H8x`SNObX
z_g(n>(f9oUdo@1~N$CGNyV2qP2;6lG+HL!cch1*#?9Tbw?zwaRf~mjlggfVA$}pZt
Q4eQSN2Sx5`XZ{fY0NYZ9kpKVy


From 10732add839529a91539754982b57e578810a28a Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 28 Nov 2023 13:04:51 -0500
Subject: [PATCH 18/20] Update changelog

---
 packages/core/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 61835b8e8..7da5b4348 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Fix Hardhat compile errors when contracts have overloaded functions or standalone NatSpec documentation. ([#918](https://github.com/OpenZeppelin/openzeppelin-upgrades/pull/918))
+
 ## 1.31.1 (2023-11-01)
 
 - CLI: Throw error if `--requireReference` and `--unsafeSkipStorageCheck` are both enabled. ([#913](https://github.com/OpenZeppelin/openzeppelin-upgrades/pull/913))

From 8771bb173c0ab0f9a55ae04291bdc3fe6e6192ca Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 28 Nov 2023 13:28:22 -0500
Subject: [PATCH 19/20] Simplify dummy enum names

---
 .../core/src/utils/make-namespaced.test.ts    |   2 +-
 .../core/src/utils/make-namespaced.test.ts.md |  52 +++++++++---------
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1352 -> 1337 bytes
 packages/core/src/utils/make-namespaced.ts    |  14 ++---
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.test.ts b/packages/core/src/utils/make-namespaced.test.ts
index 6dbfa7bae..ed29bafe7 100644
--- a/packages/core/src/utils/make-namespaced.test.ts
+++ b/packages/core/src/utils/make-namespaced.test.ts
@@ -53,7 +53,7 @@ function normalizeIdentifiers(input: SolcInput): void {
       source.content = source.content
         .replace(/\$MainStorage_\d{1,6}/g, '$MainStorage_random')
         .replace(/\$SecondaryStorage_\d{1,6}/g, '$SecondaryStorage_random')
-        .replace(/\$dummy_astId_\d+_\d{1,6}/g, '$dummy_astId_id_random');
+        .replace(/\$astId_\d+_\d{1,6}/g, '$astId_id_random');
     }
   }
 }
diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 8117e6047..1ce5813de 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -46,26 +46,26 @@ Generated by [AVA](https://avajs.dev).
               } SecondaryStorage $SecondaryStorage_random;␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
               struct MyStruct { uint b; }␊
           ␊
               // keccak256(abi.encode(uint256(keccak256("example.main")) - 1)) & ~bytes32(uint256(0xff));␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
               /// @notice standlone natspec␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
               // standalone doc␊
           ␊
@@ -74,22 +74,22 @@ Generated by [AVA](https://avajs.dev).
                */␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           ␊
               ␊
-              enum $dummy_astId_id_random { dummy }␊
+              enum $astId_id_random { dummy }␊
           }␊
           ␊
           contract HasFunction {␊
-            enum $dummy_astId_id_random { dummy }␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           ␊
           contract UsingFunction is HasFunction {␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           ␊
           enum FreeFunctionUsingSelector { dummy }␊
@@ -97,19 +97,19 @@ Generated by [AVA](https://avajs.dev).
           enum CONSTANT_USING_SELECTOR { dummy }␊
           ␊
           library Lib {␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           ␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           ␊
           contract Consumer {␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           ␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           ␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           ␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           ␊
           enum plusTwo { dummy }␊
@@ -124,19 +124,19 @@ Generated by [AVA](https://avajs.dev).
           /// @notice originally orphaned natspec 2␊
           ␊
           ␊
-          enum $dummy_astId_id_random { dummy }␊
+          enum $astId_id_random { dummy }␊
           ␊
           enum originallyNoDocumentation { dummy }␊
           ␊
           /**␊
            * @param foo foo␊
            */␊
-          enum $dummy_astId_id_random { dummy }␊
+          enum $astId_id_random { dummy }␊
           ␊
           contract UsingForDirectives {␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           ␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           ␊
           /**␊
@@ -195,12 +195,12 @@ Generated by [AVA](https://avajs.dev).
           pragma solidity 0.7.6;␊
            ␊
           contract HasFunction {␊
-            enum $dummy_astId_id_random { dummy }␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           ␊
           contract UsingFunction is HasFunction {␊
-            enum $dummy_astId_id_random { dummy }␊
+            enum $astId_id_random { dummy }␊
           }␊
           `,
         },
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 79ac3d3b8606406292eab9c56cfb70bef347c704..4a6bc065938f4c8e726fc65abe3791cf4edb2b00 100644
GIT binary patch
literal 1337
zcmV-91;+Y8RzV<BZeeh9Xm4~Nb~6eC0QL;jYf04?BWDbmysT2lFj0q9s<$yPr5@gg
zSF8t<%pZ#g00000000BkS5I#vH58vo(m$KFq$~IUR@Fiq+9Vr9i&})J+U~Ye{{YD%
zK#0njaaxlZJF-2cp=uEv`2YwcI4pb$4hR7U_QZkHo&gE85)$IXkvGmvGMTiU26Y9D
z<iz&-z31omp6&PU)oTv78uEkBiK5COo{Jj<G3*lA#1^p;Wlc{}$#7F1awXrtXWLle
z*C&S4#)#p6=BSxjg#YKE5oqs0d)yqpX%6qz-X@kZ%}#f6a?&s-3^Q$*Il!cz@Owiy
z%~1!l0}mgN&P0Vf)TXLsn2(v}#~`sokwhuV4y2}hAEAs$?g@)Xt<ax9_zM~`4P(WO
zDU|9}Xw*!<36L7JPvX$gMBTIG$bFRvNjVFrhMHK=wt^4Lu7WpsQ&E?`ON1t+Q(aPy
zdkV~4Ar7nrlJrU`4a-MhGZtq`U`xrOB2pE1J8r7-9d6Tlt01|f*<OyYEhMsSxlJw<
zvD@rmkYiv!gZ61EW{`B;cBwA`@^u`R>4W_UkOy(tjXv1wm|@%*i@~yeUP#5fFhUrv
zImFiER4zu%2#-lU$fWKYT7apoG&kP0l9>+)y^?+75vGE1YIC$$M3tA;Ut8Fw7GaVs
zY}r7jbxOoC+S#gRn*txW7|9@n(Oad$bA@tgC7TWXfHsb?+jIyz$s+iQAn`@ZlZv~`
z@B{2*0S+bhBLNX%EtN~RmPwnX;9|-&msG+7Q9CfMw3z~N{^wDq%FiyM<CVUtR(tBS
zhjThI*cX`D+y#9HR!$PwqK!o>s$nIZyjV@#uVyV&vyXi`KGUnP{vphB(KME7%igDU
z06-_m_FT7xP9F&}>J(5-cTV(vU^Ag4ux5i;7H+^EXK{@d2(!3NW`k|dc8OC_k5A3b
zp#^jcexF2VwH6%XXUZL((s8{$H@9;2?OY#7M+f5yjsol*AP#5#^PyyuSc6&_WN8^#
z3$b}1pqS6Mqaz<#0;ov8Tmh;0FFXG<a=JIMyzMc4k?UAb4xB-x-<9zEb>vey@Nytb
zLv9N~LPjmL{rqqdHGoF0?d?{otGm_xyOpioJNuQ5?TxkS-YZd@Lu&#~B-*C6D=9JH
zrq?)=o=e1a$-XuXHKgfyvic5>GV7qtcg_YE^nfz#I4$Tl4>5zxDm*1Rcq4)i!7n|c
zB4_LpIj9^;xolG!(3P^w*SQ6TWvYFlpR)r<X0VIuocm2Ho480UR=HTG!cT0Dh`h$&
z2o=<ME5f>uJ#`2H+#XPNNCZ{>RS`V6dfFyO0U&tRa4-yPj3e6)NrEU(uwYp1o}UfB
za{~9h?wp1mSkr<xgy3S&Q<B<bEi_4Y3s*`vzA^rJx<PeThfXdyzVl(+&UfQ({u0$s
zQC)x!rV1D2om1y#IQ~8%p{zot^#-)Ycr3RYIxn|_)a<OAni+cHi&(A($>M#O`XLlJ
zv?>H{b$hv7PJ?~|z;7|oNDnBh-7xOEp|e67LhpRaM34n-;}&G?LD_VS&aIo^%?86*
zs8m?$FQGCs|Ai9jy9-LF^g|&00c|X?d`is&q?}wjwH@2IxFq_>Oel%kS^HNJ*i(tM
zO=+o9)%*gC521}FS2Z&Lc{;hOc>y5n302MYl`EU+fy<Sj2fjZbRtt-eO#YAZ8SPvN
v#%V$OFnz@v=CgF{hWR$#cf<S&Q@^JZZWuFT7$ccSb;JA(dLGdjq7eW9MoxD}

literal 1352
zcmV-O1-JS^RzV<BZeeh9Xm4~Nb~6eC04mIta9$hwJ~*{jWan@52#3<Z-R2Qdq1-V@
z_KV0<3LlFI00000000BkSIuu5MHJulI*seZI90iD8$~H3CjO`q2}%&6N>YfFCQ!Sm
zAVf6Y9VbI}XRMjo5EG>cBu-p7A&`10{{RP091ubrK;lHjp{JgD>IorLf)hNCckT5$
zspAMsWu>ua=KbEAH}AcfdGAiW=5l*ae)2U@RJp|W@E$=7dqg&{O&mm7!&g)?+>pCm
z$&c?i4p#W>%;%OdZnQo#WhNKk|7B<d+DFhXn&&Q<=eBC^6I+>Pr#m$@WtbVmv<x!~
zn8eeq-q-~*<zlwu;~mnOsBo7$R5cCrDbxHCBz7p0C`H+h)RdnilyS*@VH2qp`V$C$
zK|`itESoWf61@tgOzT~M)S!J8ho%PVo+kU=TSQ38SvWP;z=F0Fyk~Y5JkJ}7dh|mg
zG|5VINm=eIFmr{tuo6hpD<w267lB=}Ia31LN){E7s<_#4Q<Y!i4y`u}lDnGi%?Mk5
zAltgv;6f3n%?<`R0QOtZZYN>}vEsH%d<T#p;;>{N>@Gm=#bM|BV82cn#%~ibSh~*(
ziI^A03Bxs)IC`AO#;8f*GpPs3#4m;xU}`IUJK438nF|TMl3T_jOa<e_-BhuNDsQab
z%x_SeFiG<34v=Y`60wA?tyj|xfp<KNWDvsWy;9+&Lb<e@PKSO#YX{hCxC9-h5qw3E
z_^Rzo#l0o?0d|syLy23FfQYac%caXpq|H+BFlCxcD&d2uYcQ^~nF4XG&!<e4UtB;3
z%Y9SL_S8`i=S*a<EiiMq2l@`JoFuSC2a9G@!%8@LvYNPG&045tANx#vrdMJ8LzwTO
z8OQg$<~EjU-Pxv207HjJ&!eM}<D+f@Wp(FJ?+~^Z$^-lE5!=Rlu<Kb|qXoij?vUBQ
z5VKw4bTkI0=jKozU54Lh(XCn&4)zP>4o~TzUZ0y=9(HS^f$9iiT)}YxYXHRMto6hw
z*&z1Wd;k))B&<a_JP=dN<=SzSi!20Gq~ExJRD9yX<S248ypH8npXo<HpOe!D+VCsg
zknoIl)}r!^OM^%ayebF@*|q5QW5z|)FdDhCwOOfN*{p8gsH|_kwq04<SX-%XU60~i
zS`%=-(FUyzp~{)eu)>-2Jt9W2&PX)Zz=rF~>IXb3LI;1YbJDn=JCtG9Z9=!Piy7o{
z;hEEiAR=fNeAgo?a$+AN2bDu9gEy#QU0IuamD^x;rrHn5G5dfd3VW!|d8=uaPq|bq
z!ns(bqLo(d6FH(_3RTt_G{U-%eYFe0-yTr5O9WM|t0;K-^|V9w13>V=;$Rrq9!Crj
zk_1t{V8O81J$q}d&LO-rx^onIW<?8L6M~B^UrFkamC!uhEu1Rx`O!Fg;zM<Qi4IRV
z`txBt&v)Z-{xPZ_p}GJcOczebfTxemwOadx)b>8)d=H>Knv7+cW5;EgkR+xuog~rF
z6ZuSU)(C0qb(p%D2?UN^5dt^6y=*qCK`sD93^d*YN^3Vvw%pKJ!Gh2`o{|aju?^gW
z`XMOb4$!d`9OMdM7#o!ei~Yr1a`8zh=6*V%n6n-N;SXpN0}HvtJV45Wi@3I9_f9U(
zzAy(AXYKmo`v~m0fmK#%u~T0?0LF*VQiJQOO8|L(aDDX(KvoCTSN~n%^o})j;q++e
z`vYRNumDNy|2jL;?*0_a^%=C=)+z6tZ>-pz^Sjk|=ll&*|5yX=oQp}rcqTcjJLg}c
Kq5Abc5&!^zK#chS

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index d3d54fd56..b8a328d6d 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -71,7 +71,7 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
                   modifications.push(makeDelete(contractNode.documentation, orig));
                 }
                 // Replace with an enum based on astId (the original name is not needed, since nothing should reference it)
-                modifications.push(makeReplace(contractNode, orig, toDummyWithAstId(contractNode.id)));
+                modifications.push(makeReplace(contractNode, orig, toDummyEnumWithAstId(contractNode.id)));
                 break;
               }
               case 'StructDefinition': {
@@ -100,7 +100,7 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
         // - UsingForDirective isn't needed, but it might have NatSpec documentation which is not included in the AST.
         //   We convert it to a dummy enum to avoid orphaning any possible documentation.
         case 'UsingForDirective': {
-          modifications.push(makeReplace(node, orig, toDummyWithAstId(node.id)));
+          modifications.push(makeReplace(node, orig, toDummyEnumWithAstId(node.id)));
           break;
         }
         // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files, so they cannot be deleted.
@@ -119,10 +119,10 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           // should have failed if there were conflicts in the first place.
           const name = node.name;
           if (!replacedIdentifiers.has(name)) {
-            modifications.push(makeReplace(node, orig, toDummyWithName(name)));
+            modifications.push(makeReplace(node, orig, toDummyEnumWithName(name)));
             replacedIdentifiers.add(name);
           } else {
-            modifications.push(makeReplace(node, orig, toDummyWithAstId(node.id)));
+            modifications.push(makeReplace(node, orig, toDummyEnumWithAstId(node.id)));
           }
           break;
         }
@@ -155,12 +155,12 @@ interface Modification {
   text?: string;
 }
 
-function toDummyWithName(name: string) {
+function toDummyEnumWithName(name: string) {
   return `enum ${name} { dummy }`;
 }
 
-function toDummyWithAstId(astId: number) {
-  return `enum $dummy_astId_${astId}_${(Math.random() * 1e6).toFixed(0)} { dummy }`;
+function toDummyEnumWithAstId(astId: number) {
+  return `enum $astId_${astId}_${(Math.random() * 1e6).toFixed(0)} { dummy }`;
 }
 
 function getPositions(node: Node) {

From 518ba55c7714c1a84c0f5251fdcc7782ba47ce4b Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 28 Nov 2023 13:37:51 -0500
Subject: [PATCH 20/20] Avoid deleting Natspec to avoid mixing then up with
 different nodes

---
 .../core/src/utils/make-namespaced.test.ts.md |  38 +++++++++++++-----
 .../src/utils/make-namespaced.test.ts.snap    | Bin 1337 -> 1450 bytes
 packages/core/src/utils/make-namespaced.ts    |  21 +++-------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/packages/core/src/utils/make-namespaced.test.ts.md b/packages/core/src/utils/make-namespaced.test.ts.md
index 1ce5813de..fc7020329 100644
--- a/packages/core/src/utils/make-namespaced.test.ts.md
+++ b/packages/core/src/utils/make-namespaced.test.ts.md
@@ -45,13 +45,13 @@ Generated by [AVA](https://avajs.dev).
                   uint256 b;␊
               } SecondaryStorage $SecondaryStorage_random;␊
           ␊
-              ␊
+              /// @notice some natspec␊
               enum $astId_id_random { dummy }␊
           ␊
-              ␊
+              /// @param a docs␊
               enum $astId_id_random { dummy }␊
           ␊
-              ␊
+              /// @param a docs␊
               enum $astId_id_random { dummy }␊
               struct MyStruct { uint b; }␊
           ␊
@@ -64,7 +64,7 @@ Generated by [AVA](https://avajs.dev).
           ␊
               /// @notice standlone natspec␊
           ␊
-              ␊
+              /// @notice natspec for var␊
               enum $astId_id_random { dummy }␊
           ␊
               // standalone doc␊
@@ -73,13 +73,21 @@ Generated by [AVA](https://avajs.dev).
                * standlone doc block␊
                */␊
           ␊
-              ␊
+              /**␊
+               * doc block without natspec␊
+               */␊
               enum $astId_id_random { dummy }␊
           ␊
-              ␊
+              /**␊
+               * doc block with natspec␊
+               *␊
+               * @notice some natspec␊
+               */␊
               enum $astId_id_random { dummy }␊
           ␊
-              ␊
+              /**␊
+               * @dev a custom error inside a contract␊
+               */␊
               enum $astId_id_random { dummy }␊
           }␊
           ␊
@@ -118,12 +126,19 @@ Generated by [AVA](https://avajs.dev).
            * @notice originally orphaned natspec␊
            */␊
           ␊
-          ␊
+          /**␊
+           * @dev plusThree␊
+           * @param x x␊
+           */␊
           enum plusThree { dummy }␊
           ␊
           /// @notice originally orphaned natspec 2␊
           ␊
-          ␊
+          /**␊
+           * @dev plusThree overloaded␊
+           * @param x x␊
+           * @param y y␊
+           */␊
           enum $astId_id_random { dummy }␊
           ␊
           enum originallyNoDocumentation { dummy }␊
@@ -151,7 +166,10 @@ Generated by [AVA](https://avajs.dev).
            */␊
           enum FreeEnum { MyEnum }␊
           ␊
-          ␊
+          /**␊
+           * @dev a custom error outside a contract␊
+           * @param example example parameter␊
+           */␊
           enum CustomErrorOutsideContract { dummy }␊
           `,
         },
diff --git a/packages/core/src/utils/make-namespaced.test.ts.snap b/packages/core/src/utils/make-namespaced.test.ts.snap
index 4a6bc065938f4c8e726fc65abe3791cf4edb2b00..f9bc10b39386695ead9717189196f7430e285830 100644
GIT binary patch
literal 1450
zcmV;b1y%Y%RzV<BZeeh9Xm4~Nb~6eC0Kc{d`ki#*(-reB!O$O*LCLY+P8P;A?jJWq
zY?GFAw;ziL00000000BkSIti(MHKIz85S7jW22tDR0t>_%&-{2fYIFm>yq%H4r??q
zlA7)sDCw@6R8_Mx64vNVFW!tMdRRUACwMSMJ*;O>d)LH-#Kd^==<Djw>6u}e4V&mB
z1zq)i@1x&)_4>VgwW`CdBl*$SL{a4s&&5XsG3*jq#}=^>Wpz(c$#7jBawR{!XWLle
zw@2^ijX}fznL}n_3I4wXi@^E-))VHHtLBy6>U+derWrqukB=MXh+*apa||%KC;g{^
ztLBh{*@1@-NPJM?4z;Oj8s?~Jehw02iX=)=b|5w7eu^?ExhE_lwLyOa;U8GYG>la<
zV^FTupdmB=4nV4~zQ{s{dfHwj$L^a%NXl7sG*HKa1_nMb69b2NT~U|5PlP7ra|vmT
zdkWlKAr5E)Nm^4*!)8;kDT^~Du%%>K5vj^MahUe_Hn(Z5S(4n*Y_F%-=6kYjx^*rT
zu>*E+NCVjK!um3oaY#PvyWDpG`5_A{w84G_$b&3wxDA#YF^r*+46N7|g<K{IgM{I#
zLu|dzjb*3>;W4Q<h1@TO7GP>GosA@3GG`+~t7PAKgsE_!8!nd1sPfwSTk~7gB21F`
zO&iFxMu}KK+namEy1)l6Mlwuc^zK6G#nR%!YOxr_0c|v}TXzULDI)llLE?4GlZv}5
z@CVq*JX}ibX96O^T3%eZwn74yl8Y(RTv7=SL~X;q5-^40{GUgeT6|#%HCEe>n!(X&
z3+H5NvoA2SxeNC8ZJZ?ViZ&L_w1t)Eu)CSK-OOraW*hrt_N0Tsj4Ox^#K857nUZy4
zX(C~sizcyDoAy4nLq>FhY|nL@=rkn(?l5){MmD$Pqh?Kq6JAO`oM=yg8xqmzh*%ar
z0`E-YDlHLaahpts4x3Jh6X{%;n3+NI=o<We2HmYTp#VI;81pPNYPFe})r-I1<$+ql
zqyXY@mc*(J5)x323v`S{KY9Z3Sj&fygvYb9LCVdhv;!6C&tXU^w_#%hx<l0=RPC1R
z@;NSUSU0H|krAkCPCu;H>oz%tEDi29Tx9{SrA$(r_@`m1>Py3Es>I#G@}|f1*Gymd
z-glrM>9-~H0I_^3`&I|SG~}irBx2M;gKsdnBIP)ZT-)8L?A_Se+rM4e+<A4svaz+X
zwzvC68t2fefU<<PX!Sxy^!d_joJr3m;<994nuQutcRaawho_l!vL%_z1wEh)J5CcG
z>xY;@dl@IPf7v3upO{+QAw)-?1SPeB8XB1B^8qayQzhdZb!f4RGQ^LGa5%P!-KIC%
zHBmFM;ymAJKw`xXU*{IYkE!6}*}+kPf*R-kx|ov8mEdBX3crawCh`(<Ffvfj2ng$E
z>_G(-;fAt9BB=5!S=ijf&J6%z3xUIJ7$cl|?T93Z@&pUF<>Z=f_zx%Wh13tHtr5)B
zF{sRKg)CMSejelh`jjXl5`Al0*oH4_HxRWJ`8n~+h5E%Gjfd|Sscy^BNte<y7u~tJ
zB!TD7G5r+P1bAqo)Map(=-8tA?+FvZQ=^9QG_1MNOmjZasX2$<`jyeRw>I>FJ=)rA
zL%07i9DN!I9JnC_ZYED-V`Cch4FJB)fCgJYMIDC6{V>ED@{rG+DI;MUyM>#OCgI%M
zKph8PXq~_@7FsARx6i<ZssF+Z{BxHXIDZC&zhFJqbN<cE0c5fF>>C93sQXO&nb~8e
z4aTnTQ?O@y4yOyt@mTshFrL90>OGcD0pz*fW9iEPS?@8HUf#TUE8q9L`CH%h19G*r
z1U>!#s29`0mEfEvtWWY6tT12YGZp5id|QS21CIX8_oy&t!7v63kE+7_3w=36U1Jjf
E02F`9CIA2c

literal 1337
zcmV-91;+Y8RzV<BZeeh9Xm4~Nb~6eC0QL;jYf04?BWDbmysT2lFj0q9s<$yPr5@gg
zSF8t<%pZ#g00000000BkS5I#vH58vo(m$KFq$~IUR@Fiq+9Vr9i&})J+U~Ye{{YD%
zK#0njaaxlZJF-2cp=uEv`2YwcI4pb$4hR7U_QZkHo&gE85)$IXkvGmvGMTiU26Y9D
z<iz&-z31omp6&PU)oTv78uEkBiK5COo{Jj<G3*lA#1^p;Wlc{}$#7F1awXrtXWLle
z*C&S4#)#p6=BSxjg#YKE5oqs0d)yqpX%6qz-X@kZ%}#f6a?&s-3^Q$*Il!cz@Owiy
z%~1!l0}mgN&P0Vf)TXLsn2(v}#~`sokwhuV4y2}hAEAs$?g@)Xt<ax9_zM~`4P(WO
zDU|9}Xw*!<36L7JPvX$gMBTIG$bFRvNjVFrhMHK=wt^4Lu7WpsQ&E?`ON1t+Q(aPy
zdkV~4Ar7nrlJrU`4a-MhGZtq`U`xrOB2pE1J8r7-9d6Tlt01|f*<OyYEhMsSxlJw<
zvD@rmkYiv!gZ61EW{`B;cBwA`@^u`R>4W_UkOy(tjXv1wm|@%*i@~yeUP#5fFhUrv
zImFiER4zu%2#-lU$fWKYT7apoG&kP0l9>+)y^?+75vGE1YIC$$M3tA;Ut8Fw7GaVs
zY}r7jbxOoC+S#gRn*txW7|9@n(Oad$bA@tgC7TWXfHsb?+jIyz$s+iQAn`@ZlZv~`
z@B{2*0S+bhBLNX%EtN~RmPwnX;9|-&msG+7Q9CfMw3z~N{^wDq%FiyM<CVUtR(tBS
zhjThI*cX`D+y#9HR!$PwqK!o>s$nIZyjV@#uVyV&vyXi`KGUnP{vphB(KME7%igDU
z06-_m_FT7xP9F&}>J(5-cTV(vU^Ag4ux5i;7H+^EXK{@d2(!3NW`k|dc8OC_k5A3b
zp#^jcexF2VwH6%XXUZL((s8{$H@9;2?OY#7M+f5yjsol*AP#5#^PyyuSc6&_WN8^#
z3$b}1pqS6Mqaz<#0;ov8Tmh;0FFXG<a=JIMyzMc4k?UAb4xB-x-<9zEb>vey@Nytb
zLv9N~LPjmL{rqqdHGoF0?d?{otGm_xyOpioJNuQ5?TxkS-YZd@Lu&#~B-*C6D=9JH
zrq?)=o=e1a$-XuXHKgfyvic5>GV7qtcg_YE^nfz#I4$Tl4>5zxDm*1Rcq4)i!7n|c
zB4_LpIj9^;xolG!(3P^w*SQ6TWvYFlpR)r<X0VIuocm2Ho480UR=HTG!cT0Dh`h$&
z2o=<ME5f>uJ#`2H+#XPNNCZ{>RS`V6dfFyO0U&tRa4-yPj3e6)NrEU(uwYp1o}UfB
za{~9h?wp1mSkr<xgy3S&Q<B<bEi_4Y3s*`vzA^rJx<PeThfXdyzVl(+&UfQ({u0$s
zQC)x!rV1D2om1y#IQ~8%p{zot^#-)Ycr3RYIxn|_)a<OAni+cHi&(A($>M#O`XLlJ
zv?>H{b$hv7PJ?~|z;7|oNDnBh-7xOEp|e67LhpRaM34n-;}&G?LD_VS&aIo^%?86*
zs8m?$FQGCs|Ai9jy9-LF^g|&00c|X?d`is&q?}wjwH@2IxFq_>Oel%kS^HNJ*i(tM
zO=+o9)%*gC521}FS2Z&Lc{;hOc>y5n302MYl`EU+fy<Sj2fjZbRtt-eO#YAZ8SPvN
v#%V$OFnz@v=CgF{hWR$#cf<S&Q@^JZZWuFT7$ccSb;JA(dLGdjq7eW9MoxD}

diff --git a/packages/core/src/utils/make-namespaced.ts b/packages/core/src/utils/make-namespaced.ts
index b8a328d6d..d6481f4dd 100644
--- a/packages/core/src/utils/make-namespaced.ts
+++ b/packages/core/src/utils/make-namespaced.ts
@@ -66,10 +66,6 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
               case 'ModifierDefinition':
               case 'UsingForDirective':
               case 'VariableDeclaration': {
-                if ('documentation' in contractNode && contractNode.documentation) {
-                  // Delete documentation for efficiency reasons only
-                  modifications.push(makeDelete(contractNode.documentation, orig));
-                }
                 // Replace with an enum based on astId (the original name is not needed, since nothing should reference it)
                 modifications.push(makeReplace(contractNode, orig, toDummyEnumWithAstId(contractNode.id)));
                 break;
@@ -97,30 +93,23 @@ export function makeNamespacedInput(input: SolcInput, output: SolcOutput): SolcI
           }
           break;
         }
+
         // - UsingForDirective isn't needed, but it might have NatSpec documentation which is not included in the AST.
         //   We convert it to a dummy enum to avoid orphaning any possible documentation.
-        case 'UsingForDirective': {
-          modifications.push(makeReplace(node, orig, toDummyEnumWithAstId(node.id)));
-          break;
-        }
         // - ErrorDefinition, FunctionDefinition, and VariableDeclaration might be imported by other files, so they cannot be deleted.
         //   However, we need to remove their values to avoid referencing other deleted nodes.
         //   We do this by converting them to dummy enums, but avoiding duplicate names.
+        case 'UsingForDirective':
         case 'ErrorDefinition':
         case 'FunctionDefinition':
         case 'VariableDeclaration': {
-          if (node.documentation) {
-            // Delete documentation for efficiency reasons only
-            modifications.push(makeDelete(node.documentation, orig));
-          }
           // If an identifier with the same name was not previously written, replace with a dummy enum using its name.
           // Otherwise replace with an enum based on astId to avoid duplicate names, which can happen if there was overloading.
           // This does not need to check all identifiers from the original contract, since the original compilation
           // should have failed if there were conflicts in the first place.
-          const name = node.name;
-          if (!replacedIdentifiers.has(name)) {
-            modifications.push(makeReplace(node, orig, toDummyEnumWithName(name)));
-            replacedIdentifiers.add(name);
+          if ('name' in node && !replacedIdentifiers.has(node.name)) {
+            modifications.push(makeReplace(node, orig, toDummyEnumWithName(node.name)));
+            replacedIdentifiers.add(node.name);
           } else {
             modifications.push(makeReplace(node, orig, toDummyEnumWithAstId(node.id)));
           }