HPCC-10188 Rename Properties to attributes for consistency

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

common/fileview2/fvtransform.cpp

@@ -344,10 +344,10 @@ void * ViewTransformerRegistry::resolveExternal(IHqlExpression * funcdef)
 
     StringBuffer entry;
     StringBuffer lib;
-    getProperty(body, entrypointAtom, entry);
-    getProperty(body, libraryAtom, lib);
+    getAttribute(body, entrypointAtom, entry);
+    getAttribute(body, libraryAtom, lib);
     if (!lib.length())
-        getProperty(body, pluginAtom, lib);
+        getAttribute(body, pluginAtom, lib);
 
     ensureFileExtension(lib, SharedObjectExtension);
 
@@ -367,10 +367,10 @@ ViewFieldTransformer * ViewTransformerRegistry::createTransformer(IHqlExpression
 
     StringBuffer entry;
     StringBuffer lib;
-    getProperty(body, entrypointAtom, entry);
-    getProperty(body, libraryAtom, lib);
+    getAttribute(body, entrypointAtom, entry);
+    getAttribute(body, libraryAtom, lib);
     if (!lib.length())
-        getProperty(body, pluginAtom, lib);
+        getAttribute(body, pluginAtom, lib);
     if ((entry.length() == 0) || (lib.length() == 0))
         return NULL;
 

ecl/hql/hqlattr.cpp

@@ -802,7 +802,7 @@ public:
                 if (expr->hasAttribute(_linkCounted_Atom))
                 {
                     OwnedHqlExpr transformed = QuickHqlTransformer::createTransformedBody(expr);
-                    return removeProperty(transformed, _linkCounted_Atom);
+                    return removeAttribute(transformed, _linkCounted_Atom);
                 }
                 break;
             }
@@ -3527,7 +3527,7 @@ IHqlExpression * queryLocationIndependent(IHqlExpression * expr)
 }
 
 
-static void clonePropertyAsModifier(Owned<ITypeInfo> & type, IHqlExpression * donor, IAtom * attr)
+static void cloneAttributeAsModifier(Owned<ITypeInfo> & type, IHqlExpression * donor, IAtom * attr)
 {
     if (queryAttribute(type, attr))
         return;
@@ -3556,13 +3556,13 @@ ITypeInfo * preserveTypeQualifiers(ITypeInfo * ownedType, IHqlExpression * donor
     }
 
     OwnedITypeInfo type = ownedType;
-    clonePropertyAsModifier(type, field, maxLengthAtom);
-    clonePropertyAsModifier(type, field, maxSizeAtom);
-    clonePropertyAsModifier(type, field, maxCountAtom);
+    cloneAttributeAsModifier(type, field, maxLengthAtom);
+    cloneAttributeAsModifier(type, field, maxSizeAtom);
+    cloneAttributeAsModifier(type, field, maxCountAtom);
     return type.getClear();
 }
 
