shex 0.6.3 → 0.6.4

data/lib/shex/terminals.rb

@@ -43,7 +43,11 @@ module ShEx
     # 160s
     ECHAR                = /\\[tbnrf\\"']/
 
-    WS                   = /(?:\s|(?:#[^\n\r]*))+/m.freeze
+    WS                   = %r((
+                              \s
+                            | (?:\#[^\n\r]*)
+                            | (?:/\*(?:(?:\*[^/])|[^*])*\*/)
+                            )+)xmu.freeze
 
     # 69
     RDF_TYPE             = /a/.freeze
@@ -92,30 +96,6 @@ module ShEx
     CODE                 = /\{(?:[^%\\]|\\[%\\]|#{UCHAR})*%#{WS}*\}/m.freeze
     # 70
     REPEAT_RANGE         = /\{\s*#{INTEGER}(?:,#{WS}*(?:#{INTEGER}|\*)?)?#{WS}*\}/.freeze
-
-    # String terminals, mixed case sensitivity
-    STR_EXPR = %r(true|false
-                 |\^\^|\/\/
-                 |[\(\)\{\}\[\],\.;\=\-\~!\|\&\@\$\?\+\*\%\^a]|
-                 (?i:OR|AND|NOT
-                   |BASE|PREFIX
-                   |IRI|BNODE|NONLITERAL
-                   |MINLENGTH|MAXLENGTH|LENGTH
-                   |MAXINCLUSIVE|MAXEXCLUSIVE
-                   |MININCLUSIVE|MINEXCLUSIVE
-                   |TOTALDIGITS|FRACTIONDIGITS
-                   |START
-                   |EXTERNAL|CLOSED|EXTRA|LITERAL
-                 )
-              )x.freeze
-
-    # Map terminals to canonical form
-    STR_MAP = %w{OR AND NOT BASE PREFIX IRI BNODE NONLITERAL
-      MINLENGTH MAXLENGTH LENGTH MININCLUSIVE MAXINCLUSIVE MINEXCLUSIVE MAXEXCLUSIVE
-      TOTALDIGITS FRACTIONDIGITS START EXTERNAL CLOSED EXTRA LITERAL}.
-    inject({}) do |memo, t|
-      memo.merge(t.downcase => t)
-    end
   
   end
 end

data/lib/shex.rb

@@ -1,10 +1,12 @@
+require               'rdf'
+require               'sxp'
+require               'shex/format'
+
 ##
 # A ShEx runtime for RDF.rb.
 #
 # @see https://shex.io/shex-semantics/#shexc
 module ShEx
-  require               'rdf'
-  require               'shex/format'
   autoload :Algebra,    'shex/algebra'
   autoload :Meta,       'shex/meta'
   autoload :Parser,     'shex/parser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shex
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -230,6 +230,7 @@ files:
 - lib/shex/algebra/annotation.rb
 - lib/shex/algebra/each_of.rb
 - lib/shex/algebra/external.rb
+- lib/shex/algebra/import.rb
 - lib/shex/algebra/language.rb
 - lib/shex/algebra/node_constraint.rb
 - lib/shex/algebra/not.rb
@@ -274,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Implementation of Shape Expressions (ShEx) for RDF.rb