updated: to the new EZC api (ezc functions can be methods of some special objects)

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1012 e52654a7-88a9-db11-a3e9-0013d4bc506e
2015-06-14 18:24:08 +00:00
parent d8451ceaa0
commit f54df8d600
20 changed files with 948 additions and 836 deletions
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -1,9 +1,9 @@
 # DO NOT DELETE

 adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-adduser.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-adduser.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
+adduser.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
+adduser.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
 adduser.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
 adduser.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
 adduser.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
@@ -64,17 +64,18 @@ changepatterns.o: ../../pikotools/membuffer/membuffer.h
 changepatterns.o: ../../pikotools/textstream/types.h localefilter.h
 changepatterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
 changepatterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-changepatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-changepatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
-changepatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
-changepatterns.o: misc.h htmltextstream.h ../../winix/core/textstream.h
+changepatterns.o: ../../ezc/src/cache.h ../../ezc/src/functions.h
+changepatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h
+changepatterns.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h
+changepatterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h
+changepatterns.o: ../../winix/core/textstream.h
 config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-config.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+config.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 config.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-config.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-config.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-config.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-config.o: ../../pikotools/textstream/types.h
+config.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+config.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+config.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+config.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 config.o: ../../pikotools/textstream/textstream.h
 config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 config.o: ../../pikotools/convert/convert.h
@@ -120,10 +121,11 @@ config.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 config.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 currentdate.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 currentdate.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-currentdate.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-currentdate.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
-currentdate.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
-currentdate.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+currentdate.o: ../../ezc/src/cache.h ../../ezc/src/functions.h
+currentdate.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h
+currentdate.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h
+currentdate.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+currentdate.o: ../../pikotools/space/spaceparser.h
 currentdate.o: ../../pikotools/space/space.h
 currentdate.o: ../../pikotools/textstream/types.h
 currentdate.o: ../../pikotools/textstream/textstream.h
@@ -202,12 +204,12 @@ currentdate.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
 currentdate.o: ../../winix/functions/who.h ../../winix/functions/vim.h
 currentdate.o: miscspace.h
 dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-dir.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+dir.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 dir.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-dir.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-dir.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-dir.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-dir.o: ../../pikotools/textstream/types.h
+dir.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+dir.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+dir.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+dir.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 dir.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 dir.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 dir.o: ../../pikotools/convert/inttostr.h
@@ -273,12 +275,12 @@ dir.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h
 dir.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
 dir.o: ../../winix/functions/who.h ../../winix/functions/vim.h miscspace.h
 doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-doc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+doc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 doc.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-doc.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-doc.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-doc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-doc.o: ../../pikotools/textstream/types.h
+doc.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+doc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+doc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+doc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 doc.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 doc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 doc.o: ../../pikotools/convert/inttostr.h
@@ -322,12 +324,12 @@ doc.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 doc.o: ../../winix/core/request.h ../../winix/core/misc.h
 doc.o: ../../winix/core/winix_const.h
 env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-env.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+env.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 env.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-env.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-env.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-env.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-env.o: ../../pikotools/textstream/types.h
+env.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+env.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+env.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+env.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 env.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 env.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 env.o: ../../pikotools/convert/inttostr.h
@@ -393,9 +395,9 @@ env.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h
 env.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
 env.o: ../../winix/functions/who.h ../../winix/functions/vim.h
 filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-filters.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-filters.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
+filters.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
+filters.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+filters.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
 filters.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
 filters.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
 filters.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
@@ -445,9 +447,9 @@ filters.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 filters.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 filters.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 generic.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-generic.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-generic.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-generic.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
+generic.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
+generic.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+generic.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
 generic.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
 generic.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
 generic.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
@@ -508,17 +510,17 @@ htmltextstream.o: ../../pikotools/convert/inttostr.h
 htmltextstream.o: ../../pikotools/membuffer/membuffer.h
 htmltextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
 htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-htmltextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+htmltextstream.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 htmltextstream.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-htmltextstream.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-htmltextstream.o: ../../ezc/src/patternparser.h
+htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
 indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h
 indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 indexpatterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-indexpatterns.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-indexpatterns.o: ../../ezc/src/patternparser.h patterns.h locale.h
