Schema: parse annotations on patterns, parse line comments

src/preserves/schemaparse.nim

@@ -63,9 +63,13 @@ proc match(text: string; p: var ParseState)
 
 const parser = peg("Schema", p: ParseState):
 
-  Schema <- ?Annotation * S * +(Clause * S) * !1
+  S <- *{ ' ', '\t', '\r', '\n' }
 
-  Clause <- (Version | EmbeddedTypeName | Include | Definition) * S * '.'
+  Schema <- +Clause * S * !1
+
+  Clause <- *LineComment * S * (Version | EmbeddedTypeName | Include | Definition) * S * '.'
+
+  LineComment <-  S * '#' * @'\n'
 
   Version <- "version" * S * >(*Digit):
     if parseInt($1) != 1: fail()
@@ -140,7 +144,7 @@ const parser = peg("Schema", p: ParseState):
     var node = initRecord(toSymbol("and"), toPreserve takeStackAt())
     pushStack node
 
-  Pattern <- SimplePattern | CompoundPattern
+  Pattern <- ?Annotation * (SimplePattern | CompoundPattern)
 
   SimplePattern <-
       AnyPattern |
@@ -263,8 +267,6 @@ const parser = peg("Schema", p: ParseState):
 
   Comment <- '#' * @'\n'
 
-  S <- *(Space | Comment)
-
   symbol <- Preserves.Symbol
 
   nonSymbolAtom <-
@@ -278,7 +280,7 @@ const parser = peg("Schema", p: ParseState):
   Value <- Preserves.Value:
     discard
 
-  Annotation <- '@' * Value
+  Annotation <-  S * '@' * Value
 
 proc match(text: string; p: var ParseState) =
   let match = parser.match(text, p)