updated: to the new Ezc API

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@974 e52654a7-88a9-db11-a3e9-0013d4bc506e

templates/Makefile.dep

@@ -1,11 +1,12 @@
 # DO NOT DELETE
 
 adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-adduser.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+adduser.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-adduser.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-adduser.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
-adduser.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
+adduser.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+adduser.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+adduser.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+adduser.o: ../../pikotools/textstream/types.h
 adduser.o: ../../pikotools/textstream/textstream.h
 adduser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 adduser.o: ../../pikotools/convert/convert.h
@@ -60,16 +61,18 @@ changepatterns.o: ../../pikotools/convert/inttostr.h
 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/pattern.h ../../ezc/src/item.h
-changepatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-changepatterns.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
+changepatterns.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h
+changepatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+changepatterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+changepatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h
 changepatterns.o: misc.h htmltextstream.h ../../winix/core/textstream.h
 config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-config.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+config.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 config.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-config.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/utf8/utf8.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: ../../pikotools/textstream/textstream.h
 config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 config.o: ../../pikotools/convert/convert.h
@@ -113,9 +116,10 @@ config.o: ../../winix/core/sessioncontainer.h
 config.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 config.o: ../../winix/core/htmlfilter.h
 dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-dir.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-dir.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-dir.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+dir.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+dir.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -182,9 +186,10 @@ dir.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 dir.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 dir.o: ../../winix/functions/vim.h miscspace.h
 doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-doc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-doc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-doc.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+doc.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+doc.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -228,9 +233,10 @@ doc.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 doc.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 doc.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-env.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-env.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-env.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+env.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+env.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+env.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -297,11 +303,12 @@ env.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 env.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 env.o: ../../winix/functions/vim.h
 filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-filters.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+filters.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-filters.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-filters.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
-filters.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
+filters.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+filters.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+filters.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+filters.o: ../../pikotools/textstream/types.h
 filters.o: ../../pikotools/textstream/textstream.h
 filters.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 filters.o: ../../pikotools/convert/convert.h
@@ -356,15 +363,17 @@ htmltextstream.o: ../../pikotools/convert/convert.h
 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/pattern.h
-htmltextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-htmltextstream.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-htmltextstream.o: ../../pikotools/utf8/utf8.h
+htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
+htmltextstream.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
+htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+htmltextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+htmltextstream.o: ../../ezc/src/patternparser.h
 indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h
-indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-indexpatterns.o: ../../pikotools/utf8/utf8.h patterns.h locale.h
+indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
+indexpatterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
+indexpatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+indexpatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+indexpatterns.o: ../../ezc/src/patternparser.h patterns.h locale.h
 indexpatterns.o: ../../pikotools/space/spaceparser.h
 indexpatterns.o: ../../pikotools/space/space.h
 indexpatterns.o: ../../pikotools/textstream/types.h
@@ -379,11 +388,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/pattern.h ../../ezc/src/item.h
+insert.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 insert.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-insert.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/utf8/utf8.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: ../../pikotools/textstream/textstream.h
 insert.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 insert.o: ../../pikotools/convert/convert.h
@@ -428,9 +438,10 @@ insert.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 insert.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 insert.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 ipban.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-ipban.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-ipban.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-ipban.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+ipban.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+ipban.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+ipban.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h
@@ -500,9 +511,10 @@ 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-item.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+item.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+item.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+item.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -547,9 +559,10 @@ item.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 item.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 item.o: ../../winix/core/bbcodeparser.h miscspace.h
 last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-last.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-last.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+last.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+last.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+last.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -604,8 +617,8 @@ 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: ../../winix/core/requesttypes.h ../../pikotools/utf8/utf8.h
-locale.o: ../../winix/core/winix_const.h
+locale.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+locale.o: ../../winix/core/requesttypes.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
@@ -615,16 +628,18 @@ localefilter.o: ../../pikotools/convert/convert.h
 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/pattern.h
-localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-localefilter.o: ../../pikotools/utf8/utf8.h ../core/misc.h
+localefilter.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
+localefilter.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
+localefilter.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+localefilter.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+localefilter.o: ../../ezc/src/patternparser.h ../core/misc.h
 localefilter.o: ../../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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-login.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+login.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+login.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+login.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h
@@ -692,9 +707,10 @@ 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-ls.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-ls.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+ls.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+ls.o: ../../pikotools/utf8/utf8.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
 ls.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -737,9 +753,10 @@ ls.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
 ls.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 ls.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-man.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-man.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-man.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+man.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+man.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+man.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -806,9 +823,10 @@ man.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 man.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 man.o: ../../winix/functions/vim.h
 misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-misc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-misc.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+misc.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+misc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+misc.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -852,10 +870,11 @@ misc.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 misc.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
 misc.o: ../../winix/core/winix_const.h ../../winix/core/request.h
 miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+miscspace.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-miscspace.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+miscspace.o: ../../pikotools/utf8/utf8.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
@@ -901,9 +920,10 @@ miscspace.o: ../../winix/core/sessioncontainer.h
 miscspace.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 miscspace.o: ../../winix/core/htmlfilter.h
 mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-mount.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-mount.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+mount.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+mount.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+mount.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h
@@ -949,12 +969,12 @@ mount.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 mount.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
 mount.o: ../../winix/core/winix_const.h ../../winix/core/mounts.h
 passwd.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
-passwd.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-passwd.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-passwd.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-passwd.o: ../../pikotools/utf8/utf8.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/generator.h ../../ezc/src/vars.h
+passwd.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+passwd.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.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
@@ -1008,10 +1028,11 @@ patterncacher.o: ../../pikotools/convert/convert.h
 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/pattern.h
-patterncacher.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-patterncacher.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-patterncacher.o: ../../pikotools/utf8/utf8.h htmltextstream.h
+patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
+patterncacher.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
+patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+patterncacher.o: ../../pikotools/utf8/utf8.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: ../../winix/core/logmanipulators.h ../../winix/core/slog.h
@@ -1025,17 +1046,19 @@ 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/pattern.h ../../ezc/src/item.h
+patterns.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-patterns.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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
+patterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+patterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h
+patterns.o: ../../winix/core/textstream.h ../../winix/core/log.h
+patterns.o: ../../winix/core/textstream.h ../../winix/core/logmanipulators.h
+patterns.o: ../../winix/core/slog.h ../../winix/core/cur.h
+patterns.o: ../../winix/templates/locale.h
 priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-priv.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-priv.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+priv.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+priv.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+priv.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -1103,12 +1126,12 @@ priv.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 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/pattern.h
-rebus.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-rebus.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-rebus.o: ../../pikotools/textstream/types.h
+rebus.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
+rebus.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+rebus.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h
+rebus.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h
+rebus.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+rebus.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 rebus.o: ../../pikotools/textstream/textstream.h
 rebus.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 rebus.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -1157,18 +1180,19 @@ slog.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h
 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/pattern.h
+slog.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h
 slog.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-slog.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-slog.o: ../../pikotools/utf8/utf8.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: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.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: ../../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
@@ -1196,9 +1220,10 @@ slog.o: ../../winix/core/timezone.h ../../winix/core/sessionmanager.h
 slog.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h
 slog.o: ../../winix/core/system.h ../../winix/core/htmlfilter.h
 stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-stat.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-stat.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+stat.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+stat.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+stat.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -1242,9 +1267,10 @@ stat.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 stat.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 stat.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-sys.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-sys.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-sys.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+sys.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+sys.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -1312,11 +1338,12 @@ sys.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
 sys.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
 sys.o: ../../winix/functions/vim.h ../../winix/templates/templates.h
 template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-template.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+template.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 template.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-template.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-template.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
-template.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
+template.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+template.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h
+template.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+template.o: ../../pikotools/textstream/types.h
 template.o: ../../pikotools/textstream/textstream.h
 template.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 template.o: ../../pikotools/convert/convert.h
@@ -1362,10 +1389,11 @@ template.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 template.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
 template.o: ../../winix/core/winix_const.h
 templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-templates.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+templates.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-templates.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+templates.o: ../../pikotools/utf8/utf8.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
@@ -1448,17 +1476,18 @@ textextstream.o: ../../pikotools/convert/convert.h
 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/pattern.h
-textextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-textextstream.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-textextstream.o: ../../pikotools/utf8/utf8.h htmltextstream.h
+textextstream.o: ../../ezc/src/generator.h ../../ezc/src/vars.h
+textextstream.o: ../../ezc/src/blocks.h ../../ezc/src/item.h
+textextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+textextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h
+textextstream.o: ../../ezc/src/patternparser.h htmltextstream.h
 upload.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
-upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-upload.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-upload.o: ../../pikotools/utf8/utf8.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/generator.h ../../ezc/src/vars.h
+upload.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+upload.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.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
@@ -1502,11 +1531,12 @@ upload.o: ../../winix/core/sessioncontainer.h
 upload.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 upload.o: ../../winix/core/htmlfilter.h
 uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-uptime.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+uptime.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
 uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-uptime.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/utf8/utf8.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: ../../pikotools/textstream/textstream.h
 uptime.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 uptime.o: ../../pikotools/convert/convert.h
