flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2025-10-31 02:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated ig-types, now the sync/async expand is working, still needs work...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-02-06 03:06:45 +03:00
parent 2220cdf5ad
commit 514491c171
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pwiki/parser.js
View File

@ -436,21 +436,7 @@ module.BaseParser = {
// XXX macros: we are mixing up ast state and parse state...
// one should only be used for parsing and be forgotten after
// the ast is constructed the other should be part of the ast...
// XXX ASYNC this does not yet work as a replacement for .expand(..),
// not sure why...
// ...seems that this breaks how slots and vars are handled...
// to reproduce:
// new code:
// await p.pwiki.parse('<slot moo/>!!! <slot moo>moo</slot>')
// -> '!!! '
// old code:
// await p.pwiki.parse('<slot moo/>!!! <slot moo>moo</slot>')
// -> 'moo!!! '
// ...this affects @var(..) and @slot(..) and does not affect @macro(..)
// The problem is that .callMacro(..) is for some execution paths is
// called sync and in some paths after the current execution frame is
// done, i.e. async...
// ...turns out that the problem is in the inconsistent await behavior,
// XXX DOC inconsistent await behavior...
// in var macro, as an example, there are two paths: the assign and
// the get, the assign calls .parse(..) and awaits for the result
// while the get path is "sync", this results in the first exec path
@ -475,7 +461,7 @@ module.BaseParser = {
// an await of something does not fix the issue, we need to await
// for something significant -- await this.parse('') works, while
// await vars[name] does not -- to the contrary of the above example...
// XXX EXPERIMENTAL...
// XXX EXPERIMENTAL -- this seems to be slower than the original version...
expand: function(page, ast, state={}){
var that = this
ast = ast == null ?
@ -515,6 +501,8 @@ module.BaseParser = {
return res
} else {
return [res] } }) },
// XXX BUG: this is not called on errors in:
// file:///L:/work/pWiki/pwiki2.html#/Tests/ParseErrorOutputTest
function(err){
console.error(err)
return page.parse(