fix function/statement interaction, add token.succeeding for trailing whitespace

Author: chrisdickinson

lib/index.js

@@ -112,6 +112,7 @@ function parser() {
     , tokens = []
     , whitespace = []
     , errored = false
+    , program
     , token
     , node
 
@@ -132,14 +133,17 @@ function parser() {
   node.expecting = '(eof)'
   node.mode = STMTLIST
   node.token = {type: '(program)', data: '(program)'}
+  program = node
 
+  stream.program = program
   state.unshift(node)
   return stream
 
   // stream functions ---------------------------------------------
 
   function write(input) {
     if(input.type === 'whitespace' || input.type === 'line-comment' || input.type === 'block-comment') {
+
       whitespace.push(input)
       return
     }
@@ -148,7 +152,8 @@ function parser() {
 
     if(token && whitespace.length) {
       token.preceding = token.preceding || []
-      token.preceding.concat(whitespace.splice(0, whitespace.length))
+      token.preceding = token.preceding.concat(whitespace)
+      whitespace = []
     }
 
     while(take()) switch(state[0].mode) {
@@ -182,16 +187,19 @@ function parser() {
       return
     }
 
+    stream.emit('end')
     stream.readable = false
     stream.closed = true
     stream.emit('close')
   }
 
 
   function destroy() {
-    this.write = function(){}
-    this.writable = false
-    this.emit('close')
+    stream.emit('end')
+
+    stream.write = function(){}
+    stream.writable = false
+    stream.emit('close')
   }
 
   function take() {
@@ -220,10 +228,10 @@ function parser() {
       for(var i = 0, len = this.length - 1; i < len; ++i) {
         pad += ' |'
       }
-      console.log(pad, '\\'+_node.type)
+      console.log(pad, '\\'+_node.type, _node.token.data)
     }
 
-    if(add_child) node.children.push(_node)
+    if(add_child && node !== _node) node.children.push(_node)
     node = _node
 
     return ret
@@ -426,8 +434,6 @@ function parser() {
 
         tokens.shift()
 
-        // push old child back onto stack without emitting it.
-
         state.unshift(expr(',', ';'))
         return
       }
@@ -464,6 +470,7 @@ function parser() {
       return unexpected('expected user-defined name, got '+token.data)
     }
 
+    state[0].data = token.data
     return state.shift(), tokens.shift()
   }
 
@@ -589,7 +596,20 @@ function parser() {
   }
 
   function advance(op, t) {
-    return function() { return assert(t || 'operator', op) && (tokens.shift(), Advance) }
+    t = t || 'operator'
+    return function() {
+      if(!assert(t, op)) return
+
+      var last = tokens.shift()
+        , children = state[0].children
+        , last_node = children[children.length - 1]
+
+      if(last_node && last_node.token && last.preceding) {
+        last_node.token.succeeding = last_node.token.succeeding || []
+        last_node.token.succeeding = last_node.token.succeeding.concat(last.preceding)
+      }
+      return Advance
+    }
   }
 
   function advance_expr(until) {
@@ -638,7 +658,11 @@ function parser() {
         , advance_ident(true)
         , advance('{')
         , function() {
-            if(token.data === '}') { popstmt()(), tokens.shift(); return }
+            if(token.data === '}') {
+              state[0].token.succeeding = token.preceding
+              popstmt()(), tokens.shift();
+              return
+            }
             if(token.data === ';') { tokens.shift(); return }
             state.unshift(decl(NO_ASSIGN_ALLOWED))
           }
@@ -754,7 +778,7 @@ function parser() {
       , advance('{')
       , advance_stmtlist()
       , advance('}') 
-      , popstmt()
+      , function() { return state.shift(), state.shift(), state.shift() }
       )
 
     parse_function_args =