diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2011-10-01 22:33:10 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2011-10-01 22:33:10 -0700 |
| commit | 28f2adb77ce853d675b964f427b16358343444d1 (patch) | |
| tree | ec306883dfb55900380979ba9a85b0572a785130 /match.c | |
| parent | fb042038bc10452110056efc99dac211aa4a6dc3 (diff) | |
| download | txr-28f2adb77ce853d675b964f427b16358343444d1.tar.gz txr-28f2adb77ce853d675b964f427b16358343444d1.tar.bz2 txr-28f2adb77ce853d675b964f427b16358343444d1.zip | |
Maintaining C++ compiling (except for two issues that will
need another commit).
* filter.c: Include "gc.h" for prototype of protect.
(struct filter_pair): Use const wchar_t *, so we can assign
literals.
(html_hex_continue): Ditto.
* lib.c (and): Function renamed to andf, since and is a C++
operator.
* lib.h (and): Declaration renamed.
* match.c (match_files): Use of and updated to andf.
Diffstat (limited to 'match.c')
| -rw-r--r-- | match.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1942,18 +1942,18 @@ repeat_spec_same_data: sem_error(spec_linenum, lit("deffilter: ~a is not a symbol"), first(first_spec), nao); - if (!all_satisfy(table, and(func_n1(listp), - chain(func_n1(length), - bind2(func_n2(eq), two), - nao), - chain(func_n1(first), - func_n1(stringp), - nao), - chain(func_n1(second), - func_n1(stringp), - nao), - nao), - nil)) + if (!all_satisfy(table, andf(func_n1(listp), + chain(func_n1(length), + bind2(func_n2(eq), two), + nao), + chain(func_n1(first), + func_n1(stringp), + nao), + chain(func_n1(second), + func_n1(stringp), + nao), + nao), + nil)) sem_error(spec_linenum, lit("deffilter arguments must be string pairs"), nao); |