-indexpatterns.o: ../../pikotools/space/spaceparser.h
+indexpatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+indexpatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
+indexpatterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h
 indexpatterns.o: ../../pikotools/space/space.h
 indexpatterns.o: ../../pikotools/textstream/types.h
 indexpatterns.o: ../../pikotools/textstream/textstream.h
@@ -532,12 +534,12 @@ indexpatterns.o: ../../winix/core/log.h ../../winix/core/textstream.h
 indexpatterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h
 indexpatterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h
 insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-insert.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+insert.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 insert.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-insert.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-insert.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-insert.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-insert.o: ../../pikotools/textstream/types.h
+insert.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+insert.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+insert.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+insert.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 insert.o: ../../pikotools/textstream/textstream.h
 insert.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 insert.o: ../../pikotools/convert/convert.h
@@ -584,12 +586,12 @@ insert.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 insert.o: ../../winix/core/request.h ../../winix/core/misc.h
 insert.o: ../../winix/core/winix_const.h
 ipban.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-ipban.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+ipban.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 ipban.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-ipban.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-ipban.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-ipban.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-ipban.o: ../../pikotools/textstream/types.h
+ipban.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+ipban.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+ipban.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+ipban.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 ipban.o: ../../pikotools/textstream/textstream.h
 ipban.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 ipban.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -658,12 +660,12 @@ ipban.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 ipban.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 ipban.o: ../../winix/functions/vim.h
 item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-item.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+item.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 item.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-item.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-item.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-item.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-item.o: ../../pikotools/textstream/types.h
+item.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+item.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+item.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+item.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 item.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 item.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 item.o: ../../pikotools/convert/inttostr.h
@@ -708,12 +710,12 @@ item.o: ../../winix/core/request.h ../../winix/core/misc.h
 item.o: ../../winix/core/winix_const.h ../../winix/core/bbcodeparser.h
 item.o: miscspace.h
 last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-last.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+last.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 last.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-last.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-last.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-last.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-last.o: ../../pikotools/textstream/types.h
+last.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+last.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+last.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+last.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 last.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 last.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 last.o: ../../pikotools/convert/inttostr.h
@@ -767,9 +769,8 @@ locale.o: ../../pikotools/textstream/types.h ../../winix/core/log.h
 locale.o: ../../winix/core/textstream.h ../../winix/core/logmanipulators.h
 locale.o: ../../winix/core/slog.h ../../winix/core/cur.h
 locale.o: ../../winix/templates/locale.h ../../winix/core/misc.h
-locale.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-locale.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-locale.o: ../../winix/core/requesttypes.h ../../winix/core/winix_const.h
+locale.o: ../../ezc/src/item.h ../../winix/core/requesttypes.h
+locale.o: ../../pikotools/utf8/utf8.h ../../winix/core/winix_const.h
 localefilter.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
 localefilter.o: ../../pikotools/space/space.h
 localefilter.o: ../../pikotools/textstream/types.h
@@ -780,19 +781,19 @@ localefilter.o: ../../pikotools/convert/inttostr.h
 localefilter.o: ../../pikotools/membuffer/membuffer.h
 localefilter.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
 localefilter.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+localefilter.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 localefilter.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-localefilter.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-localefilter.o: ../../ezc/src/patternparser.h ../core/misc.h
-localefilter.o: ../../winix/core/requesttypes.h
+localefilter.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+localefilter.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
+localefilter.o: ../core/misc.h ../../winix/core/requesttypes.h
 localefilter.o: ../../winix/core/winix_const.h
 login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-login.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+login.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 login.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-login.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-login.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-login.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-login.o: ../../pikotools/textstream/types.h
+login.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+login.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+login.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+login.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 login.o: ../../pikotools/textstream/textstream.h
 login.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 login.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -860,9 +861,9 @@ login.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 login.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 login.o: ../../winix/functions/vim.h
 ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-ls.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+ls.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 ls.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-ls.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
+ls.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h ../../ezc/src/pattern.h
 ls.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
 ls.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 ls.o: ../../pikotools/textstream/types.h
@@ -908,12 +909,12 @@ ls.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 ls.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 ls.o: ../../winix/core/request.h
 man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-man.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+man.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 man.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-man.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-man.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-man.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-man.o: ../../pikotools/textstream/types.h
