@@ -73,30 +73,30 @@ expression (A region expr) =
74 Access e field ->
74 Access e field ->
75 do e' <- expression e
75 do e' <- expression e
76− return $ DotRef () e' (var (varName field))
76+ return $ DotRef () e' (var (Var.varName field))
78 Remove e field ->
78 Remove e field ->
79 do e' <- expression e
79 do e' <- expression e
80− return $ _Utils "remove" `call` [ string (varName field), e' ]
80+ return $ _Utils "remove" `call` [ string (Var.varName field), e' ]
82 Insert e field value ->
82 Insert e field value ->
83 do value' <- expression value
83 do value' <- expression value
84 e' <- expression e
84 e' <- expression e
85− return $ _Utils "insert" `call` [ string (varName field), value', e' ]
85+ return $ _Utils "insert" `call` [ string (Var.varName field), value', e' ]
87 Modify e fields ->
87 Modify e fields ->
88 do e' <- expression e
88 do e' <- expression e
89 fields' <-
89 fields' <-
90 forM fields $ \(field, value) ->
90 forM fields $ \(field, value) ->
91 do value' <- expression value
91 do value' <- expression value
92− return $ ArrayLit () [ string (varName field), value' ]
92+ return $ ArrayLit () [ string (Var.varName field), value' ]
94 return $ _Utils "replace" `call` [ArrayLit () fields', e']
94 return $ _Utils "replace" `call` [ArrayLit () fields', e']
96 Record fields ->
96 Record fields ->
97 do fields' <-
97 do fields' <-
98 forM fields $ \(field, e) ->
98 forM fields $ \(field, e) ->
99− (,) (varName field) <$> expression e
99+ (,) (Var.varName field) <$> expression e
101 let fieldMap =
101 let fieldMap =
102 List.foldl' combine Map.empty fields'
102 List.foldl' combine Map.empty fields'