correctly allows comments now

michaelficarra · Nov 18, 2010 · 3f72280 · 3f72280
1 parent 43f130d
commit 3f72280
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -53,7 +53,7 @@ end
 desc 'Test the generated parser against the sample program'
 task :test, [:theory] do |task,args|
 	args.with_defaults :theory => 'trichotomy'
-	sh "cat theories/#{args[:theory]} | ./chase +RTS -N4"
+	sh "cat theories/#{args[:theory]} | ./chase +RTS -N"
 end
 
 

diff --git a/lexer.x b/lexer.x
@@ -5,8 +5,8 @@
 tokens :-
 
 	[\ \t]+                         ; -- ignore whitespace
-	"-- "[^\r\n]*                   ; -- ignore comments
-	"#"[^\r\n]*                     ; -- ignore comments
+	"-- "[^\r\n]*[\r\n]*            ; -- ignore comments
+	"#"[^\r\n]*[\r\n]*              ; -- ignore comments
 	"/*"([^\*]|"*"[^\/])*"*/"       ; -- ignore comments
 	[\r\n]+                         { \p s -> TokenNewline p }
 	"Exists"                        { \p s -> TokenExists p }

diff --git a/theories/trichotomy b/theories/trichotomy
@@ -1,3 +1,4 @@
+-- trichotomies
 T[a,a] -> Contradiction
 T[a,b] & T[b,a] -> Contradiction
 -> Exists a,b,c,d,e: T[a,b] & T[b,c] & T[d,e]