Merge branch 'refactor-parser' of github.com:mmun/handlebars.js into mmun-refactor-parser

Conflicts:
	lib/handlebars/compiler/ast.js
	spec/ast.js
	src/handlebars.yy

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/handlebars/compiler/base.js b/lib/handlebars/compiler/base.js
index 722f09a..1378463 100644
--- a/lib/handlebars/compiler/base.js
+++ b/lib/handlebars/compiler/base.js
@@ -1,12 +1,18 @@
 import parser from "./parser";
 import AST from "./ast";
+module Helpers from "./helpers";
+import { extend } from "../utils";
 
 export { parser };
 
+var yy = {};
+extend(yy, Helpers, AST);
+
 export function parse(input) {
   // Just return if an already-compile AST was passed in.
-  if(input.constructor === AST.ProgramNode) { return input; }
+  if (input.constructor === AST.ProgramNode) { return input; }
+
+  parser.yy = yy;
 
-  parser.yy = AST;
   return parser.parse(input);
 }