add ( parsing to exprs

Author: chrisdickinson

lib/expr.js

@@ -62,6 +62,18 @@ infix('[', 80, function(left) {
   this.type = 'binary'
   return this
 })
+infix('(', 80, function(left) {
+  this.children = [left]
+  this.type = 'call'
+
+  if(token.data !== ')') while(1) {
+    this.children.push(expression(0))
+    if(token.data !== ',') break
+    advance(',')
+  }
+  advance(')')
+  return this
+})
 
 prefix('-')
 prefix('+')
@@ -90,21 +102,23 @@ assignment('^=')
 assignment('>>=')
 assignment('<<=')
 
-
-
 module.exports = function(incoming_state, incoming_tokens) {
   state = incoming_state
   tokens = incoming_tokens
   idx = 0
+  var result
 
   if(!tokens.length) return
 
   advance()
-  var result = expression(0)
-
+  result = expression(0)
   result.parent = state[0]
   emit(result)
 
+  if(idx < tokens.length) throw new Error('did not use all tokens')
+
+  result.parent.children = [result]
+
   function emit(node) {
     state.unshift(node, false)
     for(var i = 0, len = node.children.length; i < len; ++i) {
@@ -118,8 +132,10 @@ module.exports = function(incoming_state, incoming_tokens) {
 function symbol(id, binding_power) {
   var sym = symbol_table[id]
   binding_power = binding_power || 0
-  if(sym && binding_power > sym.lbp) {
-    sym.lbp = binding_power
+  if(sym) {
+    if(binding_power > sym.lbp) {
+      sym.lbp = binding_power
+    }
   } else {
     sym = Object.create(original_symbol)
     sym.id = id 
@@ -183,7 +199,7 @@ function assignment(id) {
   return infixr(id, 10, function(left) {
     this.children = [left, expression(9)]
     this.assignment = true
-    this.type = 'type'
+    this.type = 'assign'
     return this
   })
 }
@@ -195,7 +211,7 @@ function advance(id) {
     , output
 
   if(id && token.data !== id) {
-    return state.unexpected('expected `'+ id + '`')
+    return state.unexpected('expected `'+ id + '`, got `'+token.data+'`')
   }
 
   if(idx >= tokens.length) {
@@ -233,7 +249,7 @@ function advance(id) {
   output = Object.create(output)
   output.token = next
   output.type = type
-  output.value = value
+  if(!output.data) output.data = value
 
   return token = output
 }