|
@@ -253,7 +253,7 @@ public:
|
|
|
virtual IHqlExpression * cloneAllAnnotations(IHqlExpression * body) { return LINK(body); }
|
|
|
virtual void unwindList(HqlExprArray &dst, node_operator);
|
|
|
|
|
|
- virtual IIdAtom * queryFullModuleId() const { return NULL; }
|
|
|
+ virtual IIdAtom * queryFullContainerId() const { return NULL; }
|
|
|
virtual ISourcePath * querySourcePath() const { return NULL; }
|
|
|
|
|
|
virtual IInterface * queryTransformExtra();
|
|
@@ -529,7 +529,7 @@ public:
|
|
|
virtual IHqlExpression * clone(HqlExprArray &);
|
|
|
virtual IHqlExpression * cloneAnnotation(IHqlExpression * body) = 0;
|
|
|
virtual IHqlExpression * cloneAllAnnotations(IHqlExpression * body);
|
|
|
- virtual IIdAtom * queryFullModuleId() const;
|
|
|
+ virtual IIdAtom * queryFullContainerId() const;
|
|
|
virtual bool isFullyBound() const;
|
|
|
virtual IHqlExpression *addOperand(IHqlExpression *);
|
|
|
virtual StringBuffer& getTextBuf(StringBuffer& buf);
|
|
@@ -552,7 +552,7 @@ public:
|
|
|
|
|
|
virtual IAtom * queryName() const { return id->lower(); }
|
|
|
virtual IIdAtom * queryId() const { return id; }
|
|
|
- virtual IIdAtom * queryFullModuleId() const { return moduleId; }
|
|
|
+ virtual IIdAtom * queryFullContainerId() const { return moduleId; }
|
|
|
virtual IHqlExpression *queryFunctionDefinition() const;
|
|
|
virtual unsigned getSymbolFlags() const;
|
|
|
|
|
@@ -1006,6 +1006,7 @@ class HQL_API CHqlScope : public CHqlExpressionWithType, implements IHqlScope, i
|
|
|
protected:
|
|
|
Owned<IFileContents> text;
|
|
|
IIdAtom * id;
|
|
|
+ IIdAtom * containerId;
|
|
|
StringAttr fullName; //Fully qualified name of this nested module E.g.: PARENT.CHILD.GRANDCHILD
|
|
|
SymbolTable symbols;
|
|
|
|
|
@@ -1037,6 +1038,7 @@ public:
|
|
|
virtual IAtom * queryName() const {return id->lower();}
|
|
|
virtual IIdAtom * queryId() const { return id; }
|
|
|
virtual const char * queryFullName() const { return fullName; }
|
|
|
+ virtual IIdAtom * queryFullContainerId() const { return containerId; }
|
|
|
virtual ISourcePath * querySourcePath() const { return text ? text->querySourcePath() : NULL; }
|
|
|
|
|
|
virtual void ensureSymbolsDefined(HqlLookupContext & ctx) { }
|
|
@@ -1089,6 +1091,7 @@ public:
|
|
|
virtual void deserialize(MemoryBuffer &) { UNIMPLEMENTED; }
|
|
|
|
|
|
protected:
|
|
|
+ void initContainer();
|
|
|
void throwRecursiveError(IIdAtom * id);
|
|
|
};
|
|
|
|