+man.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+man.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+man.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+man.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 man.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 man.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 man.o: ../../pikotools/convert/inttostr.h
@@ -979,12 +980,12 @@ man.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h
 man.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
 man.o: ../../winix/functions/who.h ../../winix/functions/vim.h
 misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-misc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+misc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 misc.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-misc.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-misc.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-misc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-misc.o: ../../pikotools/textstream/types.h
+misc.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+misc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+misc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+misc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 misc.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 misc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 misc.o: ../../pikotools/convert/inttostr.h
@@ -1029,10 +1030,11 @@ misc.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 misc.o: ../../winix/core/request.h
 miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 miscspace.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
-miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
-miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+miscspace.o: ../../ezc/src/cache.h ../../ezc/src/functions.h
+miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h
+miscspace.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h
+miscspace.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+miscspace.o: ../../pikotools/space/spaceparser.h
 miscspace.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 miscspace.o: ../../pikotools/textstream/textstream.h
 miscspace.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -1079,12 +1081,12 @@ miscspace.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 miscspace.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 miscspace.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-mount.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+mount.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 mount.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-mount.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-mount.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-mount.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-mount.o: ../../pikotools/textstream/types.h
+mount.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+mount.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+mount.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+mount.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 mount.o: ../../pikotools/textstream/textstream.h
 mount.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 mount.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -1131,12 +1133,12 @@ mount.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 mount.o: ../../winix/core/mounts.h
 passwd.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
 passwd.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-passwd.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+passwd.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 passwd.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-passwd.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-passwd.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-passwd.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-passwd.o: ../../pikotools/textstream/types.h
+passwd.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+passwd.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+passwd.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+passwd.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 passwd.o: ../../pikotools/textstream/textstream.h
 passwd.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 passwd.o: ../../pikotools/convert/convert.h
@@ -1192,12 +1194,12 @@ patterncacher.o: ../../pikotools/convert/inttostr.h
 patterncacher.o: ../../pikotools/membuffer/membuffer.h
 patterncacher.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
 patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-patterncacher.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+patterncacher.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 patterncacher.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-patterncacher.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-patterncacher.o: ../../ezc/src/patternparser.h htmltextstream.h
-patterncacher.o: ../../winix/core/textstream.h ../../winix/core/log.h
-patterncacher.o: ../../winix/core/textstream.h
+patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
+patterncacher.o: htmltextstream.h ../../winix/core/textstream.h
+patterncacher.o: ../../winix/core/log.h ../../winix/core/textstream.h
 patterncacher.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h
 patterncacher.o: ../../winix/core/cur.h ../../winix/templates/locale.h
 patterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h
@@ -1209,21 +1211,21 @@ patterns.o: ../../pikotools/convert/inttostr.h
 patterns.o: ../../pikotools/membuffer/membuffer.h
 patterns.o: ../../pikotools/textstream/types.h localefilter.h
 patterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-patterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-patterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
+patterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
+patterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
 patterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
 patterns.o: htmltextstream.h ../../winix/core/textstream.h
 patterns.o: ../../winix/core/log.h ../../winix/core/textstream.h
 patterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h
 patterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h
 priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-priv.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+priv.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 priv.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-priv.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-priv.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-priv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-priv.o: ../../pikotools/textstream/types.h
+priv.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+priv.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+priv.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+priv.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 priv.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 priv.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 priv.o: ../../pikotools/convert/inttostr.h
@@ -1291,9 +1293,9 @@ priv.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 priv.o: ../../winix/functions/vim.h
 rebus.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
 rebus.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-rebus.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-rebus.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-rebus.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
+rebus.o: ../../ezc/src/item.h ../../ezc/src/cache.h ../../ezc/src/functions.h
+rebus.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h
+rebus.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h
 rebus.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
 rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 rebus.o: ../../pikotools/textstream/types.h
@@ -1340,12 +1342,12 @@ rebus.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 rebus.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 rebus.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 server.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-server.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+server.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 server.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-server.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-server.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-server.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-server.o: ../../pikotools/textstream/types.h
+server.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+server.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+server.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+server.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 server.o: ../../pikotools/textstream/textstream.h
 server.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 server.o: ../../pikotools/convert/convert.h
