Geoff Hutchison (ghutchis@wso.williams.edu)
Wed, 20 Jan 1999 20:55:13 -0400
* List: htdig3-dev@sob.htdig.org
Last week, Gilles noted a difference between the variable expansion
documentation and the actual code--braces wouldn't be expanded.
Now I may be naive, but wouldn't this fix the problem? This patch makes
braces equivalent to parentheses.
-Geoff
P.S. In sending this patch to the list, I found a typo. :-( I fixed it.
Index: Display.cc
===================================================================
RCS file: /opt/htdig/cvs/htdig3/htsearch/Display.cc,v
retrieving revision 1.35
diff -c -3 -p -r1.35 Display.cc
*** Display.cc 1999/01/20 19:18:54 1.35
--- Display.cc 1999/01/21 01:58:29
*************** Display::expandVariables(char *str)
*** 873,879 ****
}
break;
case 3:
! if (*str == '(')
state = 4;
else if (isalpha(*str) || *str == '_')
{
--- 874,880 ----
}
break;
case 3:
! if (*str == '(' || *str == '{')
state = 4;
else if (isalpha(*str) || *str == '_')
{
*************** Display::expandVariables(char *str)
*** 884,890 ****
state = 0;
break;
case 4:
! if (*str == ')')
state = 2;
else if (isalpha(*str) || *str == '_')
var << *str;
--- 885,891 ----
state = 0;
break;
case 4:
! if (*str == ')' || *str == '}')
state = 2;
else if (isalpha(*str) || *str == '_')
var << *str;
*************** Display::expandVariables(char *str)
*** 909,915 ****
//
outputVariable(var);
var = "";
! if (*str == '(')
state = 4;
else if (isalpha(*str) || *str == '_')
{
--- 910,916 ----
//
outputVariable(var);
var = "";
! if (*str == '(' || *str == '{')
state = 4;
else if (isalpha(*str) || *str == '_')
{
This archive was generated by hypermail 2.0b3 on Thu Feb 04 1999 - 22:24:20 PST