tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: two options to the config:

Browse Source 
ezc_error_prefix (string)
        ezc_error_postfix (string)
        // prefix and postfix used when there is an error in Ezc patterns
        // default:
        // prefix:  "<!-- "
        // postfix: " -->"
added:  Ezc::Blocks to templates
added:  although patterns have pointers to functions and blocks cached
        the Ezc::Generator should use SetFunctions() and SetBlocks() method
        in order to correctly recognize variables (aliases)




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@978 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2014-10-19 21:20:09 +00:00
parent 5266a7e4e5
commit fb18b2238e
27 changed files with 1105 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/thread/Makefile.dep
View File

@@ -45,8 +45,9 @@ createthread.o: ../../../winix/templates/locale.h
createthread.o: ../../../winix/templates/localefilter.h
createthread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
createthread.o: ../../../ezc/src/vars.h ../../../ezc/src/blocks.h
createthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h
createthread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/pattern.h
createthread.o: ../../../ezc/src/patternparser.h
createthread.o: ../../../winix/notify/notifythread.h
createthread.o: ../../../winix/core/basethread.h
createthread.o: ../../../winix/notify/templatesnotify.h
@@ -146,9 +147,9 @@ funthread.o: ../../../winix/templates/patterns.h
funthread.o: ../../../winix/templates/locale.h
funthread.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
funthread.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
funthread.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
funthread.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
funthread.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
funthread.o: ../../../ezc/src/patternparser.h
funthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
funthread.o: ../../../winix/notify/notifythread.h
funthread.o: ../../../winix/core/basethread.h
funthread.o: ../../../winix/notify/templatesnotify.h
@@ -200,10 +201,10 @@ init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h
init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h
init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h
init.o: ../../../winix/core/basethread.h
init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h
init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h
init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h
init.o: ../../../winix/core/mounts.h ../../../winix/core/mountparser.h
@@ -293,9 +294,9 @@ reply.o: ../../../winix/templates/patterns.h
reply.o: ../../../winix/templates/locale.h
reply.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
reply.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
reply.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
reply.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
reply.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
reply.o: ../../../ezc/src/patternparser.h
reply.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
reply.o: ../../../winix/notify/notifythread.h
reply.o: ../../../winix/core/basethread.h
reply.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h
@@ -382,9 +383,9 @@ showthreads.o: ../../../winix/templates/patterns.h
showthreads.o: ../../../winix/templates/locale.h
showthreads.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
showthreads.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
showthreads.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
showthreads.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
showthreads.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
showthreads.o: ../../../ezc/src/patternparser.h
showthreads.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
showthreads.o: ../../../winix/notify/notifythread.h
showthreads.o: ../../../winix/core/basethread.h
showthreads.o: ../../../winix/notify/templatesnotify.h
@@ -441,9 +442,9 @@ templates.o: ../../../winix/templates/patterns.h
templates.o: ../../../winix/templates/locale.h
templates.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
templates.o: ../../../ezc/src/patternparser.h
templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
templates.o: ../../../winix/notify/notifythread.h
templates.o: ../../../winix/core/basethread.h
templates.o: ../../../winix/notify/templatesnotify.h
@@ -546,9 +547,9 @@ threadinfo.o: ../../../winix/templates/patterns.h
threadinfo.o: ../../../winix/templates/locale.h
threadinfo.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
threadinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
threadinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
threadinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
threadinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
threadinfo.o: ../../../ezc/src/patternparser.h
threadinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
threadinfo.o: ../../../winix/notify/notifythread.h
threadinfo.o: ../../../winix/core/basethread.h
threadinfo.o: ../../../winix/notify/templatesnotify.h

9
plugins/thread/templates.cpp
View File

@@ -354,15 +354,8 @@ void thread_sort_tab_run(Info & i)
Ezc::Pattern * p = pattern_cacher.GetPattern(*thread_info.item_sort_tab[item_sort_index]);
item_run_content.Clear();
ezc_generator.TrimWhite(gen_trim_white);
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);
InitGenerator(ezc_generator);
ezc_generator.SetPattern(*p);
/*
* IMPROVE ME
* set variables and blocks (functions are cached)
*/
ezc_generator.Generate(item_run_content);
item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->content_type);