applied John Fieber's patches to the Notation3 functionality from Lig…

…hthouse tickets [#6 state:resolved] and [#7 state:resolved]
tommorris · Feb 2, 2009 · e8334fb · e8334fb
1 parent d8e8b0d
commit e8334fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/reddy/n3_grammar.treetop b/lib/reddy/n3_grammar.treetop
@@ -73,9 +73,13 @@ grammar N3Grammer
 	end
 
 	rule literal
-  	(string1 / string2) ("^^<" uri:URI_Reference ">" / "@" [a-z]+ )?
+  	(string1 / string2) ("^^<" uri:URI_Reference ">" / "@" language )?
 	end
 
+	rule language
+		[a-z]+ ( "-" [a-z0-9]+ )*
+	end
+
 	rule localname
 		fragid
 	end
@@ -110,7 +114,7 @@ grammar N3Grammer
 
   # " constant-value-with-escaping "
 	rule string1
-		'"' string1_char+ '"'
+		'""' !["] / '"' string1_char+ '"'
 	end
 
 	rule string1_char

diff --git a/lib/reddy/n3parser.rb b/lib/reddy/n3parser.rb
@@ -1,5 +1,4 @@
 require 'treetop'
-include Reddy
 
 Treetop.load(File.join(File.dirname(__FILE__), "n3_grammar"))