Allow unsigned, short, etc to be their own types

corpus/declarations.txt

@@ -70,6 +70,8 @@ Primitive-typed variable declarations
 unsigned short int a;
 long int b, c = 5, d;
 float d, e;
+unsigned f;
+short g, h;
 
 ---
 
@@ -80,7 +82,9 @@ float d, e;
     (identifier)
     (init_declarator (identifier) (number_literal))
     (identifier))
-  (declaration (identifier) (identifier) (identifier)))
+  (declaration (identifier) (identifier) (identifier))
+  (declaration (sized_type_specifier) (identifier))
+  (declaration (sized_type_specifier) (identifier) (identifier)))
 
 ============================================
 Variable storage classes

grammar.js

@@ -33,6 +33,7 @@ module.exports = grammar({
     [$.sizeof_expression, $.cast_expression],
     [$._type_specifier, $._expression, $.macro_type_specifier],
     [$._type_specifier, $.macro_type_specifier],
+    [$.sized_type_specifier],
   ],
 
   rules: {
@@ -240,7 +241,7 @@ module.exports = grammar({
         'long',
         'short'
       )),
-      $.identifier
+      optional($.identifier)
     ),
 
     enum_specifier: $ => seq(

src/grammar.json

@@ -956,8 +956,16 @@
           }
         },
         {
-          "type": "SYMBOL",
-          "name": "identifier"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "identifier"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -3157,6 +3165,9 @@
     [
       "_type_specifier",
       "macro_type_specifier"
+    ],
+    [
+      "sized_type_specifier"
     ]
   ],
   "externals": []