From 03bbf81d36216153817bf9b555ef7a596ec0c230 Mon Sep 17 00:00:00 2001
From: vidsinghal <vidush.sl@gmail.com>
Date: Mon, 7 Oct 2024 16:21:54 -0400
Subject: [PATCH] edit

---
 gibbon-compiler/src/Gibbon/Common.hs    | 13 ++++++++-----
 gibbon-compiler/src/Gibbon/L2/Syntax.hs |  4 ----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gibbon-compiler/src/Gibbon/Common.hs b/gibbon-compiler/src/Gibbon/Common.hs
index a14f2d27..a1f3b1a2 100644
--- a/gibbon-compiler/src/Gibbon/Common.hs
+++ b/gibbon-compiler/src/Gibbon/Common.hs
@@ -129,13 +129,16 @@ toEndV = varAppend "end_"
 toSeqV :: Var -> Var
 toSeqV v = varAppend v (toVar "_seq")
 
--- | Abstract location variables.
--- type LocVar = Var
-
 -- | A location variable stores the abstract location. 
 -- | the second element stores locs for fields if factored out for an SoA optimization. 
--- | If the list is empty it signifies a single location per type. 
-type LocVar = (Var, [((String, Int), Var)])
+-- | If the list is empty it signifies a single location per type (AoS).
+-- | For each packed type, there is a data constructor, and corresponding fields.  
+-- | LocVar = (Location of Data Constructor buffer,   
+--                              [((Name of Constructor from, Field Index), Location of field buffer)])
+
+type FieldIndex = Int 
+type DataConstructorName = String 
+type LocVar = (Var, [((DataConstructorName, FieldIndex), Var)])
 
 -- | Abstract region variables.
 type RegVar = Var
diff --git a/gibbon-compiler/src/Gibbon/L2/Syntax.hs b/gibbon-compiler/src/Gibbon/L2/Syntax.hs
index ed3d5952..79142418 100644
--- a/gibbon-compiler/src/Gibbon/L2/Syntax.hs
+++ b/gibbon-compiler/src/Gibbon/L2/Syntax.hs
@@ -103,10 +103,6 @@ type Exp2 = E2 LocVar Ty2
 -- | L1 Types extended with abstract Locations.
 type Ty2 = UrTy LocVar
 
---type Ty2SoA = UrTy [LocVar]
-
---instance Out Ty2SoA
-
 --------------------------------------------------------------------------------
 
 -- | Shorthand for recursions.