@@ -1421,18 +1423,18 @@ slog.o: ../../pikotools/convert/inttostr.h
 slog.o: ../../pikotools/membuffer/membuffer.h
 slog.o: ../../pikotools/textstream/types.h templates.h ../../ezc/src/ezc.h
 slog.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/item.h
-slog.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-slog.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
-slog.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
-slog.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
-slog.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
-slog.o: htmltextstream.h ../../winix/core/textstream.h patterncacher.h
-slog.o: ../../winix/core/item.h indexpatterns.h patterns.h changepatterns.h
-slog.o: ../../winix/core/config.h ../../winix/core/htmlfilter.h
-slog.o: ../../winix/core/cur.h ../../winix/core/request.h
-slog.o: ../../winix/core/requesttypes.h ../../winix/core/error.h
-slog.o: ../../winix/core/config.h ../../winix/core/textstream.h
-slog.o: ../../winix/templates/htmltextstream.h
+slog.o: ../../ezc/src/cache.h ../../ezc/src/functions.h
+slog.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h
+slog.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h
+slog.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+slog.o: ../../pikotools/textstream/types.h htmltextstream.h
+slog.o: ../../winix/core/textstream.h patterncacher.h ../../winix/core/item.h
+slog.o: indexpatterns.h patterns.h changepatterns.h ../../winix/core/config.h
+slog.o: ../../winix/core/htmlfilter.h ../../winix/core/cur.h
+slog.o: ../../winix/core/request.h ../../winix/core/requesttypes.h
+slog.o: ../../winix/core/error.h ../../winix/core/config.h
+slog.o: ../../winix/core/textstream.h ../../winix/templates/htmltextstream.h
 slog.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h
 slog.o: ../../winix/core/user.h ../../winix/core/plugindata.h
 slog.o: ../../winix/core/rebus.h ../../winix/core/ipban.h
@@ -1462,12 +1464,12 @@ slog.o: ../../winix/core/system.h ../../winix/core/sessionidmanager.h
 slog.o: ../../tito/src/base64.h ../../tito/src/aes.h
 slog.o: ../../winix/core/htmlfilter.h
 stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-stat.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+stat.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 stat.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-stat.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-stat.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-stat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-stat.o: ../../pikotools/textstream/types.h
+stat.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+stat.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+stat.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+stat.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 stat.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 stat.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 stat.o: ../../pikotools/convert/inttostr.h
@@ -1511,12 +1513,12 @@ stat.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 stat.o: ../../winix/core/request.h ../../winix/core/misc.h
 stat.o: ../../winix/core/winix_const.h
 sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-sys.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+sys.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 sys.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-sys.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-sys.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-sys.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-sys.o: ../../pikotools/textstream/types.h
+sys.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+sys.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+sys.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+sys.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 sys.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 sys.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 sys.o: ../../pikotools/convert/inttostr.h
@@ -1584,9 +1586,9 @@ sys.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
 sys.o: ../../winix/functions/who.h ../../winix/functions/vim.h
 sys.o: ../../winix/templates/templates.h
 template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-template.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-template.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-template.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
+template.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
+template.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+template.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
 template.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
 template.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
 template.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
@@ -1637,10 +1639,11 @@ template.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 template.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 templates.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
-templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h
-templates.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
-templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+templates.o: ../../ezc/src/cache.h ../../ezc/src/functions.h
+templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h
+templates.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h
+templates.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+templates.o: ../../pikotools/space/spaceparser.h
 templates.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 templates.o: ../../pikotools/textstream/textstream.h
 templates.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -1726,18 +1729,19 @@ textextstream.o: ../../pikotools/convert/inttostr.h
 textextstream.o: ../../pikotools/membuffer/membuffer.h
 textextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h
 textextstream.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-textextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+textextstream.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 textextstream.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-textextstream.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-textextstream.o: ../../ezc/src/patternparser.h htmltextstream.h
+textextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+textextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
+textextstream.o: htmltextstream.h
 upload.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
 upload.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h
-upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+upload.o: ../../ezc/src/item.h ../../ezc/src/cache.h
 upload.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-upload.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-upload.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-upload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-upload.o: ../../pikotools/textstream/types.h
+upload.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+upload.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+upload.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+upload.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 upload.o: ../../pikotools/textstream/textstream.h
 upload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 upload.o: ../../pikotools/convert/convert.h
@@ -1782,12 +1786,12 @@ upload.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 upload.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 upload.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-uptime.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+uptime.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 uptime.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-uptime.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-uptime.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-uptime.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-uptime.o: ../../pikotools/textstream/types.h
+uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+uptime.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+uptime.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+uptime.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 uptime.o: ../../pikotools/textstream/textstream.h
 uptime.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 uptime.o: ../../pikotools/convert/convert.h
@@ -1832,12 +1836,12 @@ uptime.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 uptime.o: ../../winix/core/sessionidmanager.h ../../tito/src/base64.h
 uptime.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-user.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+user.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 user.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-user.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-user.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-user.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-user.o: ../../pikotools/textstream/types.h
+user.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+user.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+user.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+user.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 user.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 user.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 user.o: ../../pikotools/convert/inttostr.h
@@ -1881,12 +1885,12 @@ user.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 user.o: ../../winix/core/request.h ../../winix/core/misc.h
 user.o: ../../winix/core/winix_const.h
 who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-who.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+who.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 who.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-who.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-who.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-who.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-who.o: ../../pikotools/textstream/types.h
+who.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+who.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+who.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+who.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 who.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
 who.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 who.o: ../../pikotools/convert/inttostr.h
@@ -1930,12 +1934,12 @@ who.o: ../../tito/src/aes.h ../../winix/core/htmlfilter.h
 who.o: ../../winix/core/request.h ../../winix/core/misc.h
 who.o: ../../winix/core/winix_const.h
 winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-winix.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+winix.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h
 winix.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
-winix.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h
-winix.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
-winix.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-winix.o: ../../pikotools/textstream/types.h
+winix.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h
+winix.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+winix.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+winix.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 winix.o: ../../pikotools/textstream/textstream.h
 winix.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 winix.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
--- a/templates/patterncacher.cpp
+++ b/templates/patterncacher.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2015, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@ PatternCacher::PatternCacher()
 	how_many_delete      = 3;
 	ezc_fun              = 0;
 	ezc_blocks           = 0;
+	ezc_obj              = 0;
 }


@@ -58,6 +59,13 @@ void PatternCacher::SetEzcBlocks(Ezc::Blocks * blocks)
 	ezc_blocks = blocks;
 }

