Use instruction references instead of labels

Allows editing methods without having to edit every single label-bearing instruction

Author: piepie62

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

@@ -7,22 +7,14 @@ package com.cff.anebe.ir
     public class ASError
     {
         /** The instruction at which this error occurred */
-        public var loc:ASLabel;
+        public var loc:ASInstruction;
 
         /** The message that the assembler gave for this error */
         public var message:String;
 
-        public function ASError(loc:ASLabel = null, message:String = "")
+        public function ASError(loc:ASInstruction, message:String = "")
         {
-            if (loc != null)
-            {
-                this.loc = loc;
-            }
-            else
-            {
-                this.loc = new ASLabel(0, 0);
-            }
-
+            this.loc = loc;
             this.message = message;
         }
     }

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

@@ -7,13 +7,13 @@ package com.cff.anebe.ir
     public class ASException
     {
         /** The instruction where the exception catch range starts */
-        public var from:ASLabel;
+        public var from:ASInstruction;
 
         /** The instruction where the exception catch range stops */
-        public var to:ASLabel;
+        public var to:ASInstruction;
 
         /** The target instruction for the catch block */
-        public var target:ASLabel;
+        public var target:ASInstruction;
 
         /** The type of the exception caught by this handler. Null means the any type. */
         public var exceptionType:ASMultiname;
@@ -29,35 +29,11 @@ package com.cff.anebe.ir
          * @param exceptionType The type of the exception caught by this handler. Null is interpreted as the any type
          * @param exceptionName The name of the variable the exception will be assigned to for this catch block. Null is interpreted as no name
          */
-        public function ASException(from:ASLabel = null, to:ASLabel = null, target:ASLabel = null, exceptionType:ASMultiname = null, exceptionName:ASMultiname = null)
+        public function ASException(from:ASInstruction, to:ASInstruction, target:ASInstruction, exceptionType:ASMultiname = null, exceptionName:ASMultiname = null)
         {
-            if (from != null)
-            {
-                this.from = from;
-            }
-            else
-            {
-                this.from = new ASLabel(0, 0);
-            }
-
-            if (to != null)
-            {
-                this.to = to;
-            }
-            else
-            {
-                this.to = new ASLabel(0, 0);
-            }
-
-            if (target != null)
-            {
-                this.target = target;
-            }
-            else
-            {
-                this.target = new ASLabel(0, 0);
-            }
-
+            this.from = from;
+            this.to = to;
+            this.target = target;
             this.exceptionType = exceptionType;
             this.exceptionName = exceptionName;
         }

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

@@ -10,8 +10,10 @@ package com.cff.anebe.ir
         public var opcode:String;
 
         /**
-         * A list of the arguments this instruction takes. The exact format of each OPCode is not currently listed here,
-         * but the valid types inside this array are int, uint, Number, String, ASNamespace, ASMultiname, ASClass, ASMethod, ASLabel, or Vector.<ASLabel>.
+         * A list of the arguments this instruction takes.
+         * The exact format of each OPCode is not currently listed here, but the valid types inside this array are int, uint,
+         * Number, String, ASNamespace, ASMultiname, ASClass, ASMethod, ASInstruction, or Vector.<ASInstruction>.
+         * Any ASInstruction contained in this array must be a reference to an instruction in the body of the method in which this instruction appears.
          */
         public var args:Array;
 

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

@@ -176,14 +176,14 @@ std::shared_ptr<ASASM::Method> ConvertMethod(FREObject o);
 FREObject ConvertMethod(const ASASM::Method& m);
 ASASM::MethodBody ConvertMethodBody(FREObject o);
 FREObject ConvertMethodBody(const ASASM::MethodBody& b);
-ASASM::Exception ConvertException(FREObject o);
-FREObject ConvertException(const ASASM::Exception& e);
-ABC::Error ConvertError(FREObject o);
-FREObject ConvertError(const ABC::Error& e);
-ABC::Label ConvertLabel(FREObject o);
-FREObject ConvertLabel(const ABC::Label& l);
-ASASM::Instruction ConvertInstruction(FREObject o);
-FREObject ConvertInstruction(const ASASM::Instruction& i);
+ASASM::Exception ConvertException(FREObject o, const std::vector<FREObject>& allInstrs);
+FREObject ConvertException(const ASASM::Exception& e, const std::vector<FREObject>& allInstrs);
+ABC::Error ConvertError(FREObject o, const std::vector<FREObject>& allInstrs);
+FREObject ConvertError(const ABC::Error& e, const std::vector<FREObject>& allInstrs);
+ABC::Label ConvertLabel(FREObject o, const std::vector<FREObject>& allInstrs);
+FREObject ConvertLabel(const ABC::Label& l, const std::vector<FREObject>& allInstrs);
+ASASM::Instruction ConvertInstruction(FREObject o, const std::vector<FREObject>& allInstrs);
+std::pair<FREObject, bool> ConvertInstruction(const ASASM::Instruction& i);
 ASASM::Value ConvertValue(FREObject o);
 FREObject ConvertValue(const ASASM::Value& v);