Use strings for namespace disambiguation in AS3

Also cleans up memory rather than leaking it now

ANEBytecodeEditorSWC.as3proj

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project version="2">
+  <!-- Output SWF options -->
+  <output>
+    <movie outputType="CustomBuild" />
+    <movie input="" />
+    <movie path="ANEBytecodeEditor.swc" />
+    <movie fps="0" />
+    <movie width="0" />
+    <movie height="0" />
+    <movie version="17" />
+    <movie minorVersion="0" />
+    <movie platform="AIR" />
+    <movie background="#FFFFFF" />
+  </output>
+  <!-- Other classes to be compiled into your SWF -->
+  <classpaths>
+    <class path="src" />
+  </classpaths>
+  <!-- Build options -->
+  <build>
+    <option accessible="False" />
+    <option advancedTelemetry="False" />
+    <option allowSourcePathOverlap="False" />
+    <option benchmark="False" />
+    <option es="False" />
+    <option inline="False" />
+    <option locale="" />
+    <option loadConfig="" />
+    <option optimize="True" />
+    <option omitTraces="True" />
+    <option showActionScriptWarnings="True" />
+    <option showBindingWarnings="True" />
+    <option showInvalidCSS="True" />
+    <option showDeprecationWarnings="True" />
+    <option showUnusedTypeSelectorWarnings="True" />
+    <option strict="True" />
+    <option useNetwork="True" />
+    <option useResourceBundleMetadata="True" />
+    <option warnings="True" />
+    <option verboseStackTraces="False" />
+    <option linkReport="" />
+    <option loadExterns="" />
+    <option staticLinkRSL="True" />
+    <option additional="-swf-version=11&#xA;--" />
+    <option compilerConstants="" />
+    <option minorVersion="" />
+  </build>
+  <!-- SWC Include Libraries -->
+  <includeLibraries>
+    <!-- example: <element path="..." /> -->
+  </includeLibraries>
+  <!-- SWC Libraries -->
+  <libraryPaths>
+    <!-- example: <element path="..." /> -->
+  </libraryPaths>
+  <!-- External Libraries -->
+  <externalLibraryPaths>
+    <!-- example: <element path="..." /> -->
+  </externalLibraryPaths>
+  <!-- Runtime Shared Libraries -->
+  <rslPaths>
+    <!-- example: <element path="..." /> -->
+  </rslPaths>
+  <!-- Intrinsic Libraries -->
+  <intrinsics>
+    <!-- example: <element path="..." /> -->
+  </intrinsics>
+  <!-- Assets to embed into the output SWF -->
+  <library>
+    <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
+  </library>
+  <!-- Class files to compile (other referenced classes will automatically be included) -->
+  <compileTargets>
+    <!-- example: <compile path="..." /> -->
+  </compileTargets>
+  <!-- Paths to exclude from the Project Explorer tree -->
+  <hiddenPaths>
+    <hidden path="obj" />
+  </hiddenPaths>
+  <!-- Executed before build -->
+  <preBuildCommand>"$(BaseDir)\Tools\swcbuild\swcbuild.exe" "$(ProjectPath)" "-compiler=$(CompilerPath)" "-debug=$(BuildConfig)" "-library=C:\Program Files (x86)\FlashDevelop\Library" -asdoc=true -keep-asdoc=false</preBuildCommand>
+  <!-- Executed after build -->
+  <postBuildCommand alwaysRun="False" />
+  <!-- Other project options -->
+  <options>
+    <option showHiddenPaths="False" />
+    <option testMovie="Unknown" />
+    <option testMovieCommand="" />
+  </options>
+  <!-- Plugin storage -->
+  <storage />
+</project>

AS3/src/com/cff/anebe/ir/ASNamespace.as

@@ -12,8 +12,8 @@ package com.cff.anebe.ir
         /** Namespace name. */
         public var name:String;
 
-        /** If there are multiple namespaces with the same name, disambiguates them. This should only very rarely be non-zero. */
-        public var id:int = 0;
+        /** If there are multiple namespaces with the same name, disambiguates them. This should only very rarely be non-null. */
+        public var secondaryName:String;
 
         /** Type string for private namespaces */
         public static const TYPE_PRIVATE:String = "PrivateNamespace";
@@ -40,13 +40,13 @@ package com.cff.anebe.ir
          * Builds an ASNamespace from scratch. Should probably not be used; see instead helper functions in the package com.cff.anebe.ir.namespaces
          * @param type Namespace type
          * @param name Namespace name
-         * @param id Disambiguation ID
+         * @param secondaryName Namespace secondary name, if disambiguation is required
          */
-        public function ASNamespace(type:String, name:String, id:int = 0)
+        public function ASNamespace(type:String, name:String, secondaryName:String = null)
         {
             this.type = type;
             this.name = name;
-            this.id = id;
+            this.secondaryName = secondaryName;
         }
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/ExplicitNamespace.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents an ExplicitNamespace
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function ExplicitNamespace(name:String, id:int = 0):ASNamespace
+    public function ExplicitNamespace(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_EXPLICIT, name, id);
+        return new ASNamespace(ASNamespace.TYPE_EXPLICIT, name, disambiguator);
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/NormalNamespace.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents a Namespace
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function NormalNamespace(name:String, id:int = 0):ASNamespace
+    public function NormalNamespace(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_NORMAL, name, id);
+        return new ASNamespace(ASNamespace.TYPE_NORMAL, name, disambiguator);
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/PackageInternalNs.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents a PackageInternalNs
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function PackageInternalNs(name:String, id:int = 0):ASNamespace
+    public function PackageInternalNs(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_PACKAGEINTERNAL, name, id);
+        return new ASNamespace(ASNamespace.TYPE_PACKAGEINTERNAL, name, disambiguator);
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/PackageNamespace.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents a PackageNamespace
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function PackageNamespace(name:String, id:int = 0):ASNamespace
+    public function PackageNamespace(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_PACKAGE, name, id);
+        return new ASNamespace(ASNamespace.TYPE_PACKAGE, name, disambiguator);
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/PrivateNamespace.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents an PrivateNamespace
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function PrivateNamespace(name:String, id:int = 0):ASNamespace
+    public function PrivateNamespace(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_PRIVATE, name, id);
+        return new ASNamespace(ASNamespace.TYPE_PRIVATE, name, disambiguator);
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/ProtectedNamespace.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents a ProtectedNamespace
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function ProtectedNamespace(name:String, id:int = 0):ASNamespace
+    public function ProtectedNamespace(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_PROTECTED, name, id);
+        return new ASNamespace(ASNamespace.TYPE_PROTECTED, name, disambiguator);
     }
 }