@@ -1550,9 +1580,10 @@ uptime.o: ../../winix/core/sessioncontainer.h
 uptime.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 uptime.o: ../../winix/core/htmlfilter.h
 user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-user.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-user.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+user.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+user.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+user.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -1596,9 +1627,10 @@ user.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 user.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 user.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-who.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-who.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-who.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+who.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+who.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h
@@ -1642,9 +1674,10 @@ who.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
 who.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
 who.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
 winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
-winix.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
-winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-winix.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
+winix.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h
+winix.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+winix.o: ../../pikotools/utf8/utf8.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: ../../pikotools/textstream/textstream.h

templates/insert.cpp

@@ -77,7 +77,13 @@ void insert_page_run(Info & i)
 	info.ezc_gen.SkipNewLine(gen_skip_new_line);
 	info.ezc_gen.RecognizeSpecialChars(gen_use_special_chars);
 	info.ezc_gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-	info.ezc_gen.Generate(info.run_content, *pat);
+	/*
+	 * !! IMPROVE ME
+	 * add blocks and variables
+	 * hmm may they are not needed here?
+	 */
+	info.ezc_gen.SetPattern(*pat);
+	info.ezc_gen.Generate(info.run_content);
 	item_print_content(i.out, info.run_content.Str(), info.item.content_type);
 
 	insert_page_cur -= 1;

templates/item.cpp

@@ -336,7 +336,13 @@ void item_run(Info & i)
 		ezc_generator.SkipNewLine(gen_skip_new_line);
 		ezc_generator.RecognizeSpecialChars(gen_use_special_chars);
 		ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-		ezc_generator.Generate(item_run_content, *p);
+		/*
+		 * !! IMPROVE ME
+		 * add blocks and variables
+		 * hmm may they are not needed here?
+		 */
+		ezc_generator.SetPattern(*p);
+		ezc_generator.Generate(item_run_content);
 
 		item_print_content(i.out, item_run_content.Str(), cur->request->item.content_type);
 	}
@@ -733,7 +739,13 @@ void item_tab_run(Info & i)
 			ezc_generator.SkipNewLine(gen_skip_new_line);
 			ezc_generator.RecognizeSpecialChars(gen_use_special_chars);
 			ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-			ezc_generator.Generate(item_run_content, *p);
+			/*
+			 * !! IMPROVE ME
+			 * add blocks and variables
+			 * hmm may they are not needed here?
+			 */
+			ezc_generator.SetPattern(*p);
+			ezc_generator.Generate(item_run_content);
 			item_print_content(i.out, item_run_content.Str(), cur->request->item_tab[item_index].content_type);
 		}
 		else

templates/man.cpp

@@ -65,7 +65,7 @@ return winixfun_iter != functions->End();
 void man_winixfun_tab(Info & i)
 {
 	man_winixfun_tabcheck();
-	winixstack = i.stack;
+	winixstack = &i.stack;
 
 	if( i.iter == 0 )
 		winixfun_iter = functions->Begin();
@@ -113,7 +113,7 @@ return ezcfun_iter != ezc_functions.End();
 void man_ezcfun_tab(Info & i)
 {
 	man_ezcfun_tabcheck();
-	ezcstack = i.stack;
+	ezcstack = &i.stack;
 
 	if( i.iter == 0 )
 		ezcfun_iter = ezc_functions.Begin();

templates/patterncacher.cpp

@@ -96,8 +96,18 @@ void PatternCacher::DeleteOldPatterns()
 
 void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern)
 {
-	pattern.AllowInclude(false);
-	pattern.ParseString(item.content);
+	/*
+	 * CHECK ME
+	 * check the rest flags from pattern_parser
+	 * if the default values are correct
+	 *
+	 * IMPROVE ME
+	 * we can add blocks and variables
+	 *
+	 * add caching of blocks
+	 */
+	pattern_parser.AllowInclude(false);
+	pattern_parser.ParseString(item.content, pattern);
 
 	if( ezc_fun )
 		pattern.CacheFunctions(*ezc_fun);

templates/patterncacher.h

@@ -121,6 +121,9 @@ private:
 	// can be null (not set directly)
 	TemplatesFunctions::EzcFun * ezc_fun;
 
+	// parser for patterns
+	Ezc::PatternParser pattern_parser;
+
 };
 
 

templates/patterns.cpp

@@ -120,15 +120,26 @@ void Patterns::ReadPatterns(Template & templ)
 	size_t len = locale->Size();
 	templ.patterns.resize(len);
 
+	/*
+	 * CHECK ME
+	 * make sure everything else is set correctly from pattern_parser
+	 * (default values)
+	 */
+	pattern_parser.DeleteWhiteTextItems(del_white_items);
+	pattern_parser.Directory(templates_dir, templates_dir_def);
+
 	for(size_t i=0 ; i<len ; ++i)
 	{
-		templ.patterns[i].DeleteWhiteTextItems(del_white_items);
-		templ.patterns[i].Directory(templates_dir, templates_dir_def);
-		templ.patterns[i].ParseFile(templ.file_name);
+		pattern_parser.ParseFile(templ.file_name, templ.patterns[i]);
 
 		if( ezc_fun )
 			templ.patterns[i].CacheFunctions(*ezc_fun);
 
+		/*
+		 * IMPROVE ME
+		 * add caching blocks
+		 */
+
 		locale_filter->Filter(templ.patterns[i], *locale, i);
 	}
 }

