mkProxy -> mkTypeProxyExpr

Author: krame505

src/comp/GenFuncWrap.hs

@@ -246,7 +246,7 @@ funcDef errh symt i oqt@(CQType _ ot) i_ n (CQType _ t) =
         -- the result is either an actionvalue or a value
         isAV = isActionValue symt r
 
-        fnp = mkProxy $ TAp (cTCon idStrArg) $ cTStr (getIdFString i) (getIdPosition i)
+        fnp = mkTypeProxyExpr $ TAp (cTCon idStrArg) $ cTStr (getIdFString i) (getIdPosition i)
         expr = cVApply id_fromWrapField [fnp, CVar i_]
     in
         -- XXX this code works for Action/ActionValue foreign funcs,

src/comp/GenWrap.hs

@@ -1108,7 +1108,7 @@ genTo pps ty mk =
                    localPrefix = joinStrings_  currentPre localPrefix1
                    prefix = stringLiteralAt noPosition localPrefix
                    arg_names = mkList (getPosition f) [stringLiteralAt (getPosition i) (getIdString i) | i <- aIds]
-                   fnp = mkProxy $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f)(getIdPosition f)
+                   fnp = mkTypeProxyExpr $ 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)
                let e = CApply (CVar id_toWrapField) [fnp, prefix, arg_names, ec]
@@ -1202,7 +1202,7 @@ genFrom pps ty var =
               let qs = if (hasNoRdy || isClock || isReset || isIot)
                        then [] else [CQFilter meth_guard]
 
-              let fnp = mkProxy $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
+              let fnp = mkTypeProxyExpr $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
               let e = CApply (CVar id_fromWrapField) [fnp, sel binf]
               return (f, e, qs)
 
@@ -1615,7 +1615,7 @@ mkFromBind true_ifc_ids var ft =
               let meth_guard = CApply eUnpack [sel wbinf]
               let qs = if (wbinf `elem` true_ifc_ids || isClock || isReset || isIot)
                        then [] else [CQFilter meth_guard]
-              let fnp = mkProxy $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
+              let fnp = mkTypeProxyExpr $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
               let e = CApply (CVar id_fromWrapField) [fnp, sel binf]
               return (f, e, qs)
 
@@ -2201,8 +2201,8 @@ mkFieldSavePortTypeStmts v ifcId = concatMapM $ meth noPrefixes ifcId
                         Just str -> joinStrings_ currentPre str
                         Nothing  -> joinStrings_ currentPre methodStr
 
-              let fproxy = mkProxy $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
-                  proxy = mkProxy $ foldr arrow r as
+              let fproxy = mkTypeProxyExpr $ TAp (cTCon idStrArg) $ cTStr (fieldPathName prefixes f) (getIdPosition f)
+                  proxy = mkTypeProxyExpr $ foldr arrow r as
                   prefix = stringLiteralAt noPosition localPrefix
                   arg_names = mkList (getPosition f) [stringLiteralAt (getPosition i) (getIdString i) | i <- aIds]
                   result = stringLiteralAt noPosition resultName

src/comp/GenWrapUtils.hs

@@ -88,7 +88,7 @@ getDefArgs dcls t =
 
 -- ====================
 
-mkProxy :: CType -> CExpr
-mkProxy ty = CHasType (CAny (getPosition ty) UNotUsed) $ CQType [] ty
+mkTypeProxyExpr :: CType -> CExpr
+mkTypeProxyExpr ty = CHasType (CAny (getPosition ty) UNotUsed) $ CQType [] ty