From 0d78880f9e75fe9a5861d45b060362c77dcee78d Mon Sep 17 00:00:00 2001
From: Yuka Ikarashi <yukatkh@gmail.com>
Date: Mon, 6 Jan 2025 12:54:14 -0500
Subject: [PATCH] fix

---
 src/exo/frontend/typecheck.py        |  4 +---
 src/exo/rewrite/new_analysis_core.py | 13 ++++---------
 tests/test_analysis.py               |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/exo/frontend/typecheck.py b/src/exo/frontend/typecheck.py
index e28767b8..b0f96c94 100644
--- a/src/exo/frontend/typecheck.py
+++ b/src/exo/frontend/typecheck.py
@@ -599,9 +599,7 @@ def check_e(self, e, is_index=False):
                 )
                 ftyp = T.err
             else:
-                ftyp = e.config.lookup(e.field)[1]
-
-            ftyp = e.config.lookup_type(e.field)
+                ftyp = e.config.lookup_type(e.field)
 
             return LoopIR.ReadConfig(e.config, e.field, ftyp, e.srcinfo)
         else:
diff --git a/src/exo/rewrite/new_analysis_core.py b/src/exo/rewrite/new_analysis_core.py
index 4f49bf7a..11ed09da 100644
--- a/src/exo/rewrite/new_analysis_core.py
+++ b/src/exo/rewrite/new_analysis_core.py
@@ -68,23 +68,18 @@ def __new__(cls, op):
             | Not( expr arg )
             | USub( expr arg )
             | Const( object val )
+            | ConstSym( sym name ) -- represents a named, opaque value
             | BinOp( binop op, expr lhs, expr rhs )
             | Stride( sym name, int dim )
-
-
-            -- following might not be necessary at some point
-            | Definitely( expr arg )
-            | Maybe( expr arg )
-            | Tuple( expr* args )
-            | ConstSym( sym name ) -- represents a named, opaque value
-            | Select( expr lhs, expr rhs ) -- !!uninterpreted function for array access, different from Select Below
             | LetStrides( sym name, expr* strides, expr body )
             | Select( expr cond, expr tcase, expr fcase )
             | ForAll( sym name, expr arg )
             | Exists( sym name, expr arg )
+            | Definitely( expr arg )
+            | Maybe( expr arg )
+            | Tuple( expr* args )
             | LetTuple( sym* names, expr rhs, expr body )
             | Let( sym* names, expr* rhs, expr body )
-
             attributes( type type, srcinfo srcinfo )
 } """,
     {
diff --git a/tests/test_analysis.py b/tests/test_analysis.py
index 95e0cdaf..6b78b9c8 100644
--- a/tests/test_analysis.py
+++ b/tests/test_analysis.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from exo.rewrite.new_eff import *
+from exo.rewrite.analysis import *
 
 from exo import proc, config, DRAM, SchedulingError
 from exo.stdlib.scheduling import *