Make mkList take a Position argument

Author: krame505

src/comp/CSyntaxUtil.hs

@@ -63,9 +63,9 @@ mkMaybe :: (Maybe CExpr) -> CExpr
 mkMaybe Nothing = CCon idInvalid []
 mkMaybe (Just e) = CCon idValid [e]
 
-mkList :: [CExpr] -> CExpr
-mkList [] = CCon (idNil noPosition) []
-mkList (e:es) = CCon (idCons $ getPosition e) [e, mkList es]
+mkList :: Position -> [CExpr] -> CExpr
+mkList pos [] = CCon (idNil pos) []
+mkList pos (e:es) = CCon (idCons pos) [e, mkList pos es]
 
 num_to_cliteral_at :: Integral n => Position -> n -> CLiteral
 num_to_cliteral_at pos num = CLiteral pos $ LInt $ ilDec (toInteger num)

src/comp/GenWrap.hs

@@ -1107,7 +1107,7 @@ genTo pps ty mk =
                    localPrefix1 = fromMaybe (getIdBaseString f) (lookupPrefixIfcPragma ciPrags)
                    localPrefix = joinStrings_  currentPre localPrefix1
                    prefix = stringLiteralAt noPosition localPrefix
-                   arg_names = mkList [stringLiteralAt (getPosition i) (getIdString i) | i <- aIds]
+                   arg_names = mkList (getPosition f) [stringLiteralAt (getPosition i) (getIdString i) | i <- aIds]
                    fnp = mkProxy $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f)(getIdPosition f)
                -- XXX idEmpty is a horrible way to know no more selection is required
                let ec = if f == idEmpty then sel else CSelect sel (setInternal f)
@@ -2204,7 +2204,7 @@ mkFieldSavePortTypeStmts v ifcId = concatMapM $ meth noPrefixes ifcId
               let fproxy = mkProxy $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
                   proxy = mkProxy $ foldr arrow r as
                   prefix = stringLiteralAt noPosition localPrefix
-                  arg_names = mkList [stringLiteralAt (getPosition i) (getIdString i) | i <- aIds]
+                  arg_names = mkList (getPosition f) [stringLiteralAt (getPosition i) (getIdString i) | i <- aIds]
                   result = stringLiteralAt noPosition resultName
               return [
                 CSExpr Nothing $