From c2d1e31fe4d1b4f5f2934907edbdf82549639e7a Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Mon, 30 Jan 2012 06:52:56 -0600
Subject: [PATCH] refactor, use consistent variable names

---
 lib/marked.js | 132 +++++++++++++++++++++++++-------------------------
 1 file changed, 65 insertions(+), 67 deletions(-)

diff --git a/lib/marked.js b/lib/marked.js
index 154259b7d0..c6f3d0ac80 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -70,20 +70,20 @@ block.paragraph = (function() {
  * Block Lexer
  */
 
-block.lexer = function(str) {
+block.lexer = function(src) {
   var tokens = [];
 
   tokens.links = {};
 
-  str = str
+  src = src
     .replace(/\r\n|\r/g, '\n')
     .replace(/\t/g, '    ');
 
-  return block.token(str, tokens, true);
+  return block.token(src, tokens, true);
 };
 
-block.token = function(str, tokens, top) {
-  var str = str.replace(/^ +$/gm, '')
+block.token = function(src, tokens, top) {
+  var src = src.replace(/^ +$/gm, '')
     , next
     , loose
     , cap
@@ -92,10 +92,10 @@ block.token = function(str, tokens, top) {
     , i
     , l;
 
-  while (str) {
+  while (src) {
     // newline
-    if (cap = block.newline.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.newline.exec(src)) {
+      src = src.substring(cap[0].length);
       if (cap[0].length > 1) {
         tokens.push({
           type: 'space'
@@ -104,8 +104,8 @@ block.token = function(str, tokens, top) {
     }
 
     // code
-    if (cap = block.code.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.code.exec(src)) {
+      src = src.substring(cap[0].length);
       cap = cap[0].replace(/^ {4}/gm, '');
       tokens.push({
         type: 'code',
@@ -115,8 +115,8 @@ block.token = function(str, tokens, top) {
     }
 
     // gfm_code
-    if (cap = block.gfm_code.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.gfm_code.exec(src)) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'code',
         lang: cap[1],
@@ -126,8 +126,8 @@ block.token = function(str, tokens, top) {
     }
 
     // heading
-    if (cap = block.heading.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.heading.exec(src)) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'heading',
         depth: cap[1].length,
@@ -137,8 +137,8 @@ block.token = function(str, tokens, top) {
     }
 
     // lheading
-    if (cap = block.lheading.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.lheading.exec(src)) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'heading',
         depth: cap[2] === '=' ? 1 : 2,
@@ -148,8 +148,8 @@ block.token = function(str, tokens, top) {
     }
 
     // hr
-    if (cap = block.hr.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.hr.exec(src)) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'hr'
       });
@@ -157,8 +157,8 @@ block.token = function(str, tokens, top) {
     }
 
     // blockquote
-    if (cap = block.blockquote.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.blockquote.exec(src)) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'blockquote_start'
       });
@@ -177,8 +177,8 @@ block.token = function(str, tokens, top) {
     }
 
     // list
-    if (cap = block.list.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.list.exec(src)) {
+      src = src.substring(cap[0].length);
 
       tokens.push({
         type: 'list_start',
@@ -240,8 +240,8 @@ block.token = function(str, tokens, top) {
     }
 
     // html
-    if (cap = block.html.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = block.html.exec(src)) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'html',
         text: cap[0]
@@ -250,8 +250,8 @@ block.token = function(str, tokens, top) {
     }
 
     // def
-    if (top && (cap = block.def.exec(str))) {
-      str = str.substring(cap[0].length);
+    if (top && (cap = block.def.exec(src))) {
+      src = src.substring(cap[0].length);
       tokens.links[cap[1].toLowerCase()] = {
         href: cap[2],
         title: cap[3]
@@ -260,8 +260,8 @@ block.token = function(str, tokens, top) {
     }
 
     // top-level paragraph
-    if (top && (cap = block.paragraph.exec(str))) {
-      str = str.substring(cap[0].length);
+    if (top && (cap = block.paragraph.exec(src))) {
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'paragraph',
         text: cap[0]
@@ -270,9 +270,9 @@ block.token = function(str, tokens, top) {
     }
 
     // text
-    if (cap = block.text.exec(str)) {
+    if (cap = block.text.exec(src)) {
       // Top-level should never reach here.
-      str = str.substring(cap[0].length);
+      src = src.substring(cap[0].length);
       tokens.push({
         type: 'text',
         text: cap[0]
@@ -307,7 +307,7 @@ var inline = {
  * Inline Lexer
  */
 
-inline.lexer = function(str) {
+inline.lexer = function(src) {
   var out = ''
     , links = tokens.links
     , link
@@ -315,17 +315,17 @@ inline.lexer = function(str) {
     , href
     , cap;
 
-  while (str) {
+  while (src) {
     // escape
-    if (cap = inline.escape.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.escape.exec(src)) {
+      src = src.substring(cap[0].length);
       out += cap[1];
       continue;
     }
 
     // autolink
-    if (cap = inline.autolink.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.autolink.exec(src)) {
+      src = src.substring(cap[0].length);
       if (cap[2] === '@') {
         text = cap[1][6] === ':'
           ? mangle(cap[1].substring(7))
@@ -344,8 +344,8 @@ inline.lexer = function(str) {
     }
 
     // gfm_autolink
-    if (cap = inline.gfm_autolink.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.gfm_autolink.exec(src)) {
+      src = src.substring(cap[0].length);
       text = escape(cap[1]);
       href = text;
       out += '<a href="'
@@ -357,19 +357,19 @@ inline.lexer = function(str) {
     }
 
     // tag
-    if (cap = inline.tag.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.tag.exec(src)) {
+      src = src.substring(cap[0].length);
       out += cap[0];
       continue;
     }
 
     // link
-    if (cap = inline.link.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.link.exec(src)) {
+      src = src.substring(cap[0].length);
       text = /^\s*<?([^\s]*?)>?(?:\s+"([^\n]+)")?\s*$/.exec(cap[2]);
       if (!text) {
         out += cap[0][0];
-        str = cap[0].substring(1) + str;
+        src = cap[0].substring(1) + src;
         continue;
       }
       out += outputLink(cap, {
@@ -380,14 +380,14 @@ inline.lexer = function(str) {
     }
 
     // reflink, nolink
-    if ((cap = inline.reflink.exec(str))
-        || (cap = inline.nolink.exec(str))) {
-      str = str.substring(cap[0].length);
+    if ((cap = inline.reflink.exec(src))
+        || (cap = inline.nolink.exec(src))) {
+      src = src.substring(cap[0].length);
       link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
       link = links[link.toLowerCase()];
       if (!link || !link.href) {
         out += cap[0][0];
-        str = cap[0].substring(1) + str;
+        src = cap[0].substring(1) + src;
         continue;
       }
       out += outputLink(cap, link);
@@ -395,8 +395,8 @@ inline.lexer = function(str) {
     }
 
     // strong
-    if (cap = inline.strong.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.strong.exec(src)) {
+      src = src.substring(cap[0].length);
       out += '<strong>'
         + inline.lexer(cap[2] || cap[1])
         + '</strong>';
@@ -404,8 +404,8 @@ inline.lexer = function(str) {
     }
 
     // em
-    if (cap = inline.em.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.em.exec(src)) {
+      src = src.substring(cap[0].length);
       out += '<em>'
         + inline.lexer(cap[2] || cap[1])
         + '</em>';
@@ -413,8 +413,8 @@ inline.lexer = function(str) {
     }
 
     // code
-    if (cap = inline.code.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.code.exec(src)) {
+      src = src.substring(cap[0].length);
       out += '<code>'
         + escape(cap[2], true)
         + '</code>';
@@ -422,15 +422,15 @@ inline.lexer = function(str) {
     }
 
     // br
-    if (cap = inline.br.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.br.exec(src)) {
+      src = src.substring(cap[0].length);
       out += '<br>';
       continue;
     }
 
     // text
-    if (cap = inline.text.exec(str)) {
-      str = str.substring(cap[0].length);
+    if (cap = inline.text.exec(src)) {
+      src = src.substring(cap[0].length);
       out += escape(cap[0]);
       continue;
     }
@@ -605,25 +605,23 @@ var parse = function(src) {
  * Helpers
  */
 
-var escape = function(html, dbl) {
+var escape = function(html, encode) {
   return html
-    .replace(!dbl
-      ? /&(?!#?\w+;)/g
-      : /&/g, '&amp;')
+    .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;')
     .replace(/"/g, '&quot;')
     .replace(/'/g, '&apos;');
 };
 
-var mangle = function(str) {
+var mangle = function(text) {
   var out = ''
-    , ch
+    , l = text.length
     , i = 0
-    , l = str.length;
+    , ch;
 
   for (; i < l; i++) {
-    ch = str.charCodeAt(i);
+    ch = text.charCodeAt(i);
     if (Math.random() > 0.5) {
       ch = 'x' + ch.toString(16);
     }
@@ -646,8 +644,8 @@ function tag() {
  * Expose
  */
 
-var marked = function(str) {
-  return parse(block.lexer(str));
+var marked = function(src) {
+  return parse(block.lexer(src));
 };
 
 marked.parser = parse;