--- var.c 2001/11/20 15:46:35 1.36
+++ var.c 2001/12/03 10:51:27 1.37
@@ -45,6 +45,9 @@
'$', /* varinit */
'{', /* startdelim */
'}', /* enddelim */
+ '[', /* startindex */
+ ']', /* endindex */
+ '#', /* current_index */
'\\', /* escape */
"a-zA-Z0-9_" /* namechars */
};
@@ -90,6 +93,7 @@
"submatch referred to in replace string does not exist in search string", /* VAR_ERR_SUBMATCH_OUT_OF_RANGE = -34 */
"invalid argument", /* VAR_ERR_INVALID_ARGUMENT = -35 */
"incomplete quoted pair" /* VAR_ERR_INCOMPLETE_QUOTED_PAIR = -36 */
+ "lookup function does not support variable arrays" /* VAR_ERR_ARRAY_LOOKUPS_ARE_UNSUPPORTED = -37 */
};
rc = 0 - rc;
@@ -561,7 +565,7 @@
/* Use the lookup callback to get the variable's contents. */
- rc = (*lookup) (lookup_context, name.begin, name.end - name.begin,
+ rc = (*lookup) (lookup_context, name.begin, name.end - name.begin, 0,
&data, &len, &buffer_size);
if (rc < 0)
goto error_return;
@@ -663,7 +667,7 @@
if (rc < 0)
return rc;
if (rc > 0) {
- rc2 = (*lookup) (lookup_context, p, rc, &data, &len, &buffer_size);
+ rc2 = (*lookup) (lookup_context, p, rc, 0, &data, &len, &buffer_size);
if (rc2 < 0)
return rc2;
if (rc2 == 0) {
|