@@ -1,5 +1,6 @@
 {spawn, exec} = require 'child_process'
 fs = require('fs')
+require('coffee-script/register')
 
 run = (args, cb) ->
   proc =         spawn './node_modules/.bin/coffee', args
 
@@ -149,6 +149,7 @@ grammar =
     o 'Value SUB_SELECT_OP LEFT_PAREN List RIGHT_PAREN',  -> new Op($2, $1, $4)
     o 'Value SUB_SELECT_OP SubSelectExpression',          -> new Op($2, $1, $3)
     o 'SUB_SELECT_UNARY_OP SubSelectExpression',          -> new UnaryOp($1, $2)
+    o 'SubSelectExpression'
     o 'Value'
   ]
 
@@ -201,6 +202,7 @@ grammar =
   ]
 
   UserFunction: [
+    o "LITERAL LEFT_PAREN RIGHT_PAREN",                           -> new FunctionValue($1, null, true)
     o "LITERAL LEFT_PAREN AggregateArgumentList RIGHT_PAREN",     -> new FunctionValue($1, $3, true)
   ]
 
 
@@ -86,6 +86,12 @@ describe "SQL Grammar", ->
         OFFSET 30
       """
 
+    it "parses SELECTs with FUNCTIONs without arguments", ->
+      parse("SELECT X(Y(Z())) FROM X").toString().should.eql """
+      SELECT X(Y(Z()))
+        FROM `X`
+      """
+
     it "parses SELECTs with FUNCTIONs", ->
       parse("SELECT a, COUNT(1, b) FROM my_table LIMIT 10").toString().should.eql """
       SELECT `a`, COUNT(1, `b`)
@@ -301,6 +307,15 @@ describe "SQL Grammar", ->
       """
 
   describe "subselect clauses", ->
+    it "parses a subselect field", ->
+      parse("""select (select x from y) from a""").toString().should.eql """
+      SELECT (
+        SELECT `x`
+          FROM `y`
+      )
+        FROM `a`
+      """
+
     it "parses an IN clause containing a list", ->
       parse("""select * from a where x in (1,2,3)""").toString().should.eql """
       SELECT *
@@ -352,7 +367,7 @@ describe "SQL Grammar", ->
       """
 
   describe "STARS", ->
-    it "parses stars as multiplcation", ->
+    it "parses stars as multiplication", ->
       parse('SELECT * FROM foo WHERE a = 1*2').toString().should.eql """
       SELECT *
         FROM `foo`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ grammar =`
`149`	`149`	`o 'Value SUB_SELECT_OP LEFT_PAREN List RIGHT_PAREN', -> new Op($2, $1, $4)`
`150`	`150`	`o 'Value SUB_SELECT_OP SubSelectExpression', -> new Op($2, $1, $3)`
`151`	`151`	`o 'SUB_SELECT_UNARY_OP SubSelectExpression', -> new UnaryOp($1, $2)`
	`152`	`+ o 'SubSelectExpression'`
`152`	`153`	`o 'Value'`
`153`	`154`	`]`
`154`	`155`
`@@ -201,6 +202,7 @@ grammar =`
`201`	`202`	`]`
`202`	`203`
`203`	`204`	`UserFunction: [`
	`205`	`+ o "LITERAL LEFT_PAREN RIGHT_PAREN", -> new FunctionValue($1, null, true)`
`204`	`206`	`o "LITERAL LEFT_PAREN AggregateArgumentList RIGHT_PAREN", -> new FunctionValue($1, $3, true)`
`205`	`207`	`]`
`206`	`208`