Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugs 46134. Use caret ('^') character to concatenate text. Fix nsPromiseSubstring usage. r=rjc. Bug 46686. Update container attrs *before* we nuke the bestmatch. r=rjc

Browse Source
This commit is contained in:
waterson%netscape.com 2000-09-12 23:12:40 +00:00
parent 3d68e7a779
commit 083b26da8d
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,9 +38,14 @@
. Improve names of stuff
. We're a bit schizophrenic about whether we want to use
nsXULTemplateBuilder's members to determine the container & member
variables, or if we want to use the mRule member of a Match. Which
is right? Is there redundancy here?
To turn on logging for this module, set:
NSPR_LOG_MODULES nsRDFGenericBuilder:5
NSPR_LOG_MODULES nsXULTemplateBuilder:5
*/
@ -4630,6 +4635,10 @@ nsXULTemplateBuilder::FireNewlyMatchedRules(const ClusterKeySet& aNewKeys)
content = VALUE_TO_ICONTENT(value);
// Update the 'empty' attribute. Do this *first*, because
// we may decide to nuke bestmatch in a minute...
SetContainerAttrs(content, bestmatch);
// See if we've built the container contents for "content"
// yet. If not, we don't need to build any content. This
// happens, for example, if we recieve an assertion on a
@ -4656,9 +4665,6 @@ nsXULTemplateBuilder::FireNewlyMatchedRules(const ClusterKeySet& aNewKeys)
// never saw this match.
matches->Remove(bestmatch);
}
// Update the 'empty' attribute
SetContainerAttrs(content, bestmatch);
}
}
@ -4981,16 +4987,28 @@ nsXULTemplateBuilder::SubstituteText(Match& aMatch,
// Construct a substring that is the symbol we need to look up
// in the rule's symbol table. The symbol is terminated by a
// space character, or the end of the string, whichever comes
// first. (The space character is consumed.)
// space character, a caret, or the end of the string,
// whichever comes first.
PRInt32 first = backup;
while (i < len && aAttributeValue[i] != PRUnichar(' '))
PRUnichar c;
while (i < len) {
c = aAttributeValue[i];
if ((c == PRUnichar(' ')) || (c == PRUnichar('^')))
break;
++i;
}
PRInt32 last = i;
nsPromiseSubstring<PRUnichar> symbol(aAttributeValue, first, last);
// Back up so we don't consume the terminating character
// *unless* the terminating character was a caret: the caret
// means "concatenate with no space in between".
if (c != PRUnichar('^'))
--i;
nsPromiseSubstring<PRUnichar> symbol(aAttributeValue, first, last - first);
// The symbol "rdf:*" is special, and means "this guy's URI"
PRInt32 var = 0;

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

@ -38,9 +38,14 @@
. Improve names of stuff
. We're a bit schizophrenic about whether we want to use
nsXULTemplateBuilder's members to determine the container & member
variables, or if we want to use the mRule member of a Match. Which
is right? Is there redundancy here?
To turn on logging for this module, set:
NSPR_LOG_MODULES nsRDFGenericBuilder:5
NSPR_LOG_MODULES nsXULTemplateBuilder:5
*/
@ -4630,6 +4635,10 @@ nsXULTemplateBuilder::FireNewlyMatchedRules(const ClusterKeySet& aNewKeys)
content = VALUE_TO_ICONTENT(value);
// Update the 'empty' attribute. Do this *first*, because
// we may decide to nuke bestmatch in a minute...
SetContainerAttrs(content, bestmatch);
// See if we've built the container contents for "content"
// yet. If not, we don't need to build any content. This
// happens, for example, if we recieve an assertion on a
@ -4656,9 +4665,6 @@ nsXULTemplateBuilder::FireNewlyMatchedRules(const ClusterKeySet& aNewKeys)
// never saw this match.
matches->Remove(bestmatch);
}
// Update the 'empty' attribute
SetContainerAttrs(content, bestmatch);
}
}
@ -4981,16 +4987,28 @@ nsXULTemplateBuilder::SubstituteText(Match& aMatch,
// Construct a substring that is the symbol we need to look up
// in the rule's symbol table. The symbol is terminated by a
// space character, or the end of the string, whichever comes
// first. (The space character is consumed.)
// space character, a caret, or the end of the string,
// whichever comes first.
PRInt32 first = backup;
while (i < len && aAttributeValue[i] != PRUnichar(' '))
PRUnichar c;
while (i < len) {
c = aAttributeValue[i];
if ((c == PRUnichar(' ')) || (c == PRUnichar('^')))
break;
++i;
}
PRInt32 last = i;
nsPromiseSubstring<PRUnichar> symbol(aAttributeValue, first, last);
// Back up so we don't consume the terminating character
// *unless* the terminating character was a caret: the caret
// means "concatenate with no space in between".
if (c != PRUnichar('^'))
--i;
nsPromiseSubstring<PRUnichar> symbol(aAttributeValue, first, last - first);
// The symbol "rdf:*" is special, and means "this guy's URI"
PRInt32 var = 0;