-static bool cloneModifierAsProperty(HqlExprArray & args, ITypeInfo * donor, IAtom * attr)
+static bool cloneModifierAsAttribute(HqlExprArray & args, ITypeInfo * donor, IAtom * attr)
 {
     IHqlExpression * match = queryAttribute(donor, attr);
     if (!match)
@@ -3577,9 +3577,9 @@ static bool cloneModifierAsProperty(HqlExprArray & args, ITypeInfo * donor, IAto
 bool preserveTypeQualifiers(HqlExprArray & args, ITypeInfo * donor)
 {
     bool same = true;
-    same = cloneModifierAsProperty(args, donor, maxLengthAtom) && same;
-    same = cloneModifierAsProperty(args, donor, maxSizeAtom) && same;
-    same = cloneModifierAsProperty(args, donor, maxCountAtom) && same;
+    same = cloneModifierAsAttribute(args, donor, maxLengthAtom) && same;
+    same = cloneModifierAsAttribute(args, donor, maxSizeAtom) && same;
+    same = cloneModifierAsAttribute(args, donor, maxCountAtom) && same;
     return same;
 }
 

ecl/hql/hqlexpr.cpp

@@ -468,7 +468,7 @@ extern HQL_API IHqlExpression * cloneSymbol(IHqlExpression * donor, IIdAtom * ne
 }
 
 
-extern HQL_API IHqlExpression * queryAnnotationProperty(IAtom * search, IHqlExpression * annotation)
+extern HQL_API IHqlExpression * queryAnnotationAttribute(IAtom * search, IHqlExpression * annotation)
 {
     unsigned i=0;
     IHqlExpression * cur;
@@ -480,7 +480,7 @@ extern HQL_API IHqlExpression * queryAnnotationProperty(IAtom * search, IHqlExpr
     return NULL;
 }
 
-extern HQL_API IHqlExpression * queryMetaProperty(IAtom * search, IHqlExpression * expr)
+extern HQL_API IHqlExpression * queryMetaAttribute(IAtom * search, IHqlExpression * expr)
 {
     loop
     {
@@ -489,7 +489,7 @@ extern HQL_API IHqlExpression * queryMetaProperty(IAtom * search, IHqlExpression
             return NULL;
         if (kind == annotate_meta)
         {
-            IHqlExpression * cur = queryAnnotationProperty(search, expr);
+            IHqlExpression * cur = queryAnnotationAttribute(search, expr);
             if (cur)
                 return cur;
         }
@@ -497,7 +497,7 @@ extern HQL_API IHqlExpression * queryMetaProperty(IAtom * search, IHqlExpression
     }
 }
 
-extern HQL_API void gatherMetaProperties(HqlExprArray & matches, IAtom * search, IHqlExpression * expr)
+extern HQL_API void gatherMetaAttributes(HqlExprArray & matches, IAtom * search, IHqlExpression * expr)
 {
     loop
     {
@@ -521,7 +521,7 @@ extern HQL_API void gatherMetaProperties(HqlExprArray & matches, IAtom * search,
     }
 }
 
-extern HQL_API void gatherMetaProperties(HqlExprCopyArray & matches, IAtom * search, IHqlExpression * expr)
+extern HQL_API void gatherMetaAttributes(HqlExprCopyArray & matches, IAtom * search, IHqlExpression * expr)
 {
     loop
     {
@@ -4091,7 +4091,7 @@ IHqlScope * closeScope(IHqlScope * scope)
     return expr->closeExpr()->queryScope();
 }
 
-bool getProperty(IHqlExpression * expr, IAtom * propname, StringBuffer &ret)
+bool getAttribute(IHqlExpression * expr, IAtom * propname, StringBuffer &ret)
 {
     IHqlExpression* match = expr->queryAttribute(propname);
     if (match)
@@ -4467,7 +4467,7 @@ IHqlExpression * CHqlExpression::calcNormalizedSelector() const
         HqlExprArray args;
         appendArray(args, operands);
         args.replace(*LINK(normalizedLeft), 0);
-        removeProperty(args, newAtom);
+        removeAttribute(args, newAtom);
         return doCreateSelectExpr(args);
     }
     return NULL;
@@ -11458,7 +11458,7 @@ IHqlExpression *createDataset(node_operator op, HqlExprArray & parms)
     case no_select:
         //This can occur in very unusual situations...
         if ((parms.ordinality() > 2) && isAlwaysActiveRow(&parms.item(0)))
-            removeProperty(parms, newAtom);
+            removeAttribute(parms, newAtom);
         break;
     case no_denormalize:
         {
@@ -13617,7 +13617,7 @@ public:
             {
                 if (expr->hasAttribute(virtualAtom))
                 {
-                    OwnedHqlExpr cleaned = removeProperty(expr, virtualAtom);
+                    OwnedHqlExpr cleaned = removeAttribute(expr, virtualAtom);
                     return QuickHqlTransformer::createTransformed(cleaned);
                 }
                 break;
@@ -13673,7 +13673,7 @@ static bool removeVirtualAttributes(HqlExprArray & fields, IHqlExpression * cur,
             {
                 HqlExprArray args;
                 unwindChildren(args, cur);
-                removeProperty(args, virtualAtom);
+                removeAttribute(args, virtualAtom);
                 newField.setown(createField(cur->queryId(), targetType.getLink(), args));
             }
             fields.append(*LINK(newField));
@@ -14265,7 +14265,7 @@ void unwindRecordAsSelects(HqlExprArray & children, IHqlExpression * record, IHq
 }
 
 
-void unwindProperty(HqlExprArray & args, IHqlExpression * expr, IAtom * name)
+void unwindAttribute(HqlExprArray & args, IHqlExpression * expr, IAtom * name)
 {
     IHqlExpression * attr = expr->queryAttribute(name);
     if (attr)
@@ -14746,7 +14746,7 @@ IHqlExpression * createNullDictionary()
     return createDictionary(no_null, LINK(queryNullRecord()));
 }
 
-bool removeProperty(HqlExprArray & args, IAtom * name)
+bool removeAttribute(HqlExprArray & args, IAtom * name)
 {
     bool removed = false;
     ForEachItemInRev(idx, args)
@@ -14761,7 +14761,7 @@ bool removeProperty(HqlExprArray & args, IAtom * name)
     return removed;
 }
 
-void removeProperties(HqlExprArray & args)
+void removeAttributes(HqlExprArray & args)
 {
     ForEachItemInRev(idx, args)
     {
@@ -14911,7 +14911,7 @@ IHqlExpression * queryNewSelectAttrExpr()
 }
 
 //Follow inheritance structure when getting property value.
-IHqlExpression * queryRecordProperty(IHqlExpression * record, IAtom * name)
+IHqlExpression * queryRecordAttribute(IHqlExpression * record, IAtom * name)
 {
     IHqlExpression * match = record->queryAttribute(name);
     if (match)
@@ -14922,7 +14922,7 @@ IHqlExpression * queryRecordProperty(IHqlExpression * record, IAtom * name)
         switch (cur->getOperator())
         {
         case no_record:
-            return queryRecordProperty(cur, name);
+            return queryRecordAttribute(cur, name);
         case no_field:
         case no_ifblock:
             return NULL;
@@ -15079,8 +15079,8 @@ bool recordTypesMatch(IHqlExpression * left, IHqlExpression * right)
 
 bool recordTypesMatchIgnorePayload(IHqlExpression *left, IHqlExpression *right)
 {
-    OwnedHqlExpr simpleLeft = removeProperty(left->queryRecord(), _payload_Atom);
-    OwnedHqlExpr simpleRight = removeProperty(right->queryRecord(), _payload_Atom);
+    OwnedHqlExpr simpleLeft = removeAttribute(left->queryRecord(), _payload_Atom);
+    OwnedHqlExpr simpleRight = removeAttribute(right->queryRecord(), _payload_Atom);
     return recordTypesMatch(simpleLeft->queryType(), simpleRight->queryType());
 }
 
@@ -15275,7 +15275,7 @@ bool isKeyedCountAggregate(IHqlExpression * aggregate)
 }
 
 
-bool getBoolProperty(IHqlExpression * expr, IAtom * name, bool dft)
+bool getBoolAttribute(IHqlExpression * expr, IAtom * name, bool dft)
 {
     if (!expr)
         return dft;

ecl/hql/hqlexpr.hpp

@@ -1473,9 +1473,9 @@ inline IHqlExpression * queryNamedSymbol(IHqlExpression * expr) { return queryAn
 inline bool hasNamedSymbol(IHqlExpression * expr) { return hasAnnotation(expr, annotate_symbol); }
 inline bool hasAttribute(IAtom * search, const HqlExprArray & exprs) { return queryAttribute(search, exprs) != NULL; }
 
-extern HQL_API IHqlExpression * queryAnnotationProperty(IAtom * search, IHqlExpression * annotation);
-extern HQL_API IHqlExpression * queryMetaProperty(IAtom * search, IHqlExpression * expr);
-extern HQL_API void gatherMetaProperties(HqlExprArray & matches, IAtom * search, IHqlExpression * expr);
+extern HQL_API IHqlExpression * queryAnnotationAttribute(IAtom * search, IHqlExpression * annotation);
+extern HQL_API IHqlExpression * queryMetaAttribute(IAtom * search, IHqlExpression * expr);
+extern HQL_API void gatherMetaAttributes(HqlExprArray & matches, IAtom * search, IHqlExpression * expr);
 extern HQL_API void gatherMetaProperties(HqlExprCopyArray & matches, IAtom * search, IHqlExpression * expr);
 
 extern HQL_API IHqlExpression * queryLocation(IHqlExpression * expr);
@@ -1515,7 +1515,7 @@ extern HQL_API void unwindCopyList(HqlExprCopyArray &dst, IHqlExpression * expr,
 extern HQL_API void unwindCommaCompound(HqlExprArray & target, IHqlExpression * expr);
 extern HQL_API void unwindRecordAsSelects(HqlExprArray & children, IHqlExpression * record, IHqlExpression * ds, unsigned max = (unsigned)-1);
 extern HQL_API unsigned unwoundCount(IHqlExpression * expr, node_operator op);
-extern HQL_API void unwindProperty(HqlExprArray & args, IHqlExpression * expr, IAtom * name);
+extern HQL_API void unwindAttribute(HqlExprArray & args, IHqlExpression * expr, IAtom * name);
 extern HQL_API IHqlExpression * queryChildOperator(node_operator op, IHqlExpression * expr);
 extern HQL_API IHqlExpression * createSelector(node_operator op, IHqlExpression * ds, IHqlExpression * seq);
 extern HQL_API IHqlExpression * createUniqueId();
@@ -1548,8 +1548,8 @@ extern HQL_API IHqlExpression * getActiveTableSelector();
 extern HQL_API IHqlExpression * queryActiveTableSelector();
 extern HQL_API IHqlExpression * getSelf(IHqlExpression * ds);
 extern HQL_API IHqlExpression * querySelfReference();
-extern HQL_API bool removeProperty(HqlExprArray & args, IAtom * name);
-extern HQL_API void removeProperties(HqlExprArray & args);
+extern HQL_API bool removeAttribute(HqlExprArray & args, IAtom * name);
+extern HQL_API void removeAttributes(HqlExprArray & args);
 
 extern HQL_API bool isChildRelationOf(IHqlExpression * child, IHqlExpression * other);
 extern HQL_API IHqlExpression * queryRecord(ITypeInfo * type);
@@ -1604,7 +1604,7 @@ extern HQL_API IHqlExpression * querySelectorDataset(IHqlExpression * select, bo
 extern HQL_API IHqlExpression * replaceSelectorDataset(IHqlExpression * expr, IHqlExpression * newDataset);
 extern HQL_API IHqlExpression * querySkipDatasetMeta(IHqlExpression * dataset);
 extern HQL_API bool isNewSelector(IHqlExpression * expr);
-extern HQL_API IHqlExpression * queryRecordProperty(IHqlExpression * record, IAtom * name);
+extern HQL_API IHqlExpression * queryRecordAttribute(IHqlExpression * record, IAtom * name);
 extern HQL_API bool isExported(IHqlExpression * expr);
 extern HQL_API bool isShared(IHqlExpression * expr);
 extern HQL_API bool isImport(IHqlExpression * expr);
@@ -1616,7 +1616,7 @@ extern HQL_API bool isPublicSymbol(IHqlExpression * expr);
 extern HQL_API ITypeInfo * getSumAggType(IHqlExpression * arg);
 extern HQL_API ITypeInfo * getSumAggType(ITypeInfo * argType);
 
-extern HQL_API bool getProperty(IHqlExpression * expr, IAtom * propName, StringBuffer & ret);
+extern HQL_API bool getAttribute(IHqlExpression * expr, IAtom * propName, StringBuffer & ret);
 
 extern HQL_API bool filterIsKeyed(IHqlExpression * expr);
 extern HQL_API bool filterIsUnkeyed(IHqlExpression * expr);
@@ -1854,7 +1854,7 @@ void addForwardDefinition(IHqlScope * scope, IIdAtom * symbolName, IIdAtom * mod
 extern HQL_API IPropertyTree * createAttributeArchive();
 extern HQL_API void ensureSymbolsDefined(IHqlExpression * scope, HqlLookupContext & ctx);
 extern HQL_API void ensureSymbolsDefined(IHqlScope * scope, HqlLookupContext & ctx);
-extern HQL_API bool getBoolProperty(IHqlExpression * expr, IAtom * name, bool dft=false);
+extern HQL_API bool getBoolAttribute(IHqlExpression * expr, IAtom * name, bool dft=false);
 
 extern HQL_API void setLegacyEclSemantics(bool _value);
 extern HQL_API bool queryLegacyEclSemantics();

ecl/hql/hqlfold.cpp

@@ -594,10 +594,10 @@ IValue * foldExternalCall(IHqlExpression* expr, unsigned foldOptions, ITemplateC
     StringBuffer entry;
     StringBuffer mangledEntry;
     StringBuffer lib;
-    getProperty(body, entrypointAtom, entry);
-    getProperty(body, libraryAtom, lib);
+    getAttribute(body, entrypointAtom, entry);
+    getAttribute(body, libraryAtom, lib);
     if (!lib.length())
-        getProperty(body, pluginAtom, lib);
+        getAttribute(body, pluginAtom, lib);
     if(entry.length() == 0)
     {
         if (foldOptions & HFOthrowerror)
@@ -4430,7 +4430,7 @@ IHqlExpression * CExprFolderTransformer::doFoldTransformed(IHqlExpression * unfo
             unwindChildren(args, expr, 1); // (count, trans)
             if (newTransform)
                 args.replace(*newTransform.getClear(), 1);
-            removeProperty(args, _selectorSequence_Atom);
+            removeAttribute(args, _selectorSequence_Atom);
 
             return createDataset(no_dataset_from_transform, args);
         }
@@ -4825,7 +4825,7 @@ IHqlExpression * CExprFolderTransformer::doFoldTransformed(IHqlExpression * unfo
             //Could have removed whether or not somethin needs to be a count project
             IHqlExpression * counter = queryAttributeChild(expr, _countProject_Atom, 0);
             if (counter && !transformContainsCounter(expr->queryChild(1), counter))
-                return removeProperty(expr, _countProject_Atom);
+                return removeAttribute(expr, _countProject_Atom);
         }
         break;
     case no_temptable:
@@ -5115,7 +5115,7 @@ IHqlExpression * CExprFolderTransformer::percolateConstants(IHqlExpression * exp
                 if (atmost)
                 {
                     if (matchesBoolean(updatedCond, false))
-                        updated.setown(removeProperty(updated, atmostAtom));
+                        updated.setown(removeAttribute(updated, atmostAtom));
                     else
                     {
                         //KEYED joins support ATMOST and RIGHT.xxx = value
@@ -5124,7 +5124,7 @@ IHqlExpression * CExprFolderTransformer::percolateConstants(IHqlExpression * exp
                             HqlExprArray args;
                             unwindChildren(args, updated);
                             args.replace(*LINK(oldCond), 2);
-                            removeProperty(args, atmostAtom);
+                            removeAttribute(args, atmostAtom);
                             args.append(*LINK(atmost));
                             updated.setown(updated->clone(args));
                         }
@@ -5168,7 +5168,7 @@ IHqlExpression * CExprFolderTransformer::percolateConstants(IHqlExpression * exp
                 IHqlExpression * sorted = expr->queryAttribute(sortedAtom);
                 assertex(sorted);
                 OwnedHqlExpr newSorted = percolateConstants(mapping, sorted, child, no_activetable);
-                updated.setown(replaceOwnedProperty(updated, newSorted.getClear()));
+                updated.setown(replaceOwnedAttribute(updated, newSorted.getClear()));
             }
             break;
         }

ecl/hql/hqlgram2.cpp

@@ -6778,7 +6778,7 @@ void HqlGram::processUpdateAttr(attribute & attr)
 
     if (expr->queryAttribute(updateAtom))
     {
-        removeProperty(args, updateAtom);
+        removeAttribute(args, updateAtom);
         args.append(*createAttribute(updateAtom, createConstant((__int64)getExpressionCRC(expr))));
     }
     else
@@ -7222,8 +7222,8 @@ IHqlExpression * HqlGram::createIndexFromRecord(IHqlExpression * record, IHqlExp
 
 void HqlGram::inheritRecordMaxLength(IHqlExpression * dataset, SharedHqlExpr & record)
 {
-    IHqlExpression * maxLength = queryRecordProperty(dataset->queryRecord(), maxLengthAtom);
-    if (maxLength && !queryRecordProperty(record, maxLengthAtom))
+    IHqlExpression * maxLength = queryRecordAttribute(dataset->queryRecord(), maxLengthAtom);
+    if (maxLength && !queryRecordAttribute(record, maxLengthAtom))
     {
         HqlExprArray fields;
         unwindChildren(fields, record);
@@ -8024,7 +8024,7 @@ void HqlGram::extractIndexRecordAndExtra(SharedHqlExpr & record, SharedHqlExpr &
     if (payload)
     {
         extra.setown(createComma(extra.getClear(), LINK(payload)));
-        record.setown(removeProperty(record, _payload_Atom));
+        record.setown(removeAttribute(record, _payload_Atom));
     }
 }
 

ecl/hql/hqllex.l

@@ -94,7 +94,7 @@ int HqlLex::lookupIdentifierToken(YYSTYPE & returnToken, HqlLex * lexer, bool lo
         return UNKNOWN_ID;
     }
 
-    IHqlExpression * deprecated = queryMetaProperty(deprecatedAtom, expr);
+    IHqlExpression * deprecated = queryMetaAttribute(deprecatedAtom, expr);
     if (deprecated)
     {
         IHqlExpression * alternative = deprecated->queryChild(0);

ecl/hql/hqlmeta.cpp

@@ -1505,7 +1505,7 @@ IHqlExpression * convertSubSortToGroupedSort(IHqlExpression * expr)
     args.append(*grouped.getClear());
     args.append(*LINK(newOrder));
     unwindChildren(args, expr, 3);
-    removeProperty(args, localAtom);
+    removeAttribute(args, localAtom);
     OwnedHqlExpr sorted = createDataset(no_sort, args);
     return createDataset(no_group, sorted.getClear());
 }

ecl/hql/hqlopt.cpp

@@ -282,7 +282,7 @@ IHqlExpression * CTreeOptimizer::swapNodeWithChild(IHqlExpression * parent)
 IHqlExpression * CTreeOptimizer::forceSwapNodeWithChild(IHqlExpression * parent)
 {
     OwnedHqlExpr swapped = swapNodeWithChild(parent);
-    return replaceOwnedProperty(swapped, getNoHoistAttr());
+    return replaceOwnedAttribute(swapped, getNoHoistAttr());
 }
 
 IHqlExpression * CTreeOptimizer::getNoHoistAttr()
@@ -2151,7 +2151,7 @@ IHqlExpression * CTreeOptimizer::doCreateTransformed(IHqlExpression * transforme
         {
             IHqlExpression * counterAttr = transformed->queryAttribute(_countProject_Atom);
             if (counterAttr && !transformContainsCounter(transformed->queryChild(1), counterAttr->queryChild(0)))
-                return removeProperty(transformed, _countProject_Atom);
+                return removeAttribute(transformed, _countProject_Atom);
             //fallthrough
         }
     case no_newusertable:
@@ -2534,7 +2534,7 @@ IHqlExpression * CTreeOptimizer::doCreateTransformed(IHqlExpression * transforme
             DBGLOG("Optimizer: Convert %s(,1) into PROJECT", queryNode0Text(transformed));
             unwindChildren(args, transformed, 3);
             //This is not a count project.. so remove the attribute.
-            removeProperty(args, _countProject_Atom);
+            removeAttribute(args, _countProject_Atom);
             return createDataset(no_hqlproject, args);
         }
         break;
@@ -2854,7 +2854,7 @@ IHqlExpression * CTreeOptimizer::doCreateTransformed(IHqlExpression * transforme
                     OwnedHqlExpr skip = createValue(no_skip, makeVoidType(), getInverse(skipFilter));
                     OwnedHqlExpr newTransform = appendOwnedOperand(limitTransform, skip.getClear());
                     OwnedHqlExpr newOnFail = createExprAttribute(onFailAtom, newTransform.getClear());
-                    return replaceOwnedProperty(ret, newOnFail.getClear());
+                    return replaceOwnedAttribute(ret, newOnFail.getClear());
                 }
             case no_if:
                 return swapIntoIf(transformed);
@@ -3276,7 +3276,7 @@ IHqlExpression * CTreeOptimizer::doCreateTransformed(IHqlExpression * transforme
                     if (!monitor.isComplex())
                     {
                         DBGLOG("Optimizer: Merge %s and %s", queryNode0Text(transformed), queryNode1Text(child));
-                        removeProperty(args, _internal_Atom);
+                        removeAttribute(args, _internal_Atom);
                         noteUnused(child);
                         return transformed->clone(args);
                     }

ecl/hql/hqltrans.cpp

@@ -1453,7 +1453,7 @@ IHqlExpression * NewHqlTransformer::createTransformed(IHqlExpression * expr)
             if (dsOp == no_activetable)
             {
                 children.replace(*LINK(ds.queryChild(0)), 0);
-                removeProperty(children, newAtom);
+                removeAttribute(children, newAtom);
             }
             else if (!expr->hasAttribute(newAtom))
             {
@@ -1466,7 +1466,7 @@ IHqlExpression * NewHqlTransformer::createTransformed(IHqlExpression * expr)
             if (children.ordinality() > 2)
             {
                 if (isAlwaysActiveRow(&ds) || ((dsOp == no_select) && ds.isDatarow()))
-                    removeProperty(children, newAtom);
+                    removeAttribute(children, newAtom);
             }
         }
         else
@@ -2942,7 +2942,7 @@ IHqlExpression * MergingHqlTransformer::createTransformed(IHqlExpression * expr)
             if (!same)
             {
                 if ((children.ordinality() > 2) && isAlwaysActiveRow(child))
-                    removeProperty(children, newAtom);
+                    removeAttribute(children, newAtom);
                 return expr->clone(children);
             }
             return LINK(expr);
@@ -3992,7 +3992,7 @@ IHqlExpression * ScopedTransformer::createTransformed(IHqlExpression * expr)
                 if (transformedDs->getOperator() == no_activetable)
                 {
                     children.replace(*LINK(transformedDs->queryChild(0)), 0);
-                    removeProperty(children, newAtom);
+                    removeAttribute(children, newAtom);
                 }
             }
             else

ecl/hql/hqlutil.cpp

@@ -4533,20 +4533,20 @@ IHqlExpression * removeChildOp(IHqlExpression * expr, node_operator op)
     return expr->clone(args);
 }
 
-IHqlExpression * removeProperty(IHqlExpression * expr, IAtom * attr)
+IHqlExpression * removeAttribute(IHqlExpression * expr, IAtom * attr)
 {
     HqlExprArray args;
     unwindChildren(args, expr);
-    if (removeProperty(args, attr))
+    if (removeAttribute(args, attr))
         return expr->clone(args);
     return LINK(expr);
 }
 
-IHqlExpression * replaceOwnedProperty(IHqlExpression * expr, IHqlExpression * ownedOperand)
+IHqlExpression * replaceOwnedAttribute(IHqlExpression * expr, IHqlExpression * ownedOperand)
 {
     HqlExprArray args;
     unwindChildren(args, expr);
-    removeProperty(args, ownedOperand->queryName());
+    removeAttribute(args, ownedOperand->queryName());
     args.append(*ownedOperand);
     return expr->clone(args);
 }
@@ -4559,7 +4559,7 @@ IHqlExpression * appendLocalAttribute(IHqlExpression * expr)
 
 IHqlExpression * removeLocalAttribute(IHqlExpression * expr)
 {
-    return removeProperty(expr, localAtom);
+    return removeAttribute(expr, localAtom);
 }
 
 bool hasOperand(IHqlExpression * expr, IHqlExpression * child)
@@ -5029,11 +5029,11 @@ IHqlExpression * removeVirtualFields(IHqlExpression * record)
     return record->clone(args);
 }
 
-static HqlTransformerInfo fieldPropertyRemoverInfo("FieldPropertyRemover");
-class FieldPropertyRemover : public NewHqlTransformer
+static HqlTransformerInfo fieldPropertyRemoverInfo("FieldAttributeRemover");
+class FieldAttributeRemover : public NewHqlTransformer
 {
 public:
-    FieldPropertyRemover(IAtom * _name) : NewHqlTransformer(fieldPropertyRemoverInfo), name(_name) {}
+    FieldAttributeRemover(IAtom * _name) : NewHqlTransformer(fieldPropertyRemoverInfo), name(_name) {}
 
     virtual IHqlExpression * createTransformed(IHqlExpression * expr)
     {
@@ -5049,7 +5049,7 @@ public:
             {
                 OwnedHqlExpr transformed = transformField(expr);
                 while (transformed->hasAttribute(name))
-                    transformed.setown(removeProperty(transformed, name));
+                    transformed.setown(removeAttribute(transformed, name));
                 return transformed.getClear();
             }
 
@@ -5062,9 +5062,9 @@ private:
     IAtom * name;
 };
 
-IHqlExpression * removePropertyFromFields(IHqlExpression * expr, IAtom * name)
+IHqlExpression * removeAttributeFromFields(IHqlExpression * expr, IAtom * name)
 {
-    FieldPropertyRemover remover(name);
+    FieldAttributeRemover remover(name);
     return remover.transformRoot(expr);
 }
 
@@ -6445,7 +6445,7 @@ void WarningProcessor::addGlobalOnWarning(IHqlExpression * setMetaExpr)
 
 void WarningProcessor::processMetaAnnotation(IHqlExpression * expr)
 {
-    gatherMetaProperties(localOnWarnings, onWarningAtom, expr);
+    gatherMetaAttributes(localOnWarnings, onWarningAtom, expr);
 }
 
 void WarningProcessor::processWarningAnnotation(IHqlExpression * expr)
@@ -6825,7 +6825,7 @@ public:
             api = LocalApi;
 
         StringBuffer entrypoint;
-        getProperty(body, entrypointAtom, entrypoint);
+        getAttribute(body, entrypointAtom, entrypoint);
         if (entrypoint.length() == 0)
             return false;
 
@@ -7055,7 +7055,7 @@ public:
             api = LocalApi;
 
         StringBuffer entrypoint;
-        getProperty(body, entrypointAtom, entrypoint);
+        getAttribute(body, entrypointAtom, entrypoint);
         if (entrypoint.length() == 0)
             return false;
 

ecl/hql/hqlutil.hpp

@@ -71,7 +71,7 @@ extern HQL_API void gatherIndexBuildSortOrder(HqlExprArray & sorts, IHqlExpressi
 extern HQL_API bool recordContainsBlobs(IHqlExpression * record);
 inline bool recordIsEmpty(IHqlExpression * record) { return queryLastField(record) == NULL; }
 extern HQL_API IHqlExpression * queryVirtualFileposField(IHqlExpression * record);
-extern HQL_API IHqlExpression * removePropertyFromFields(IHqlExpression * expr, IAtom * name);
+extern HQL_API IHqlExpression * removeAttributeFromFields(IHqlExpression * expr, IAtom * name);
 
 extern HQL_API IHqlExpression * flattenListOwn(IHqlExpression * list);
 extern HQL_API void flattenListOwn(HqlExprArray & out, IHqlExpression * list);
@@ -153,12 +153,12 @@ extern HQL_API IAtom * queryCsvEncoding(IHqlExpression * csvAttr);
 extern HQL_API IHqlExpression * combineIfsToMap(IHqlExpression * expr);
 extern HQL_API IHqlExpression * appendLocalAttribute(IHqlExpression * expr);
 extern HQL_API IHqlExpression * removeLocalAttribute(IHqlExpression * expr);
-extern HQL_API IHqlExpression * removeProperty(IHqlExpression * expr, IAtom * attr);
+extern HQL_API IHqlExpression * removeAttribute(IHqlExpression * expr, IAtom * attr);
 extern HQL_API IHqlExpression * removeOperand(IHqlExpression * expr, IHqlExpression * operand);
 extern HQL_API IHqlExpression * removeChildOp(IHqlExpression * expr, node_operator op);
 extern HQL_API IHqlExpression * appendAttribute(IHqlExpression * expr, IAtom * attr);
 extern HQL_API IHqlExpression * appendOwnedOperand(IHqlExpression * expr, IHqlExpression * ownedOperand);
-extern HQL_API IHqlExpression * replaceOwnedProperty(IHqlExpression * expr, IHqlExpression * ownedProeprty);
+extern HQL_API IHqlExpression * replaceOwnedAttribute(IHqlExpression * expr, IHqlExpression * ownedAttribute);
 extern HQL_API IHqlExpression * appendOwnedOperandsF(IHqlExpression * expr, ...);
 extern HQL_API IHqlExpression * inheritAttribute(IHqlExpression * expr, IHqlExpression * donor, IAtom * name);
 extern HQL_API void inheritAttribute(HqlExprArray & attrs, IHqlExpression * donor, IAtom * name);

ecl/hqlcpp/hqlcpp.cpp

@@ -1203,9 +1203,9 @@ bool HqlCppInstance::useFunction(IHqlExpression * func)
 
     IHqlExpression * funcDef = func->queryChild(0);
     StringBuffer libname, init, include;
-    getProperty(funcDef, libraryAtom, libname);
-    getProperty(funcDef, initfunctionAtom, init);
-    getProperty(funcDef, includeAtom, include);
+    getAttribute(funcDef, libraryAtom, libname);
+    getAttribute(funcDef, initfunctionAtom, init);
+    getAttribute(funcDef, includeAtom, include);
     if (init.length())
     {
         BuildCtx ctx(*this, initAtom);
@@ -5750,7 +5750,7 @@ void HqlCppTranslator::doBuildCall(BuildCtx & ctx, const CHqlBoundTarget * tgt,
             if (curTarget->length)
                 args.append(*LINK(curTarget->length));
             args.append(*createValue(no_reference, curTarget->expr->getType(), LINK(curTarget->expr)));
-            if (hasLinkCountedModifier(retType) && hasNonNullRecord(retType) && getBoolProperty(external, allocatorAtom, true))
+            if (hasLinkCountedModifier(retType) && hasNonNullRecord(retType) && getBoolAttribute(external, allocatorAtom, true))
                 args.append(*createRowAllocator(ctx, ::queryRecord(retType)));
 
             localBound.setFromTarget(*curTarget);
@@ -11135,7 +11135,7 @@ void HqlCppTranslator::expandFunctions(bool expandInline)
         {
             IHqlExpression & cur = (IHqlExpression &)code->helpers.item(idx);
             StringBuffer init;
-            if (getProperty(cur.queryChild(0), initfunctionAtom, init))
+            if (getAttribute(cur.queryChild(0), initfunctionAtom, init))
             {
                 StringBuffer initproto("extern \"C\" void SERVICE_API ");
                 initproto.append(init).append("(const char *);");

ecl/hqlcpp/hqlcppds.cpp

@@ -2827,7 +2827,7 @@ bool HqlCppTranslator::doBuildDatasetInlineTable(BuildCtx & ctx, IHqlExpression
 
     BuildCtx declareCtx(*code, literalAtom);
     //Remove unique id when checking for constant datasets already generated
-    OwnedHqlExpr exprKey = removeProperty(expr, _uid_Atom);
+    OwnedHqlExpr exprKey = removeAttribute(expr, _uid_Atom);
     if (declareCtx.getMatchExpr(exprKey, tgt))
         return true;
 
@@ -3019,7 +3019,7 @@ bool HqlCppTranslator::doBuildDictionaryInlineTable(BuildCtx & ctx, IHqlExpressi
 
     BuildCtx declareCtx(*code, literalAtom);
     //Remove unique id when checking for constant datasets already generated
-    OwnedHqlExpr exprNoUnique = removeProperty(dataset, _uid_Atom);
+    OwnedHqlExpr exprNoUnique = removeAttribute(dataset, _uid_Atom);
     OwnedHqlExpr exprKey = createAttribute(dictionaryAtom, exprNoUnique.getClear());
     if (declareCtx.getMatchExpr(exprKey, tgt))
         return true;

ecl/hqlcpp/hqlhoist.cpp

@@ -65,7 +65,7 @@ protected:
         if (transformed->getOperator() == no_getgraphresult)
         {
             if (hasOperand(transformed, graph))
-                return removeProperty(transformed, externalAtom);
+                return removeAttribute(transformed, externalAtom);
         }
         return transformed.getClear();
     }

ecl/hqlcpp/hqlhtcpp.cpp

@@ -1709,7 +1709,7 @@ ActivityInstance::ActivityInstance(HqlCppTranslator & _translator, BuildCtx & ct
     bool removeXpath = dataset->hasAttribute(noXpathAtom) || (op == no_output && translator.queryOptions().removeXpathFromOutput);
     LinkedHqlExpr record = queryRecord(outputDataset);
     if (removeXpath)
-        record.setown(removePropertyFromFields(record, xpathAtom));
+        record.setown(removeAttributeFromFields(record, xpathAtom));
     meta.setMeta(translator, record, ::isGrouped(outputDataset));
 
     activityId = translator.nextActivityId();
@@ -5861,13 +5861,13 @@ SourceFieldUsage * HqlCppTranslator::querySourceFieldUsage(IHqlExpression * expr
     if (expr->hasAttribute(_spill_Atom) || expr->hasAttribute(jobTempAtom))
         return NULL;
 
-    OwnedHqlExpr normalized = removeProperty(expr, _uid_Atom);
+    OwnedHqlExpr normalized = removeAttribute(expr, _uid_Atom);
     IHqlExpression * original = normalized->queryAttribute(_original_Atom);
     if (original)
     {
-        OwnedHqlExpr normalTable = removeProperty(original->queryChild(0), _uid_Atom);
+        OwnedHqlExpr normalTable = removeAttribute(original->queryChild(0), _uid_Atom);
         OwnedHqlExpr normalOriginal = replaceChild(original, 0, normalTable);
-        normalized.setown(replaceOwnedProperty(normalized, normalOriginal.getClear()));
+        normalized.setown(replaceOwnedAttribute(normalized, normalOriginal.getClear()));
     }
 
     ForEachItemIn(i, trackedSources)
@@ -9963,7 +9963,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityOutputIndex(BuildCtx & ctx, IH
     // virtual unsigned getKeyedSize()
     HqlExprArray fields;
     unwindChildren(fields, record);
-    removeProperties(fields);
+    removeAttributes(fields);
     fields.popn(numPayloadFields(expr));
     OwnedHqlExpr keyedRecord = createRecord(fields); // must be fixed length => no maxlength
     if (expr->hasAttribute(_payload_Atom))
@@ -15867,7 +15867,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivityCase(BuildCtx & ctx, IHqlExpre
 void HqlCppTranslator::buildSkewThresholdMembers(BuildCtx & ctx, IHqlExpression * expr)
 {
     StringBuffer s, temp;
-    if (getProperty(expr, thresholdAtom, temp.clear()))
+    if (getAttribute(expr, thresholdAtom, temp.clear()))
     {
         s.clear().append("virtual unsigned __int64 getThreshold() { return ").append(temp).append("; }");
         ctx.addQuoted(s);

ecl/hqlcpp/hqliproj.cpp

@@ -444,7 +444,7 @@ void UsedFieldSet::calcFinalRecord(bool canPack, bool ignoreIfEmpty)
                 HqlExprArray args;
                 unwindChildren(args, &cur);
                 //MORE: Any default will now have the wrong type => remove it for the moment (ideally it would be projected)
-                removeProperty(args, defaultAtom);
+                removeAttribute(args, defaultAtom);
                 OwnedHqlExpr newField = createField(cur.queryId(), makeRowType(newRecord->getType()), args);
                 recordFields.append(*newField.getClear());
             }
@@ -2939,7 +2939,7 @@ IHqlExpression * ImplicitProjectTransformer::createTransformed(IHqlExpression *
             {
                 IHqlExpression * newTransform = complexExtra->outputFields.createFilteredTransform(onFail->queryChild(0), NULL);
                 IHqlExpression * newOnFail = createExprAttribute(onFailAtom, newTransform);
-                transformed.setown(replaceOwnedProperty(transformed, newOnFail));
+                transformed.setown(replaceOwnedAttribute(transformed, newOnFail));
             }
             if (complexExtra->insertProject)
             {

ecl/hqlcpp/hqllib.cpp

@@ -311,7 +311,7 @@ public:
                     }
                     //remove the parameter from the internal attribute from the module that is being called.
                     //so save in subsequent translation
-                    OwnedHqlExpr newModuleExpr = replaceOwnedProperty(moduleExpr, createAttribute(internalAtom));
+                    OwnedHqlExpr newModuleExpr = replaceOwnedAttribute(moduleExpr, createAttribute(internalAtom));
                     OwnedHqlExpr newScopeFunc = replaceChild(scopeFunc, 0, newModuleExpr);
                     HqlExprArray instanceArgs;
                     unwindChildren(instanceArgs, expr);

ecl/hqlcpp/hqlresource.cpp

@@ -534,7 +534,7 @@ IHqlExpression * CResourceOptions::createSpillName(bool isGraphResult)
 
 IHqlExpression * appendUniqueAttr(IHqlExpression * expr)
 {
-    return replaceOwnedProperty(expr, createUniqueId());
+    return replaceOwnedAttribute(expr, createUniqueId());
 }
 
 
@@ -983,7 +983,7 @@ unsigned ChildDependentArray::findOriginal(IHqlExpression * expr)
 }
 //---------------------------------------------------------------------------
 
-static void appendCloneProperty(HqlExprArray & args, IHqlExpression * expr, IAtom * name)
+static void appendCloneAttribute(HqlExprArray & args, IHqlExpression * expr, IAtom * name)
 {
     IHqlExpression * prop = expr->queryAttribute(name);
     if (prop)
@@ -1051,9 +1051,9 @@ void ResourcerInfo::addSpillFlags(HqlExprArray & args, bool isRead)
     if (outputToUseForSpill)
     {
         assertex(isRead);
-        appendCloneProperty(args, outputToUseForSpill, __compressed__Atom);
-        appendCloneProperty(args, outputToUseForSpill, jobTempAtom);
-        appendCloneProperty(args, outputToUseForSpill, _spill_Atom);
+        appendCloneAttribute(args, outputToUseForSpill, __compressed__Atom);
+        appendCloneAttribute(args, outputToUseForSpill, jobTempAtom);
+        appendCloneAttribute(args, outputToUseForSpill, _spill_Atom);
     }
     else
     {
@@ -5181,7 +5181,7 @@ IHqlExpression * SpillActivityTransformer::createTransformed(IHqlExpression * ex
                 return transform(input);
             OwnedHqlExpr transformed = NewHqlTransformer::createTransformed(expr);
             if (transformed->hasAttribute(balancedAtom) && isUnbalanced(expr))
-                return removeProperty(transformed, balancedAtom);
+                return removeAttribute(transformed, balancedAtom);
             return transformed.getClear();
         }
     case no_writespill:

ecl/hqlcpp/hqlsource.cpp

@@ -547,7 +547,7 @@ IHqlExpression * HqlCppTranslator::convertToPhysicalIndex(IHqlExpression * table
     HqlExprArray args;
     unwindChildren(args, tableExpr);
     args.replace(*diskRecord, 1);
-    removeProperty(args, _payload_Atom);
+    removeAttribute(args, _payload_Atom);
     args.append(*createAttribute(_payload_Atom, createConstant(payload-1)));
     args.append(*createAttribute(_original_Atom, LINK(tableExpr)));
 
@@ -3777,7 +3777,7 @@ static void createExpanded(HqlExprArray & fields, IHqlExpression * expr)
                     HqlExprArray attrs;
                     unwindChildren(attrs, expr);
                     //MORE: Any default will now have the wrong type => remove it for the moment (ideally it would be projected)
-                    removeProperty(attrs, defaultAtom);
+                    removeAttribute(attrs, defaultAtom);
                     fields.append(*createField(expr->queryId(), LINK(expandedType), attrs));
                 }
             }

ecl/hqlcpp/hqlttcpp.cpp

@@ -1906,7 +1906,7 @@ static IHqlExpression * normalizeIndexBuild(IHqlExpression * expr, bool sortInde
         HqlExprArray  buildArgs;
         buildArgs.append(*cloneInheritedAnnotations(expr, dedup));
         unwindChildren(buildArgs, expr, 1);
-        removeProperty(buildArgs, dedupAtom);
+        removeAttribute(buildArgs, dedupAtom);
         return expr->clone(buildArgs);
     }
 
@@ -2015,7 +2015,7 @@ IHqlExpression * ThorHqlTransformer::createTransformed(IHqlExpression * expr)
 /*
     //Has a minor impact on unnecessary local attributes
     if (!translator.targetThor() && transformed->hasAttribute(localAtom) && localChangesActivityAction(transformed))
-        return removeProperty(transformed, localAtom);
+        return removeAttribute(transformed, localAtom);
 */
     return transformed.getClear();
 }
@@ -2039,7 +2039,7 @@ static IHqlExpression * convertDedupToGroupedDedup(IHqlExpression * expr, IHqlEx
     HqlExprArray dedupArgs;
     dedupArgs.append(*LINK(group));
     unwindChildren(dedupArgs, expr, 1);
-    removeProperty(dedupArgs, localAtom); //(since now a grouped dedup)
+    removeAttribute(dedupArgs, localAtom); //(since now a grouped dedup)
     OwnedHqlExpr ungroup = createDataset(no_group, expr->clone(dedupArgs), NULL);
     return cloneInheritedAnnotations(expr, ungroup);
 }
@@ -2114,8 +2114,8 @@ IHqlExpression * ThorHqlTransformer::normalizeDedup(IHqlExpression * expr)
             bool alreadySorted = isSortedForGroup(dataset, groupOrder, checkLocal);
             if (alreadySorted)
             {
-                OwnedHqlExpr noHash = removeProperty(expr, hashAtom);
-                OwnedHqlExpr noAll = removeProperty(noHash, allAtom);
+                OwnedHqlExpr noHash = removeAttribute(expr, hashAtom);
+                OwnedHqlExpr noAll = removeAttribute(noHash, allAtom);
                 if (isLocal)
                     return noAll.getClear();
                 return convertDedupToGroupedDedup(noAll, groupOrder, checkLocal && !isLocal);
@@ -2135,7 +2135,7 @@ IHqlExpression * ThorHqlTransformer::normalizeDedup(IHqlExpression * expr)
                 HqlExprArray dedupArgs;
                 dedupArgs.append(*ensureSortedForGroup(dataset, groupOrder, true, false, options.implicitGroupSubSort));
                 unwindChildren(dedupArgs, expr, 1);
-                removeProperty(dedupArgs, allAtom);
+                removeAttribute(dedupArgs, allAtom);
                 return expr->clone(dedupArgs);
             }
             else
@@ -2339,7 +2339,7 @@ IHqlExpression * ThorHqlTransformer::normalizeGroup(IHqlExpression * expr)
     //The the data could be globally sorted, but not distributed, and this is likely to be more efficient than redistributing...
     OwnedHqlExpr sorted = ensureSortedForGroup(dataset, sortlist, hasLocal, !translator.targetThor(), options.implicitGroupSubSort);
     if (sorted == dataset)
-        return removeProperty(expr, allAtom);
+        return removeAttribute(expr, allAtom);
     sorted.setown(cloneInheritedAnnotations(expr, sorted));
     sorted.setown(inheritAttribute(sorted, expr, skewAtom));
     sorted.setown(inheritAttribute(sorted, expr, thresholdAtom));
@@ -2391,7 +2391,7 @@ IHqlExpression * ThorHqlTransformer::normalizeCoGroup(IHqlExpression * expr)
     if (newsort)
     {
         OwnedHqlExpr newGroup = createExprAttribute(groupAtom, newsort.getClear());
-        return replaceOwnedProperty(expr, newGroup.getClear());
+        return replaceOwnedAttribute(expr, newGroup.getClear());
     }
 
     HqlExprArray inputs;
@@ -2662,7 +2662,7 @@ IHqlExpression * ThorHqlTransformer::normalizeJoinAndGroup(IHqlExpression * expr
     joinArgs.append(*LINK(newLeft));
     joinArgs.append(*LINK(newRight));
     unwindChildren(joinArgs, expr, 2);
-    removeProperty(joinArgs, groupAtom);
+    removeAttribute(joinArgs, groupAtom);
     if (!hasLocal && !alwaysLocal)
         joinArgs.append(*createLocalAttribute());
     OwnedHqlExpr newJoin = expr->clone(joinArgs);
@@ -2716,7 +2716,7 @@ IHqlExpression * ThorHqlTransformer::normalizeJoinOrDenormalize(IHqlExpression *
     {
         HqlExprArray args;
         unwindChildren(args, expr);
-        removeProperty(args, hashAtom);
+        removeAttribute(args, hashAtom);
         return expr->clone(args);
     }
 
@@ -2967,7 +2967,7 @@ IHqlExpression * ThorHqlTransformer::normalizeJoinOrDenormalize(IHqlExpression *
             HqlExprArray args;
             args.append(*LINK(distribute));
             unwindChildren(args, expr, 1);
-            removeProperty(args, hashAtom);
+            removeAttribute(args, hashAtom);
             args.append(*createLocalAttribute());
             return expr->clone(args);
         }
@@ -2979,7 +2979,7 @@ IHqlExpression * ThorHqlTransformer::normalizeJoinOrDenormalize(IHqlExpression *
         args.append(*createDistributedInput(leftDs, joinInfo.queryLeftReq(), false));
         args.append(*createDistributedInput(rightDs, joinInfo.queryRightReq(), false));
         unwindChildren(args, expr, 2);
-        removeProperty(args, hashAtom);
+        removeAttribute(args, hashAtom);
         args.append(*createLocalAttribute());
         return expr->clone(args);
     }
@@ -3049,7 +3049,7 @@ IHqlExpression * ThorHqlTransformer::normalizeSelect(IHqlExpression * expr)
     HqlExprArray selectArgs;
     unwindChildren(selectArgs, expr);
     selectArgs.replace(*createSelector(no_left, ds, selSeq), 0);
-    removeProperty(selectArgs, newAtom);
+    removeAttribute(selectArgs, newAtom);
     args.append(*expr->clone(selectArgs));
 
     //Create a transform self := right;
@@ -3393,7 +3393,7 @@ IHqlExpression * ThorHqlTransformer::normalizeMergeAggregate(IHqlExpression * ex
     IHqlExpression * groupBy = expr->queryChild(3);
 
     //If locally distributed then don't do anything
-    OwnedHqlExpr noMerge = removeProperty(expr, mergeAtom);
+    OwnedHqlExpr noMerge = removeAttribute(expr, mergeAtom);
     if (!translator.targetThor() || expr->hasAttribute(localAtom) || isPartitionedForGroup(dataset, groupBy, true))
         return noMerge.getClear();
 
@@ -3406,8 +3406,8 @@ IHqlExpression * ThorHqlTransformer::normalizeMergeAggregate(IHqlExpression * ex
 
     HqlExprArray localAggregateArgs;
     unwindChildren(localAggregateArgs, aggregate);
-    removeProperty(localAggregateArgs, hashAtom);
-    removeProperty(localAggregateArgs, mergeAtom);
+    removeAttribute(localAggregateArgs, hashAtom);
+    removeAttribute(localAggregateArgs, mergeAtom);
     localAggregateArgs.append(*createLocalAttribute());
     localAggregateArgs.append(*createAttribute(sortedAtom));
 
@@ -3525,8 +3525,8 @@ IHqlExpression * ThorHqlTransformer::normalizeTableToAggregate(IHqlExpression *
 
     HqlExprArray aggregateAttrs;
     unwindAttributes(aggregateAttrs, expr);
-    removeProperty(aggregateAttrs, aggregateAtom);
-    removeProperty(aggregateAttrs, fewAtom);
+    removeAttribute(aggregateAttrs, aggregateAtom);
+    removeAttribute(aggregateAttrs, fewAtom);
     if (!expr->hasAttribute(localAtom) && newGroupBy && !isGrouped(dataset) && isPartitionedForGroup(dataset, newGroupBy, true))
         aggregateAttrs.append(*createLocalAttribute());
 
@@ -3572,7 +3572,7 @@ IHqlExpression * ThorHqlTransformer::normalizeTableGrouping(IHqlExpression * exp
         }
 
         if (useHashAggregate && group->isConstant() && !translator.targetThor())
-            return removeProperty(expr, fewAtom);
+            return removeAttribute(expr, fewAtom);
 
         if (!expr->hasAttribute(manyAtom) && !expr->hasAttribute(sortedAtom))
         {
@@ -8820,7 +8820,7 @@ IHqlExpression * HqlLinkedChildRowTransformer::createTransformedBody(IHqlExpress
                 if (expr->hasAttribute(embeddedAtom))
                 {
                     OwnedHqlExpr transformed = QuickHqlTransformer::createTransformedBody(expr);
-                    return removeProperty(transformed, embeddedAtom);
+                    return removeAttribute(transformed, embeddedAtom);
                 }
                 if (implicitLinkedChildRows && !expr->hasAttribute(_linkCounted_Atom))
                 {
@@ -9395,7 +9395,7 @@ IHqlExpression * HqlScopeTagger::createTransformed(IHqlExpression * expr)
             if (!sorted || queryAttribute(_implicitSorted_Atom, children))
             {
                 IHqlExpression * dataset = &children.item(0);
-                removeProperty(children, _implicitSorted_Atom);
+                removeAttribute(children, _implicitSorted_Atom);
 
                 if (sorted)
                     children.zap(*sorted);

ecl/hqlcpp/hqlwcpp.cpp

@@ -576,7 +576,7 @@ bool HqlCppWriter::generateFunctionPrototype(IHqlExpression * funcdef)
 {
     IHqlExpression *body = funcdef->queryChild(0);
     StringBuffer name;
-    getProperty(body, entrypointAtom, name);
+    getAttribute(body, entrypointAtom, name);
     if (!name.length())
         name.append(funcdef->queryName());
     return generateFunctionPrototype(funcdef, name);
@@ -995,7 +995,7 @@ void HqlCppWriter::generateFunctionReturnType(StringBuffer & params, ITypeInfo *
     //      if (hasConstModifier(retType))
     //          params.append("const ");
             params.append("byte * * & __result");
-            if (hasNonNullRecord(retType) && getBoolProperty(attrs, allocatorAtom, true))
+            if (hasNonNullRecord(retType) && getBoolAttribute(attrs, allocatorAtom, true))
                 params.append(", IEngineRowAllocator * _resultAllocator");
         }
         else
@@ -1010,7 +1010,7 @@ void HqlCppWriter::generateFunctionReturnType(StringBuffer & params, ITypeInfo *
     case type_set:
         {
             out.append("void");
-            if (!getBoolProperty(attrs, oldSetFormatAtom))
+            if (!getBoolAttribute(attrs, oldSetFormatAtom))
             {
                 params.append("bool & __isAllResult,");
                 params.append("size32_t & __lenResult,");
@@ -1135,10 +1135,10 @@ StringBuffer & HqlCppWriter::generateExprCpp(IHqlExpression * expr)
                 }
                 if (props->hasAttribute(namespaceAtom))
                 {
-                    getProperty(props, namespaceAtom, out);
+                    getAttribute(props, namespaceAtom, out);
                     out.append("::");
                 }
-                getProperty(props, entrypointAtom, out);
+                getAttribute(props, entrypointAtom, out);
                 out.append('(');
                 if (props->hasAttribute(contextAtom))
                 {