Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out changes: they broke egcs.

Browse Source
This commit is contained in:
waterson%netscape.com 2000-04-25 01:28:09 +00:00
parent e2f6dc5f92
commit 5051f62fad
6 changed files with 462 additions and 900 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/xul/templates/src/nsRuleNetwork.cpp
View File

@ -598,7 +598,7 @@ RootNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
}
nsresult
RootNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
RootNode::Constrain(InstantiationSet& aInstantiations)
{
return NS_OK;
}
@ -676,7 +676,7 @@ JoinNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
if (! instantiations.Empty()) {
// propogate consistency checking back up the tree
rv = test->Constrain(instantiations, aClosure);
rv = test->Constrain(instantiations);
if (NS_FAILED(rv)) return rv;
NodeSet::Iterator last = mKids.Last();
@ -753,7 +753,7 @@ JoinNode::Bind(InstantiationSet& aInstantiations, PRBool* aDidBind)
}
nsresult
JoinNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
JoinNode::Constrain(InstantiationSet& aInstantiations)
{
if (aInstantiations.Empty())
return NS_OK;
@ -782,7 +782,7 @@ JoinNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
last = mLeftParent;
}
rv = first->Constrain(aInstantiations, aClosure);
rv = first->Constrain(aInstantiations);
if (NS_FAILED(rv)) return rv;
if (! didBind) {
@ -792,7 +792,7 @@ JoinNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
NS_ASSERTION(didBind, "uh oh, still no binding");
}
rv = last->Constrain(aInstantiations, aClosure);
rv = last->Constrain(aInstantiations);
if (NS_FAILED(rv)) return rv;
if (! didBind) {
@ -865,7 +865,7 @@ TestNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
nsresult rv;
InstantiationSet instantiations = aInstantiations;
rv = FilterInstantiations(instantiations, aClosure);
rv = FilterInstantiations(instantiations);
if (NS_FAILED(rv)) return rv;
if (! instantiations.Empty()) {
@ -879,17 +879,17 @@ TestNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
nsresult
TestNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
TestNode::Constrain(InstantiationSet& aInstantiations)
{
nsresult rv;
rv = FilterInstantiations(aInstantiations, aClosure);
rv = FilterInstantiations(aInstantiations);
if (NS_FAILED(rv)) return rv;
if (! aInstantiations.Empty()) {
// if we still have instantiations, then ride 'em on up to the
// parent to narrow them.
rv = mParent->Constrain(aInstantiations, aClosure);
rv = mParent->Constrain(aInstantiations);
}
else {
rv = NS_OK;

12
content/xul/templates/src/nsRuleNetwork.h
View File

@ -137,7 +137,7 @@ public:
virtual const char* Type() const = 0;
virtual PLHashNumber Hash() const = 0;
virtual PRBool Equals(const MemoryElement& aElement) const = 0;
virtual MemoryElement* Clone(void* aPool) const = 0;
virtual MemoryElement* Clone() const = 0;
PRBool operator==(const MemoryElement& aMemoryElement) const {
return Equals(aMemoryElement);
@ -719,7 +719,7 @@ class InnerNode : public ReteNode
{
public:
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure) = 0;
virtual nsresult Constrain(InstantiationSet& aInstantiations) = 0;
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const = 0;
@ -744,7 +744,7 @@ public:
virtual nsresult Propogate(const InstantiationSet& aInstantiations, void* aClosure);
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure);
virtual nsresult Constrain(InstantiationSet& aInstantiations);
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const;
@ -773,7 +773,7 @@ public:
virtual nsresult Propogate(const InstantiationSet& aInstantiations, void* aClosure);
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure);
virtual nsresult Constrain(InstantiationSet& aInstantiations);
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const;
@ -808,10 +808,10 @@ public:
virtual nsresult Propogate(const InstantiationSet& aInstantiations, void* aClosure);
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure);
virtual nsresult Constrain(InstantiationSet& aInstantiations);
// instantiation filtering
virtual nsresult FilterInstantiations(InstantiationSet& aInstantiations, void* aClosure) const = 0; //XXX probably better named "ApplyConstraints" or "Discrminiate" or something
virtual nsresult FilterInstantiations(InstantiationSet& aInstantiations) const = 0; //XXX probably better named "ApplyConstraints" or "Discrminiate" or something
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const;

651
content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

File diff suppressed because it is too large Load Diff

18
rdf/content/src/nsRuleNetwork.cpp
View File

@ -598,7 +598,7 @@ RootNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
}
nsresult
RootNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
RootNode::Constrain(InstantiationSet& aInstantiations)
{
return NS_OK;
}
@ -676,7 +676,7 @@ JoinNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
if (! instantiations.Empty()) {
// propogate consistency checking back up the tree
rv = test->Constrain(instantiations, aClosure);
rv = test->Constrain(instantiations);
if (NS_FAILED(rv)) return rv;
NodeSet::Iterator last = mKids.Last();
@ -753,7 +753,7 @@ JoinNode::Bind(InstantiationSet& aInstantiations, PRBool* aDidBind)
}
nsresult
JoinNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
JoinNode::Constrain(InstantiationSet& aInstantiations)
{
if (aInstantiations.Empty())
return NS_OK;
@ -782,7 +782,7 @@ JoinNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
last = mLeftParent;
}
rv = first->Constrain(aInstantiations, aClosure);
rv = first->Constrain(aInstantiations);
if (NS_FAILED(rv)) return rv;
if (! didBind) {
@ -792,7 +792,7 @@ JoinNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
NS_ASSERTION(didBind, "uh oh, still no binding");
}
rv = last->Constrain(aInstantiations, aClosure);
rv = last->Constrain(aInstantiations);
if (NS_FAILED(rv)) return rv;
if (! didBind) {
@ -865,7 +865,7 @@ TestNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
nsresult rv;
InstantiationSet instantiations = aInstantiations;
rv = FilterInstantiations(instantiations, aClosure);
rv = FilterInstantiations(instantiations);
if (NS_FAILED(rv)) return rv;
if (! instantiations.Empty()) {
@ -879,17 +879,17 @@ TestNode::Propogate(const InstantiationSet& aInstantiations, void* aClosure)
nsresult
TestNode::Constrain(InstantiationSet& aInstantiations, void* aClosure)
TestNode::Constrain(InstantiationSet& aInstantiations)
{
nsresult rv;
rv = FilterInstantiations(aInstantiations, aClosure);
rv = FilterInstantiations(aInstantiations);
if (NS_FAILED(rv)) return rv;
if (! aInstantiations.Empty()) {
// if we still have instantiations, then ride 'em on up to the
// parent to narrow them.
rv = mParent->Constrain(aInstantiations, aClosure);
rv = mParent->Constrain(aInstantiations);
}
else {
rv = NS_OK;

12
rdf/content/src/nsRuleNetwork.h
View File

@ -137,7 +137,7 @@ public:
virtual const char* Type() const = 0;
virtual PLHashNumber Hash() const = 0;
virtual PRBool Equals(const MemoryElement& aElement) const = 0;
virtual MemoryElement* Clone(void* aPool) const = 0;
virtual MemoryElement* Clone() const = 0;
PRBool operator==(const MemoryElement& aMemoryElement) const {
return Equals(aMemoryElement);
@ -719,7 +719,7 @@ class InnerNode : public ReteNode
{
public:
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure) = 0;
virtual nsresult Constrain(InstantiationSet& aInstantiations) = 0;
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const = 0;
@ -744,7 +744,7 @@ public:
virtual nsresult Propogate(const InstantiationSet& aInstantiations, void* aClosure);
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure);
virtual nsresult Constrain(InstantiationSet& aInstantiations);
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const;
@ -773,7 +773,7 @@ public:
virtual nsresult Propogate(const InstantiationSet& aInstantiations, void* aClosure);
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure);
virtual nsresult Constrain(InstantiationSet& aInstantiations);
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const;
@ -808,10 +808,10 @@ public:
virtual nsresult Propogate(const InstantiationSet& aInstantiations, void* aClosure);
// "upward" propogations
virtual nsresult Constrain(InstantiationSet& aInstantiations, void* aClosure);
virtual nsresult Constrain(InstantiationSet& aInstantiations);
// instantiation filtering
virtual nsresult FilterInstantiations(InstantiationSet& aInstantiations, void* aClosure) const = 0; //XXX probably better named "ApplyConstraints" or "Discrminiate" or something
virtual nsresult FilterInstantiations(InstantiationSet& aInstantiations) const = 0; //XXX probably better named "ApplyConstraints" or "Discrminiate" or something
virtual nsresult GetAncestorVariables(VariableSet& aVariables) const;

651
rdf/content/src/nsXULTemplateBuilder.cpp
View File

File diff suppressed because it is too large Load Diff