mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-29 08:43:14 +00:00
Code Issues Releases Wiki Activity

Mark each rule with its type as it is instantiated

Browse Source
This commit is contained in:
Jeremy Ruston 2012-12-20 16:49:04 +00:00
parent 094f8c32ca
commit 0cb76f6fc0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/parsers/wikiparser/wikiparser.js
View File

@ -38,12 +38,12 @@ var WikiParser = function(vocabulary,type,text,options) {
// Initialise the things that pragma rules can change // Initialise the things that pragma rules can change
this.macroDefinitions = {}; // Hash map of macro definitions this.macroDefinitions = {}; // Hash map of macro definitions
// Instantiate the pragma parse rules // Instantiate the pragma parse rules
this.pragmaRules = this.instantiateRules(this.vocabulary.pragmaRuleClasses,0); this.pragmaRules = this.instantiateRules(this.vocabulary.pragmaRuleClasses,"pragma",0);
// Parse any pragmas // Parse any pragmas
this.parsePragmas(); this.parsePragmas();
// Instantiate the parser block and inline rules // Instantiate the parser block and inline rules
this.blockRules = this.instantiateRules(this.vocabulary.blockRuleClasses,this.pos); this.blockRules = this.instantiateRules(this.vocabulary.blockRuleClasses,"block",this.pos);
this.inlineRules = this.instantiateRules(this.vocabulary.inlineRuleClasses,this.pos); this.inlineRules = this.instantiateRules(this.vocabulary.inlineRuleClasses,"inline",this.pos);
// Parse the text into inline runs or blocks // Parse the text into inline runs or blocks
if(options.parseAsInline) { if(options.parseAsInline) {
this.tree = this.parseInlineRun(); this.tree = this.parseInlineRun();
@ -55,12 +55,14 @@ var WikiParser = function(vocabulary,type,text,options) {
/* /*
Instantiate an array of parse rules Instantiate an array of parse rules
*/ */
WikiParser.prototype.instantiateRules = function(classes,startPos) { WikiParser.prototype.instantiateRules = function(classes,type,startPos) {
var rulesInfo = [], var rulesInfo = [],
self = this; self = this;
$tw.utils.each(classes,function(RuleClass) { $tw.utils.each(classes,function(RuleClass) {
// Instantiate the rule // Instantiate the rule
var rule = new RuleClass(self); var rule = new RuleClass(self);
rule.is = {};
rule.is[type] = true;
rule.init(self); rule.init(self);
var matchIndex = rule.findNextMatch(startPos); var matchIndex = rule.findNextMatch(startPos);
if(matchIndex !== undefined) { if(matchIndex !== undefined) {