Add storage classes to function defs

grammar.coffee

@@ -58,9 +58,7 @@ module.exports =
         ";")
 
       var_declaration: -> seq(
-        repeat(choice(
-          keyword("static"),
-          keyword("extern"))),
+        optional(@storage_class),
         @type,
         commaSep1(choice(
           @type_expression,
@@ -68,6 +66,7 @@ module.exports =
         ";")
 
       function_declaration: -> seq(
+        optional(@storage_class),
         @type,
         @type_expression,
         "(", @formal_parameters, ")",
@@ -175,6 +174,10 @@ module.exports =
       enum_value: -> seq(
         @identifier, optional(seq("=", @expression)))
 
+      storage_class: -> repeat(choice(
+        keyword("static"),
+        keyword("extern"))),
+
       field: -> seq(@type, @type_expression)
 
       var_assignment: -> seq(@type_expression, "=", @expression)

grammar_test/declarations.txt

@@ -127,15 +127,23 @@ Function declarations
 ============================================
 
 int main(int argc, const char **argv);
+static foo bar();
 
 ---
 
-(function_declaration
-  (identifier)
-  (identifier)
-  (formal_parameters
-    (field (identifier) (identifier))
-    (field (type (identifier)) (pointer_type (pointer_type (identifier))))))
+(program
+  (function_declaration
+    (identifier)
+    (identifier)
+    (formal_parameters
+      (field (identifier) (identifier))
+      (field (type (identifier)) (pointer_type (pointer_type (identifier))))))
+
+  (function_declaration
+    (storage_class)
+    (identifier)
+    (identifier)
+    (formal_parameters)))
 
 ============================================
 Function definitions

grammar_test/expressions.txt

@@ -108,7 +108,7 @@ int main() {
 
 (function_declaration (identifier) (identifier) (formal_parameters)
   (statement_block
-    (var_declaration (identifier) (var_assignment (identifier) (number)))
+    (var_declaration (storage_class) (identifier) (var_assignment (identifier) (number)))
     (expression_statement (assignment (identifier) (assignment (deref (identifier)) (number))))
     (expression_statement (assignment (field_access (identifier) (identifier)) (number)))
     (expression_statement (assignment (deref_field_access (identifier) (identifier)) (number)))))