templates/patterns.h

@@ -147,6 +147,8 @@ private:
 	// non-const for default assignment operator to be created
 	std::wstring empty_str;
 
+	Ezc::PatternParser pattern_parser;
+
 	void ReadPatterns(Template & templ);
 
 };

templates/templates.cpp

@@ -161,7 +161,14 @@ Ezc::Pattern * p = 0;
 		content_gen.SkipNewLine(gen_skip_new_line);
 		content_gen.RecognizeSpecialChars(gen_use_special_chars);
 		content_gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-		content_gen.Generate(i.out, *p);
+
+		/*
+		 * !! IMPROVE ME
+		 * add blocks and variables
+		 */
+		//content_gen.AddFunctions();
+		content_gen.SetPattern(*p);
+		content_gen.Generate(i.out);
 	}
 	else
 	{
@@ -656,7 +663,6 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("winix_subdomain_is_not_empty",           winix_subdomain_is_not_empty);
 	ezc_functions.Insert("winix_subdomain_is",                     winix_subdomain_is);
 	ezc_functions.Insert("str",                                    str);
-	ezc_functions.Insert("strnc",                                  strnc);
 	ezc_functions.Insert("winix_tz_tab",                           winix_tz_tab);
 	ezc_functions.Insert("winix_tz_tab_id",                        winix_tz_tab_id);
 	ezc_functions.Insert("winix_tz_tab_name",                      winix_tz_tab_name);
@@ -972,7 +978,12 @@ using namespace TemplatesFunctions;
 		generator.SkipNewLine(gen_skip_new_line);
 		generator.RecognizeSpecialChars(gen_use_special_chars);
 		generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-		generator.Generate(cur->request->out_streams, *index);
+		generator.SetPattern(*index);
+		/*
+		 * !! IMPROVE ME
+		 * add blocks and variables
+		 */
+		generator.Generate(cur->request->out_streams);
 	}
 	else
 	{
@@ -989,12 +1000,14 @@ using namespace TemplatesFunctions;
 	if( !empty_pars.empty() )
 		empty_pars.clear();
 
+	Ezc::Stack s;
+
 	// !! FIX ME
 	// at the moment stream 0 is used
 	// here should be something other
-	Info info(cur->request->out_streams[0], empty_pars, empty_string, empty_stream);
+	Info info(cur->request->out_streams[0], empty_pars, empty_string, empty_stream, s);
 	
-	info.iter = 0;
+	info.iter = s.iter;
 	info.res  = false;
 
 	item_run(info);
@@ -1009,7 +1022,12 @@ using namespace TemplatesFunctions;
 	generator.SkipNewLine(gen_skip_new_line);
 	generator.RecognizeSpecialChars(gen_use_special_chars);
 	generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-	generator.Generate(cur->request->out_streams, pattern);
+	generator.SetPattern(pattern);
+	/*
+	 * !! IMPROVE ME
+	 * add blocks and variables
+	 */
+	generator.Generate(cur->request->out_streams);
 }
 
 

templates/templates.h

@@ -571,7 +571,6 @@ namespace TemplatesFunctions
 	void winix_subdomain_is_not_empty(Info & i);
 	void winix_subdomain_is(Info & i);
 	void str(Info & i);
-	void strnc(Info & i);
 	void winix_tz_tab(Info & i);
 	void winix_tz_tab_id(Info & i);
 	void winix_tz_tab_name(Info & i);

templates/winix.cpp

@@ -308,13 +308,8 @@ void str(Info & i)
 		i.out << i.params[a];
 }
 
-void strnc(Info & i)
-{
-	for(size_t a=0 ; a<i.params.size() ; ++a)
-		i.out << i.params[a];
 
-	i.case_sensitive = false;
-}
+