refactor parser

Author: ShMcK

parser/index.pegjs

@@ -1,9 +1,5 @@
 {
   // final parsed output for coderoad.json file
-  var position = {
-  	page: -1,
-    task: -1,
-  };
   var output = {
     info: {
       title: 'Tutorial Title',
@@ -47,62 +43,53 @@ start
   { return output; }
 
 doc
-  = info_title
-    info_description*
+  = info
   	break?
-  	page*
+	page*
+
+info
+  = title: info_title
+  	description: description*
+   {
+   output.info.title = title;
+   output.info.description = description.join('\n');
+   }
 
 page
-  = page_title
-    page_description*
-    page_task*
+  = title: page_title
+    description: description*
+    tasks: page_task*
+    {
+	 output.pages.push({
+      	title,
+        description: description.join('\n'),
+        tasks,
+      });
+
+    }
 
 page_title
   = '##'
     space?
     title: content
     break
-   	{
-      // increment page
-      position.page += 1;
-      position.task = -1;
-      // add page outline
-      output.pages.push({
-      	title: 'Page ' + position.page,
-        description: '',
-      });
-      // add page title
-      output.pages[position.page].title = adjust(title);
-    }
-
-page_description
-  = description: content
-  	break
-   {
-    const d = output.pages[position.page].description;
-	  output.pages[position.page].description += d.length > 0 ? '\n' : '';
-    output.pages[position.page].description += adjust(description);
-	}
+   	{ return adjust(title); }
 
 page_task
 	= '+'
     space?
   	description: content
     break
-    test: task_test*
-    hint: task_hint*
+    tests: task_test*
+    hints: task_hint*
     break?
 
   {
-    position.task += 1;
-    if (!output.pages[position.page].tasks) {
-    	output.pages[position.page].tasks = [];
-    }
-   	output.pages[position.page].tasks.push({
-		description: adjust(description),
-      tests: test,
-      hints: hint,
-    })
+   	return {
+	  description: adjust(description),
+      tests,
+      hints,
+    };
   }
 
 page_actions
@@ -141,16 +128,12 @@ info_title
   = '#'
     space?
     title: content
-  { output.info.title = adjust(title); }
+    { return adjust(title); }
 
-info_description
+description
   = description: content
     break
-  {
-  	const d = output.info.description;
-    output.info.description += d.length > 0 ? '\n' : '';
-	  output.info.description += adjust(description);
-  }
+    { return adjust(description); }
 
 content = [^#^@^+] [^\n^\r]+ [\n\r]
 space = [ \s]

test/action.js

@@ -6,6 +6,8 @@ const parser = readFileSync('../parser/index.pegjs', 'utf8');
 const parse = pegjs.buildParser(parser).parse;
 
 test.todo('parses an action: open');
+
+
 test.todo('parses multiple actions: open');
 
 test.todo('parses an action: set');

test/info.js

@@ -5,7 +5,7 @@ import { readFileSync } from 'fs';
 const parser = readFileSync('../parser/index.pegjs', 'utf8');
 const parse = pegjs.buildParser(parser).parse;
 
-test('parses a title', t => {
+test('parses an info title', t => {
   const data = `# Title\n`;
   const expected = {
     info: {
@@ -17,7 +17,19 @@ test('parses a title', t => {
   t.deepEqual(result.info, expected.info);
 });
 
-test('parses a description', t => {
+test('parses an info title with a # in the middle', t => {
+  const data = `# T#i#t#l#e#\n`;
+  const expected = {
+    info: {
+      title: 'T#i#t#l#e#',
+      description: ''
+    }
+  };
+  const result = parse(data);
+  t.deepEqual(result.info, expected.info);
+});
+
+test('parses an info description', t => {
   const data = `# Title
 some description
 `;
@@ -31,25 +43,47 @@ some description
   t.deepEqual(result.info, expected.info);
 });
 
-test('parses a multiline description', t => {
+test('parses an info multiline description', t => {
+  const data = `# Title
+some description
+and more on
+the next line
+`;
+  const expected = {
+    info: {
+      title: 'Title',
+      description: `some description
+and more on
+the next line`
+    }
+  };
+  const result = parse(data);
+  t.deepEqual(result.info, expected.info);
+});
+
+test('parses an info description seperated by breaks', t => {
   const data = `# Title
 some description
+
 and more on
+
 the next line
 `;
   const expected = {
     info: {
       title: 'Title',
       description: `some description
+
 and more on
+
 the next line`
     }
   };
   const result = parse(data);
   t.deepEqual(result.info, expected.info);
 });
 
-test.skip('parses a title after empty spaces', t => {
+test.skip('parses an info title after empty spaces', t => {
   const data = `
 
 

test/task-test.js

@@ -80,3 +80,5 @@ description
 });
 
 test.todo('warns when missing a task test');
+
+test.todo('parses an array of task tests');