From 4b9d8e9d7865c76691186ec7091b0a19862ba999 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 19 Aug 2022 20:31:37 +0300 Subject: [PATCH] minor tweak... Signed-off-by: Alex A. Naanou --- pwiki/page.js | 2 +- pwiki/parser.js | 2 +- pwiki2.js | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pwiki/page.js b/pwiki/page.js index 1472c99..a4ab2a9 100755 --- a/pwiki/page.js +++ b/pwiki/page.js @@ -1383,7 +1383,7 @@ module.System = { ` }, all: { - text: `@include(../**/path join="
")`}, + text: `@include(../**/path join="@source(line-separator)")`}, info: { text: object.doc` Path: @source(../path)
diff --git a/pwiki/parser.js b/pwiki/parser.js index b2e2c11..50ff840 100755 --- a/pwiki/parser.js +++ b/pwiki/parser.js @@ -454,7 +454,7 @@ module.BaseParser = { // NOTE: we need to await for ast here as we need stage 2 of // parsing to happen AFTER everything else completes... - /* XXX GENERATOR -- this breaks /test_slots... + /* XXX GENERATOR -- this breaks the parser... // ...investigate the data flow... for await (var e of ast){ /*/ diff --git a/pwiki2.js b/pwiki2.js index 9164b68..6bf87e1 100755 --- a/pwiki2.js +++ b/pwiki2.js @@ -18,11 +18,7 @@ * this can't work as a generator... * ...might be a good idea to make filters local only... * XXX slots/macros might also pose a problem... -* 2) all the macros that can source pages to produce generators: -* @include(..) -- DONE -* @source(..) -- DONE -* @quote(..) -- DONE -* @macro(..) -- DONE +* 2) all the macros that can source pages to produce generators (DONE) * XXX ranges in pattern paths -- page-size=X page=Y | from=X to=Y / ... * ...url syntax??? * XXX differenced in behaviour between _abc and abc, either need to make