|
16 | 16 |
|
17 | 17 | from .. import finch_assembly as asm |
18 | 18 | from ..algebra import query_property, register_property |
19 | | -from ..finch_assembly import AssemblyStructFType, BufferFType, MapFType, TupleFType |
| 19 | +from ..finch_assembly import AssemblyStructFType, BufferFType, DictFType, TupleFType |
20 | 20 | from ..symbolic import Context, Namespace, ScopedDict, fisinstance, ftype |
21 | 21 | from ..util import config |
22 | 22 | from ..util.cache import file_cache |
@@ -817,15 +817,15 @@ def __call__(self, prgm: asm.AssemblyNode): |
817 | 817 | case asm.Length(buf): |
818 | 818 | buf = self.resolve(buf) |
819 | 819 | return buf.result_format.c_length(self, buf) |
820 | | - case asm.LoadMap(map, idx): |
| 820 | + case asm.LoadDict(map, idx): |
821 | 821 | map = self.resolve(map) |
822 | | - return map.result_format.c_loadmap(self, map, idx) |
823 | | - case asm.ExistsMap(map, idx): |
| 822 | + return map.result_format.c_loaddict(self, map, idx) |
| 823 | + case asm.ExistsDict(map, idx): |
824 | 824 | map = self.resolve(map) |
825 | | - return map.result_format.c_existsmap(self, map, idx) |
826 | | - case asm.StoreMap(map, idx, val): |
| 825 | + return map.result_format.c_existsdict(self, map, idx) |
| 826 | + case asm.StoreDict(map, idx, val): |
827 | 827 | map = self.resolve(map) |
828 | | - return map.result_format.c_storemap(self, map, idx, val) |
| 828 | + return map.result_format.c_storedict(self, map, idx, val) |
829 | 829 | case asm.Block(bodies): |
830 | 830 | ctx_2 = self.block() |
831 | 831 | for body in bodies: |
@@ -970,28 +970,28 @@ def construct_from_c(self, res): |
970 | 970 | """ |
971 | 971 |
|
972 | 972 |
|
973 | | -class CMapFType(MapFType, CArgumentFType, ABC): |
| 973 | +class CDictFType(DictFType, CArgumentFType, ABC): |
974 | 974 | """ |
975 | | - Abstract base class for the ftype of datastructures. The ftype defines how |
| 975 | + Abstract base class for the ftype of dictionaries. The ftype defines how |
976 | 976 | the data in a Map is organized and accessed. |
977 | 977 | """ |
978 | 978 |
|
979 | 979 | @abstractmethod |
980 | | - def c_existsmap(self, ctx, map, idx): |
| 980 | + def c_existsdict(self, ctx, map, idx): |
981 | 981 | """ |
982 | 982 | Return C code which checks whether a given key exists in a map. |
983 | 983 | """ |
984 | 984 | ... |
985 | 985 |
|
986 | 986 | @abstractmethod |
987 | | - def c_loadmap(self, ctx, map, idx): |
| 987 | + def c_loaddict(self, ctx, map, idx): |
988 | 988 | """ |
989 | 989 | Return C code which gets a value corresponding to a certain key. |
990 | 990 | """ |
991 | 991 | ... |
992 | 992 |
|
993 | 993 | @abstractmethod |
994 | | - def c_storemap(self, ctx, buffer, idx, value): |
| 994 | + def c_storedict(self, ctx, buffer, idx, value): |
995 | 995 | """ |
996 | 996 | Return C code which stores a certain value given a certain integer tuple key. |
997 | 997 | """ |
|
0 commit comments