wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some comments and reshuffling in the grammar, and a typo in the

Browse source 
AttributeExpander.
This commit is contained in:
Gabriel Wicke 2012-02-09 22:27:45 +00:00
parent ed7dc80db9
commit aff30be131
Notes: Gabriel Wicke 2012-02-27 16:40:01 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/111113
2 changed files with 75 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/parser/ext.core.AttributeExpander.js
View file

@ -1,8 +1,7 @@
/**
* Geniric attribute expansion handler.
* Generic attribute expansion handler.
*
* @author Gabriel Wicke <gwicke@wikimedia.org>
* @author Brion Vibber <brion@wikimedia.org>
*/
var $ = require('jquery'),
request = require('request'),
@ -77,7 +76,8 @@ AttributeExpander.prototype.onToken = function ( token, frame, cb ) {
AttributeExpander.prototype._returnAttributes = function ( expandData,
attributes )
{
this.manager.env.dp( 'AttributeExpander._returnAttributes: ' + JSON.stringify(attributes) );
this.manager.env.dp( 'AttributeExpander._returnAttributes: ' +
JSON.stringify(attributes) );
// Remove the target from the attributes
expandData.token.attribs = attributes;
if ( expandData.async ) {

133
modules/parser/pegTokenizer.pegjs.txt
View file

@ -338,59 +338,7 @@ urltext = ( t:[^'<~[{\n\rfghimnstw|!:\]} &=]+ { return t.join(''); }
/ ' ' & ':' { return "\u00a0"; }
/ t:text_char )+
directive
= comment
/ tplarg_or_template
/ htmlentity
spaceless_preprocessor_text
= r:( t:[^'<~[{\n\r|!\]}\t &=]+ { return t.join(''); }
/ directive
/ !inline_breaks !' ' text_char )+ {
return flatten_string ( r );
}
link_preprocessor_text
= r:( t:[^'<~[{\n\r|!\]}\t &="']+ { return t.join(''); }
/ directive
/ urlencoded_char
/ !inline_breaks no_punctuation_char
/ s:[.:,] !(space / eolf) { return s }
/ [&%] )+ {
return flatten_string ( r );
}
attribute_preprocessor_text
= r:( ts:(!inline_breaks t:[^=<>{\n\r&'"\t ] {return t})+ { return ts.join(''); }
/ directive
/ !inline_breaks [&%] )* {
//console.log('prep');
return flatten_string ( r );
}
attribute_preprocessor_text_single
= r:( t:[^>{\n\r&']+ { return t.join(''); }
/ directive
/ !inline_breaks [&%] )* {
return flatten_string ( r );
}
attribute_preprocessor_text_double
= r:( t:[^>{\n\r&"]+ { return t.join(''); }
/ directive
/ !inline_breaks [&%] )* {
//console.log( 'double:' + pp(r) );
return flatten_string ( r );
}
// Plain text, but can contain templates, template arguments, comments etc-
// all stuff that is normally handled by the preprocessor
// Returns either a list of tokens, or a plain string (if nothing is to be
// processed).
preprocessor_text
= r:( t:[^<~[{\n\r\t|!\]} &=]+ { return t.join(''); }
/ directive
/ !inline_breaks text_char )+ {
return flatten ( r );
}
/*
@ -480,6 +428,67 @@ newlineToken = newline { return [new NlTk()] }
eolf = newline / eof
// 'Preprocessor' directive- higher-level things that can occur in otherwise
// plain-text content.
directive
= comment
/ tplarg_or_template
/ htmlentity
// Plain text, but can contain templates, template arguments, comments etc-
// all stuff that is normally handled by the preprocessor
// Returns either a list of tokens, or a plain string (if nothing is to be
// processed).
preprocessor_text
= r:( t:[^<~[{\n\r\t|!\]} &=]+ { return t.join(''); }
/ directive
/ !inline_breaks text_char )+ {
return flatten ( r );
}
spaceless_preprocessor_text
= r:( t:[^'<~[{\n\r|!\]}\t &=]+ { return t.join(''); }
/ directive
/ !inline_breaks !' ' text_char )+ {
return flatten_string ( r );
}
link_preprocessor_text
= r:( t:[^'<~[{\n\r|!\]}\t &="']+ { return t.join(''); }
/ directive
/ urlencoded_char
/ !inline_breaks no_punctuation_char
/ s:[.:,] !(space / eolf) { return s }
/ [&%] )+ {
return flatten_string ( r );
}
// Attribute values with preprocessor support
attribute_preprocessor_text
= r:( ts:(!inline_breaks t:[^=<>{\n\r&'"\t ] {return t})+ { return ts.join(''); }
/ directive
/ !inline_breaks [&%] )* {
//console.log('prep');
return flatten_string ( r );
}
attribute_preprocessor_text_single
= r:( t:[^{&']+ { return t.join(''); }
/ directive
/ !inline_breaks [{&] )* {
return flatten_string ( r );
}
attribute_preprocessor_text_double
= r:( t:[^{&"]+ { return t.join(''); }
/ directive
/ !inline_breaks [{&] )* {
//console.log( 'double:' + pp(r) );
return flatten_string ( r );
}
// A document (start production) is a sequence of toplevelblocks. Tokens are
// emitted in chunks per toplevelblock to avoid buffering the full document.
toplevelblock
= & { blockStart = pos; return true; } b:block {
b = flatten(b);
@ -496,14 +505,13 @@ toplevelblock
bs.attribs.push(new KV('data-sourcePos', blockStart + ':' + pos));
//console.log( 'toplevelblock: ' + pp( bs ));
}
// XXX: only run this for lines that actually need it!
//b.push({type: 'NEWLINE'});
// Move this to a token stream transform!
//console.log('about to emit' + pp(self));
//console.log( '__parseArgs call: ' + pp( b ));
// Emit tokens for this toplevelblock. This feeds a chunk to the parser
// pipeline.
__parseArgs[2]( flatten( b ) );
//return [];
// We don't return any tokens to the start production to save memory. We
// just emitted them already to our consumers.
return true;
}
@ -549,6 +557,9 @@ block_line
/ pre
// A paragraph. We don't emit 'p' tokens to avoid issues with template
// transclusions, <p> tags in the source and the like. Instead, we perform
// some paragraph wrapping on the DOM.
para
= s1:sol s2:sol c:inlineline {
return s1.concat(s2, /* [new TagTk('p')],*/ c);
@ -896,13 +907,13 @@ wikilink
}
} else {
if (trail) {
textTokens = target.concat( [ trail.join('') ] );
textTokens = $.extend(true, [], target).concat( [ trail.join('') ] );
} else {
// copy list
textTokens = target.concat([]);
textTokens = $.extend(true, [], target);
}
}
//console.log( "XXX:" + pp(obj) );
//console.log( "XXX:" + pp([obj].concat(textTokens, [new EndTagTk( 'a' )])) );
return [obj].concat(textTokens, [new EndTagTk( 'a' )]);
}