From 0bea9fdfbb0fed7673f062ab8c64fd422e9b7d9c Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Fri, 3 Feb 2012 13:10:04 +0000
Subject: [PATCH] Fix nowiki tokenization regression introduced r110495

---
 modules/parser/pegTokenizer.pegjs.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/parser/pegTokenizer.pegjs.txt b/modules/parser/pegTokenizer.pegjs.txt
index 2560f0763a..a58a66dd2c 100644
--- a/modules/parser/pegTokenizer.pegjs.txt
+++ b/modules/parser/pegTokenizer.pegjs.txt
@@ -879,24 +879,31 @@ pre
 
 nowiki 
   = "<nowiki>" nc:nowiki_content "</nowiki>" { 
-        // console.log(pp(nc)); 
+        //console.log( 'full nowiki return: ' + pp(nc)); 
         return nc; 
     }
   / "<nowiki>" { 
           //console.log('nowiki fallback');
           return ['<nowiki>']; 
     }
-  / "</nowiki>" { return ['</nowiki>']; }
+  / "</nowiki>" { 
+      //console.log('nowiki end fallback');
+      return ['</nowiki>']; 
+  }
 
 nowiki_content
   = ts:(   t:[^<]+ { return t.join('') } 
            / "<pre" p0:space* p1:[^>]* ">" p2:nowiki_content "</pre>" {
                  //console.log('nested pre in nowiki');
-                 return ["<pre"].concat(p0, p1, [">"], [p2[0].value], ["</pre>"]).join('');
+                 return ["<pre"].concat(p0, p1, [">"], p2, ["</pre>"]).join('');
                }
-           / (!("</nowiki>" / "</pre>") c:. {return c}) 
+           / (!("</"( "nowiki>" / "pre>")) c:. {
+               //console.log('nowiki: single char' + c);
+               return c;
+           }) 
        )* {
             // return nowiki tags as well?
+            //console.log('nowiki_content: return' + pp(ts));
             return [ts.join('')];
           }