+
+void PatternCacher::SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj)
+{
+	ezc_obj = obj;
+}
+
+
 void PatternCacher::SetEzcCommentary(const std::wstring & start, const std::wstring & end)
 {
 	pattern_parser.SetCommentary(start, end);
@@ -211,6 +219,9 @@ void PatternCacher::RebuildCache(Ezc::Pattern & pattern)
 {
 	pattern.ClearCache();

+	if( ezc_obj )
+		pattern.CacheObjects(*ezc_obj);
+
 	if( ezc_fun )
 		pattern.CacheFunctions(*ezc_fun);

--- a/templates/patterncacher.h
+++ b/templates/patterncacher.h
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2008-2014, Tomasz Sowa
+ * Copyright (c) 2008-2015, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,10 @@ public:
 	// and then we are deleting 'how_many_del' patterns
 	void SetWhenDelete(size_t when_delete, size_t how_many_del);

+	// remembering a pointer to ezc objects
+	// this ezc objects (functions) will be cached in patterns
+	void SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj);
+
 	// remembering a pointer to ezc functions
 	// this functions (pointers to them) will be cached in patterns
 	void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
@@ -140,6 +144,9 @@ private:
 	// can be null
 	Ezc::Blocks * ezc_blocks;

+	// can be null
+	Ezc::Objects<HtmlTextStream> * ezc_obj;
+
 	// parser for patterns
 	Ezc::PatternParser pattern_parser;

--- a/templates/patterns.cpp
+++ b/templates/patterns.cpp
@@ -5,7 +5,7 @@
 */

 /* 
- * Copyright (c) 2011-2014, Tomasz Sowa
+ * Copyright (c) 2011-2015, Tomasz Sowa
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@ Patterns::Patterns()
 	del_white_items	= false;
 	ezc_fun			= 0;
 	ezc_blocks		= 0;
+	ezc_obj 		= 0;
 	locale			= 0;
 	locale_filter	= 0;
 }
@@ -91,6 +92,12 @@ void Patterns::SetEzcBlocks(Ezc::Blocks * blocks)
 }


+void Patterns::SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj)
+{
+	ezc_obj = obj;
+}
+
+
 void Patterns::SetEzcCommentary(const std::wstring & start, const std::wstring & end)
 {
 	pattern_parser.SetCommentary(start, end);
@@ -162,6 +169,9 @@ void Patterns::RebuildCache()

 			pat.ClearCache();

+			if( ezc_obj )
+				pat.CacheObjects(*ezc_obj);
+
 			if( ezc_fun )
 				pat.CacheFunctions(*ezc_fun);

--- a/templates/patterns.h
+++ b/templates/patterns.h
@@ -79,6 +79,10 @@ public:
 	void SetEzcBlocks(Ezc::Blocks * blocks);


+	// dodaj komentarz !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	void SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj);
+
+
 	/*
 		commentary prefix/postfix used in pattern_parser
 		(when there is an error)
@@ -159,6 +163,11 @@ private:
 	// can be null
 	Ezc::Blocks * ezc_blocks;

+	// can be null
+	Ezc::Objects<HtmlTextStream> * ezc_obj;
+
+
+
 	struct Template
 	{
 		bool to_delete;
--- a/templates/templates.cpp
+++ b/templates/templates.cpp
@@ -59,6 +59,7 @@ PatternCacher     pattern_cacher;	// patterns for user items (files with an exec
 Locale            locale;
 EzcFun            ezc_functions;
 Ezc::Blocks       ezc_blocks;
+Ezc::Objects<HtmlTextStream> ezc_objects;
 LocaleFilter      locale_filter;
 HTMLFilter        html_filter;

@@ -735,8 +736,25 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("content", content);


-	plugin.Call((Session*)0, WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions);
-	log << log3 << "Templates: there are " << ezc_functions.Size() << " ezc functions" << logend;
+	plugin.Call((Session*)0, WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions, &ezc_objects);
+
+
+	Ezc::Objects<HtmlTextStream>::Iterator i = ezc_objects.Begin();
+	size_t objects_size = 0, methods_size = 0;
+
+	for( ; i != ezc_objects.End() ; ++i)
+	{
+		objects_size += 1;
+
+		(*i)->ClearFunctions();
+		(*i)->AddFunctions();
+
+		methods_size += (*i)->FunctionsSize();
+	}
+
+
+	log << log3 << "Templates: there are " << ezc_functions.Size() << " global ezc functions" << logend;
+	log << log3 << "Templates: there are " << objects_size << " ezc objects with " << methods_size << " ezc methods" << logend;
 }


@@ -912,8 +930,9 @@ using namespace TemplatesFunctions;
 	plugin.Call((Session*)0, WINIX_ADD_TEMPLATE);

 	patterns.RebuildCache();
-	ezc_blocks.CacheBlocks(ezc_blocks);
+	ezc_blocks.CacheObjects(ezc_objects);
 	ezc_blocks.CacheFunctions(ezc_functions);
+	ezc_blocks.CacheBlocks(ezc_blocks);
 	pattern_cacher.RebuildCache();

 	SetHtmlFilter();
@@ -1113,12 +1132,17 @@ Templates::Templates()
 {
 	using namespace TemplatesFunctions;

+	patterns.SetEzcObjects(&ezc_objects);
 	patterns.SetEzcFunctions(&ezc_functions);
 	patterns.SetEzcBlocks(&ezc_blocks);
+
 	patterns.SetLocale(&locale);
 	patterns.SetLocaleFilter(&locale_filter);
+
 	index_patterns.SetPatterns(&patterns);
 	change_patterns.SetPatterns(&patterns);
+
+	pattern_cacher.SetEzcObjects(&ezc_objects);
 	pattern_cacher.SetEzcFunctions(&ezc_functions);
 	pattern_cacher.SetEzcBlocks(&ezc_blocks);
 }