HPCC-17018 Update function names following review

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

ecl/hql/hqlfold.cpp

@@ -4859,8 +4859,11 @@ IHqlExpression * NullFolderMixin::queryOptimizeAggregateInline(IHqlExpression *
 
 //---------------------------------------------------------------------------
 
-IHqlExpression * getLowerCaseConstant(IHqlExpression * expr)
+static IHqlExpression * getLowerCaseConstant(IHqlExpression * expr)
 {
+    IValue * value = expr->queryValue();
+    assertex(value);
+
     ITypeInfo * type = expr->queryType();
     switch (type->getTypeCode())
     {
@@ -4875,8 +4878,6 @@ IHqlExpression * getLowerCaseConstant(IHqlExpression * expr)
         return LINK(expr);
     }
 
-    IValue * value = expr->queryValue();
-    assertex(value);
     const void * data = value->queryValue();
     unsigned size = type->getSize();
     unsigned stringLen = type->getStringLen();
@@ -4901,6 +4902,13 @@ IHqlExpression * getLowerCaseConstant(IHqlExpression * expr)
     return createConstant(createValueFromMem(LINK(type), lower.get()));
 }
 
+
+IHqlExpression * getLowerCaseConstantExpr(IHqlExpression * expr)
+{
+    OwnedHqlExpr folded = foldHqlExpression(expr);
+    return getLowerCaseConstant(folded);
+}
+
 //---------------------------------------------------------------------------
 
 static HqlTransformerInfo constantReplacingTransformerInfo("ConstantReplacingTransformer");
@@ -7067,11 +7075,11 @@ IHqlExpression * foldExprIfConstant(IHqlExpression * expr)
 
 //---------------------------------------------------------------------------
 
-static HqlTransformerInfo lowerCaseTransformerInfo("LowerCaseTransformer");
-class LowerCaseTransformer : public NewHqlTransformer
+static HqlTransformerInfo normalizeFilenameTransformerInfo("NormalizeFilenameTransformer");
+class NormalizeFilenameTransformer : public NewHqlTransformer
 {
 public:
-    LowerCaseTransformer() : NewHqlTransformer(lowerCaseTransformerInfo) {}
+    NormalizeFilenameTransformer() : NewHqlTransformer(normalizeFilenameTransformerInfo) {}
 
     virtual IHqlExpression * createTransformed(IHqlExpression * expr)
     {
@@ -7110,11 +7118,11 @@ public:
  * string constants do not prevent a write to a file, and a subsequent read from the same file to be treated as
  * the same filenames.  It doesn't aim to be perfect, but to avoid the most common problems.
  */
-IHqlExpression * lowerCaseHqlExpr(IHqlExpression * expr)
+IHqlExpression * normalizeFilenameExpr(IHqlExpression * expr)
 {
     if (expr->getOperator() == no_constant)
         return getLowerCaseConstant(expr);
-    LowerCaseTransformer transformer;
+    NormalizeFilenameTransformer transformer;
     return transformer.transformRoot(expr);
 }
 

ecl/hql/hqlfold.hpp

@@ -55,7 +55,8 @@ extern HQLFOLD_API IHqlExpression * foldHqlExpression(IHqlExpression * expr); //
 extern HQLFOLD_API IHqlExpression * foldHqlExpression(IErrorReceiver & errorProcessor, IHqlExpression * expr, ITemplateContext *context=NULL, unsigned options=0);
 extern HQLFOLD_API IHqlExpression * foldScopedHqlExpression(IErrorReceiver & errorProcessor, IHqlExpression * dataset, IHqlExpression * expr, unsigned options=0);
 extern HQLFOLD_API void foldHqlExpression(IErrorReceiver & errorProcessor, HqlExprArray & tgt, HqlExprArray & src, unsigned options=0);
-extern HQLFOLD_API IHqlExpression * lowerCaseHqlExpr(IHqlExpression * expr);
+extern HQLFOLD_API IHqlExpression * getLowerCaseConstantExpr(IHqlExpression * expr);
+extern HQLFOLD_API IHqlExpression * normalizeFilenameExpr(IHqlExpression * expr);
 extern HQLFOLD_API IHqlExpression * foldExprIfConstant(IHqlExpression * expr);
 extern HQLFOLD_API bool queryCompareConstantValues(int & result, IHqlExpression * left, IHqlExpression * right);
 extern HQLFOLD_API IHqlExpression * foldConstantCaseExpr(IHqlExpression * expr);

ecl/hql/hqlutil.cpp

@@ -1306,7 +1306,7 @@ IHqlExpression * getNormalizedFilename(IHqlExpression * filename)
 {
     NullErrorReceiver errorProcessor;
     OwnedHqlExpr folded = foldHqlExpression(errorProcessor, filename, NULL, HFOloseannotations);
-    return lowerCaseHqlExpr(folded);
+    return normalizeFilenameExpr(folded);
 }
 
 bool canBeSlidingJoin(IHqlExpression * expr)

ecl/hqlcpp/hqlttcpp.cpp

@@ -393,7 +393,7 @@ void NewThorStoredReplacer::doAnalyse(IHqlExpression * expr)
         else if ((kind == constAtom) || (kind == storedAtom))
         {
             //assume there won't be many of these... otherwise we should use a hash table
-            OwnedHqlExpr lowerName = lowerCaseHqlExpr(expr->queryChild(1));
+            OwnedHqlExpr lowerName = getLowerCaseConstantExpr(expr->queryChild(1));
             IHqlExpression * searchExpr = lowerName->queryBody();
             IHqlExpression * newValue = expr->queryChild(2);
             //Use lowerName->queryBody() to remove named symbols/location annotations etc.
@@ -465,7 +465,7 @@ IHqlExpression * NewThorStoredReplacer::createTransformed(IHqlExpression * expr)
                 {
                 case no_stored:
                     {
-                        OwnedHqlExpr storedName = lowerCaseHqlExpr(cur.queryChild(0));
+                        OwnedHqlExpr storedName = getLowerCaseConstantExpr(cur.queryChild(0));
                         IHqlExpression * searchName = storedName->queryBody();
                         unsigned match = storedNames.find(*searchName);
                         if (match != NotFound)
@@ -482,7 +482,7 @@ IHqlExpression * NewThorStoredReplacer::createTransformed(IHqlExpression * expr)
                 case no_attr_expr:
                     if (cur.queryName() == labeledAtom)
                     {
-                        OwnedHqlExpr storedName = lowerCaseHqlExpr(cur.queryChild(0));
+                        OwnedHqlExpr storedName = getLowerCaseConstantExpr(cur.queryChild(0));
                         IHqlExpression * searchName = storedName->queryBody();
                         unsigned match = storedNames.find(*searchName);
                         if (match != NotFound)
@@ -5232,7 +5232,7 @@ IHqlExpression * GlobalAttributeInfo::createSetValue(IHqlExpression * value, IHq
 
 IHqlExpression * GlobalAttributeInfo::getStoredKey()
 {
-    return createAttribute(nameAtom, LINK(sequence), lowerCaseHqlExpr(originalLabel));
+    return createAttribute(nameAtom, LINK(sequence), getLowerCaseConstantExpr(originalLabel));
 }
 
 void GlobalAttributeInfo::setCluster(IHqlExpression * expr)
@@ -12738,7 +12738,7 @@ IHqlExpression * HqlTreeNormalizer::createTransformedBody(IHqlExpression * expr)
         {
             HqlExprArray children;
             OwnedHqlExpr name = transform(expr->queryChild(0));
-            children.append(*lowerCaseHqlExpr(name));
+            children.append(*getLowerCaseConstantExpr(name));
             return completeTransform(expr, children);
         }
     case no_merge: