Update subexpression and hash AST constructs

1 files changed, 15 insertions, 10 deletions

diff --git a/lib/handlebars/compiler/ast.js b/lib/handlebars/compiler/ast.js
index 7530074..2439571 100644
--- a/lib/handlebars/compiler/ast.js
+++ b/lib/handlebars/compiler/ast.js
@@ -66,17 +66,10 @@ var AST = {
   SexprNode: function(rawParams, hash, locInfo) {
     this.loc = locInfo;
 
-    this.type = "sexpr";
-    this.hash = hash;
-
-    this.id = rawParams[0];
+    this.type = 'SubExpression';
+    this.path = rawParams[0];
     this.params = rawParams.slice(1);
-  },
-
-  HashNode: function(pairs, locInfo) {
-    this.loc = locInfo;
-    this.type = "hash";
-    this.pairs = pairs;
+    this.hash = hash;
   },
 
   PathNode: function(data, parts, locInfo) {
@@ -128,6 +121,18 @@ var AST = {
     this.loc = locInfo;
     this.type = 'BooleanLiteral';
     this.value = bool === 'true';
+  },
+
+  HashNode: function(pairs, locInfo) {
+    this.loc = locInfo;
+    this.type = 'Hash';
+    this.pairs = pairs;
+  },
+  HashPair: function(key, value, locInfo) {
+    this.loc = locInfo;
+    this.type = 'HashPair';
+    this.key = key;
+    this.value = value;
   }
 };