AS3/src/com/cff/anebe/ir/namespaces/StaticProtectedNs.as

@@ -5,11 +5,11 @@ package com.cff.anebe.ir.namespaces
     /**
      * Builds an ASNamespace that represents a StaticProtectedNs
      * @param name Name of the namespace
-     * @param id If there are multiple of the same namespace name and type, disambiguates between them; should almost always be zero
+     * @param disambiguator If there are multiple of the same namespace name and type, disambiguates between them; should almost always be null
      * @return Built ASNamespace
      */
-    public function StaticProtectedNs(name:String, id:int = 0):ASNamespace
+    public function StaticProtectedNs(name:String, disambiguator:String = null):ASNamespace
     {
-        return new ASNamespace(ASNamespace.TYPE_STATICPROTECTED, name, id);
+        return new ASNamespace(ASNamespace.TYPE_STATICPROTECTED, name, disambiguator);
     }
 }

Native/BytecodeEditor/BytecodeEditor.vcxproj

@@ -160,8 +160,10 @@
     <ClInclude Include="include\enums\TraitAttribute.hpp" />
     <ClInclude Include="include\enums\TraitKind.hpp" />
     <ClInclude Include="include\SWF\SWFFile.hpp" />
+    <ClInclude Include="include\utils\ANEFunctionContext.hpp" />
     <ClInclude Include="include\utils\ANEUtils.hpp" />
     <ClInclude Include="include\utils\BidirectionalMap.hpp" />
+    <ClInclude Include="include\utils\generic_hash.hpp" />
     <ClInclude Include="include\utils\RefBuilder.hpp" />
     <ClInclude Include="include\utils\SmallTrivialVector.hpp" />
     <ClInclude Include="include\utils\StringBuilder.hpp" />

Native/BytecodeEditor/include/ABC/ABCFile.hpp

@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <string>
 
-namespace ABC
+namespace SWFABC
 {
     struct ABCFile
     {

Native/BytecodeEditor/include/ABC/ABCReader.hpp

@@ -32,7 +32,7 @@
 #include <stdint.h>
 #include <string>
 
-namespace ABC
+namespace SWFABC
 {
     class ABCReader
     {

Native/BytecodeEditor/include/ABC/ABCWriter.hpp

@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <string>
 
-namespace ABC
+namespace SWFABC
 {
     class ABCWriter
     {

Native/BytecodeEditor/include/ABC/Class.hpp

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct Class
     {

Native/BytecodeEditor/include/ABC/Error.hpp

@@ -3,7 +3,7 @@
 #include "ABC/Label.hpp"
 #include <string>
 
-namespace ABC
+namespace SWFABC
 {
     struct Error
     {

Native/BytecodeEditor/include/ABC/ExceptionInfo.hpp

@@ -3,7 +3,7 @@
 #include "ABC/Label.hpp"
 #include <stdint.h>
 
-namespace ABC
+namespace SWFABC
 {
     struct ExceptionInfo
     {

Native/BytecodeEditor/include/ABC/Instance.hpp

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct Instance
     {

Native/BytecodeEditor/include/ABC/Instruction.hpp

@@ -6,7 +6,7 @@
 #include <variant>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct Instruction
     {

Native/BytecodeEditor/include/ABC/Label.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <stdint.h>
 #include <compare>
+#include <stdint.h>
 
-namespace ABC
+namespace SWFABC
 {
     struct Label
     {

Native/BytecodeEditor/include/ABC/Metadata.hpp

@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct Metadata
     {

Native/BytecodeEditor/include/ABC/MethodBody.hpp

@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct MethodBody
     {

Native/BytecodeEditor/include/ABC/MethodInfo.hpp

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct MethodInfo
     {

Native/BytecodeEditor/include/ABC/Multiname.hpp

@@ -5,7 +5,7 @@
 #include <variant>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct Multiname
     {

Native/BytecodeEditor/include/ABC/Namespace.hpp

@@ -3,7 +3,7 @@
 #include "enums/ABCType.hpp"
 #include <stdint.h>
 
-namespace ABC
+namespace SWFABC
 {
     struct Namespace
     {

Native/BytecodeEditor/include/ABC/OptionDetail.hpp

@@ -3,7 +3,7 @@
 #include "enums/ABCType.hpp"
 #include <stdint.h>
 
-namespace ABC
+namespace SWFABC
 {
     struct OptionDetail
     {

Native/BytecodeEditor/include/ABC/Script.hpp

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct Script
     {

Native/BytecodeEditor/include/ABC/TraitsInfo.hpp

@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <vector>
 
-namespace ABC
+namespace SWFABC
 {
     struct TraitsInfo
     {