Support for comments

shortjsonschema/expand.py

@@ -28,7 +28,7 @@ class Parser:
         return schema
 
     def eat_whitespace(self):
-        self.get_token(r'\s*')
+        self.get_token(r'(?m)\s*(--[^\r\n]*$)?\s*')
 
     def parse_object(self, x):
         x.add_type("object")
@@ -64,10 +64,10 @@ class Parser:
                             c.add_type("string");
                         elif self.get_token('\#'):
                             c.add_type("number");
-                        elif self.get_token('\%'):
-                            c.add_type("boolean");
-                        elif self.get_token('\^'):
+                        elif self.get_token('B'):
                             c.add_type("boolean");
+                        elif self.get_token('\~'):
+                            c.add_type("null");
                         elif self.get_token('\{'):
                             self.parse_object(c)
                         elif self.get_token('\['):

shortjsonschema/tests/test_short_schema.py

@@ -33,7 +33,7 @@ def test_short_schema():
             "input": """
             {
                 thing?:{
-                    subthing1?:$, 
+                    subthing1?:$,  -- with comment
                     subthing2:$,
                 }
             }