Reader: more proper comment support.

Author: ForNeVeR

Naggum.Test/CompilerTest.fs

@@ -31,7 +31,7 @@ type CompilerTest() =
     static let executableExtension = "exe"
 
     static let directory = @"..\..\..\tests"
-    static let filenames = [@"test"]
+    static let filenames = [@"comment"; @"test"]
 
     static member private RunTest testName =
         let basePath = Path.Combine(directory, testName)

Naggum.sln

@@ -5,6 +5,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ngc", "ngc\ngc.fsproj", "{A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test programs", "Test programs", "{2972575D-A421-4759-AE89-57560E0224AE}"
 	ProjectSection(SolutionItems) = preProject
+		tests\comment.naggum = tests\comment.naggum
+		tests\comment.result = tests\comment.result
 		tests\test.naggum = tests\test.naggum
 		tests\test.result = tests\test.result
 	EndProjectSection

ngc/Reader.fs

@@ -35,8 +35,9 @@ type SExp =
     | Atom of Value
     | List of SExp list
 
-let ws parser = parser .>> spaces
-let commented parser = ws parser .>> (opt ((skipChar ';') .>> (skipRestOfLine true)))
+let comment = (skipChar ';') .>> (skipRestOfLine true)
+let skipSpaceAndComments = skipMany (spaces1 <|> comment)
+let commented parser = skipSpaceAndComments >>. parser .>> skipSpaceAndComments
 let list,listRef = createParserForwardedToRef()
 
 let numberOptions =
@@ -78,7 +79,7 @@ let symbol = (many1Chars (letter <|> digit <|> symChars)) |>> Symbol
 let atom =  (pnumber <|> string <|> symbol) |>> Atom
 
 let listElement = choice [atom;list]
-let sexp = commented (pstring "(") >>. many (commented listElement) .>> commented (pstring ")") |>> List
+let sexp = commented (pchar '(') >>. many (commented listElement) .>> commented (pchar ')') |>> List
 let parser = many1 (choice [atom;sexp])
 do listRef := sexp
 

tests/comment.naggum

@@ -0,0 +1,4 @@
+; a comment
+(System.Console.WriteLine "ok")
+ ; a second comment
+ ; a third comment

tests/comment.result

@@ -0,0 +1 @@
+ok