sparql 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODcwMWVhOTNhZWVlZGI1ZTM4M2NiYWQyNWRlMGJkYTgxYmY1NDEyMQ==
+    YTZhNzhjYThiN2Y4MjFhYzc1YjJjZmY3NzM2Yjk1ZTZlNGUxMWE1Mw==
   data.tar.gz: !binary |-
-    OWIzZTI0ZGFlZDk5MDE3YTlkYTAyOWVmZDNkYWUzNDdiYzZlYjJjZA==
+    M2Q3ZjMzOTcyODY3YTYxZDY3ZmVkNTU2MWZiZTUzNWVlM2E1NjAwYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Njg4OTNlNTJjNWNiZmJiNWI2NjhmMDM1ZTQ2Y2IxN2FiODQ3NmFhNjM0ZmQ3
-    YWNlNzA1YTgwZGE3MzY5MGE5OTFkZWJhODc4NzUyZTZmMzRiZTQwNjdkM2Zh
-    YmU5ZTJmNTBiMzU5OWFkOWFiYWY5Y2FmN2ZiYjRlNmFhYWFkOWU=
+    OWQzMDJmNTRlOTUwMjI4YTM5MDljNmE2M2IwMzA5MDNlNWJjN2FhNjhjY2Y1
+    NWRiM2NjNzVkNTljNjdkYjI5ZmNlYmM4NzIwY2M2MjRkYzYyYmE3N2U3ZTkz
+    OWEyNWM5OTQzYmU5YTBkOGNhZTdkOTE3MmRiZDkyYzdkYzgyZTQ=
   data.tar.gz: !binary |-
-    ZGJiMDYxOTg5NmYxMjkwY2MxN2IyYjdlNmIwYjFlNGNjNTg4NmFmODBlOGZi
-    OTM4ZGQyZTRiZjBiMzFmNzUxNjIyNGEzNThkM2QzNTcxMThjZmM1YjUzZTk2
-    NTkwNzMyMjJkMjVlODJiOTE3M2EyMWMwOTA3NmJmYzgzMzhhYzk=
+    MjZkYzUwNDQ0OTNmZDE1MzM3YTMzNDUwMmRiM2U0OGJlMGNiMWNiNmJmYzQ3
+    NjE3ODhiMzExNDhjOWI0NDFhYjE3N2JjNDhiNjYzMzBjMTVkM2Y0YjA1NDRi
+    YmE3YzlhZjg3NDk3NTY2ZmFhNWZmYjcwMTAzZWQ2NTZkOTY2ZDQ=

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/sparql/grammar/meta.rb

@@ -1,7 +1,7 @@
 # This file is automatically generated by /Users/gregg/Projects/ebnf/bin/ebnf
 # BRANCH derived from etc/sparql11.bnf
 module SPARQL::Grammar::Meta
-  START = :Query
+  START = :QueryUnit
 
   BRANCH = {
     :AdditiveExpression => {
@@ -4035,6 +4035,14 @@ module SPARQL::Grammar::Meta
       "PREFIX" => [:Prologue, :_Query_1, :BindingsClause],
       "SELECT" => [:Prologue, :_Query_1, :BindingsClause],
     },
+    :QueryUnit => {
+      "ASK" => [:Query],
+      "BASE" => [:Query],
+      "CONSTRUCT" => [:Query],
+      "DESCRIBE" => [:Query],
+      "PREFIX" => [:Query],
+      "SELECT" => [:Query],
+    },
     :_Query_1 => {
       "ASK" => [:AskQuery],
       "CONSTRUCT" => [:ConstructQuery],
@@ -12406,6 +12414,7 @@ module SPARQL::Grammar::Meta
       "BASE",
       "PREFIX"],
     :QueryUnit => [
+      :_eps,
       "CONSTRUCT",
       "DESCRIBE",
       "ASK",
@@ -33176,6 +33185,8 @@ module SPARQL::Grammar::Meta
       "GRAPH"],
     :Query => [
       :_eof],
+    :QueryUnit => [
+      :_eof],
     :_Query_1 => [
       "BINDINGS",
       :_eof],

data/lib/sparql/grammar/parser11.rb

@@ -979,7 +979,23 @@ module SPARQL::Grammar
       ll1_parse(@input, prod.to_sym, @options.merge(:branch => BRANCH,
                                                      :first => FIRST,
                                                      :follow => FOLLOW)
-      ) {}
+      ) do |context, *data|
+        case context
+        when :trace
+          level, lineno, depth, *args = data
+          message = "#{args.join(': ')}"
+          d_str = depth > 100 ? ' ' * 100 + '+' : ' ' * depth
+          str = "[#{lineno}](#{level})#{d_str}#{message}"
+          case @options[:debug]
+          when Array
+            @options[:debug] << str
+          when TrueClass
+            $stderr.puts str
+          when Integer
+            $stderr.puts(str) if level <= @options[:debug]
+          end
+        end
+      end
 
       # The last thing on the @prod_data stack is the result
       @result = case
@@ -1267,36 +1283,5 @@ module SPARQL::Grammar
         add_prod_datum(:Expression, data[:Expression])
       end
     end
-
-    ##
-    # Progress output when debugging
-    # @overload debug(node, message)
-    #   @param [String] node relative location in input
-    #   @param [String] message ("")
-    #
-    # @overload debug(message)
-    #   @param [String] message ("")
-    #
-    # @yieldreturn [String] added to message
-    def debug(*args)
-      return unless @options[:debug]
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      debug_level = options.fetch(:level, 1)
-      return unless debug_level <= DEBUG_LEVEL
-      depth = options[:depth] || self.depth
-      message = args.pop
-      message = message.call if message.is_a?(Proc)
-      args << message if message
-      args << yield if block_given?
-      message = "#{args.join(': ')}"
-      str = "[#{@lineno}]#{' ' * depth}#{message}"
-      case @options[:debug]
-      when Array
-        options[:debug] << str
-      else
-        $stderr.puts str
-      end
-    end
-
   end # class Parser
 end # module SPARQL::Grammar

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement