Fix or mark pending some regular-expression tests.

Author: gkellogg

lib/sparql/algebra/operator/regex.rb

@@ -56,11 +56,19 @@ def apply(text, pattern, flags = RDF::Literal(''), **options)
         flags = flags.to_s
         # TODO: validate flag syntax
 
+        # 's' mode in XPath is like ruby MUTLILINE
+        # 'm' mode in XPath is like ruby /^$/ vs /\A\z/
+        unless flags.include?(?m)
+          pattern = '\A' + pattern[1..-1] if pattern.start_with?('^')
+          pattern = pattern[0..-2] + '\z' if pattern.end_with?('$')
+        end
+
         options = 0
-        raise NotImplementedError, "unsupported regular expression flag: /s" if flags.include?(?s) # FIXME
-        options |= Regexp::MULTILINE  if flags.include?(?m)
+        %w(q x).each do |flag|
+          raise NotImplementedError, "unsupported regular expression flag: /#{flag}" if flags.include?(flag) # FIXME
+        end
+        options |= Regexp::MULTILINE  if flags.include?(?s) # dot-all mode
         options |= Regexp::IGNORECASE if flags.include?(?i)
-        options |= Regexp::EXTENDED   if flags.include?(?x)
         RDF::Literal(Regexp.new(pattern, options) === text)
       end
 

script/tc

@@ -98,6 +98,12 @@ def run_tc(tc, **options)
     info = "More compact representation"
   when /syntax-update-(26|27|28|36).ru/
     info = "Whitespace in string tokens"
+  when 'graph-empty', 'graph-exist', 'graph-not-exist'
+    info = "Graphs with empty BGP"
+  when 'REGEX with the q option'
+    info = "REGEX flag q – no meta-characters"
+  when 'REGEX with the ignore spacing (x) option', 'REGEX with the ignore spacing (x) option with class expression'
+    info = "REGEX flag x – remove whitespace"
   else
     case tc.name
     when 'date-1', 'expr-5.rq'
@@ -268,21 +274,16 @@ def run_tc(tc, **options)
       STDERR.puts "unknown test type #{tc.type}"
     end
   end
-  STDERR.puts options[:logger].to_s if options[:logger].level <= Logger::INFO
 rescue Interrupt
   exit(1)
 rescue Exception => e
   result = 'exception'
   unless options[:quiet]
     STDERR.puts(" Exception: #{e.message}")
-    if options[:verbose]
-      STDERR.puts e.backtrace
-      STDERR.puts options[:logger].to_s
-    else
-      STDERR.puts options[:logger].to_s #if options[:logger].level <= Logger::INFO
-    end
+    STDERR.puts e.backtrace if options[:verbose]
   end
 ensure
+  STDERR.puts options[:logger].to_s if options[:logger].level <= Logger::INFO
   options[:results][result] ||= 0
   options[:results][result] += 1
 

spec/suite_helper.rb

@@ -226,7 +226,13 @@ def self.sparql_11_tests
   end
 
   def self.sparql_12_tests
-    %w(grouping syntax-escaping syntax-triple-terms-negative syntax-triple-terms-positive).map do |partial|
+    %w(grouping
+       syntax-triple-terms-negative
+       syntax-triple-terms-positive
+       eval-triple-terms
+       lang-basedir
+       rdf11
+    ).map do |partial|
       "#{BASE}sparql12/#{partial}/manifest.ttl"
     end
   end

spec/suite_spec.rb

@@ -35,6 +35,12 @@
             pending "failed when simplifying whitespace in terminals"
           when 'nps_inverse.rq', 'nps_direct_and_inverse.rq'
             pending("New SPARQL tests")
+          when 'graph-empty.rq', 'graph-empty-exist.rq', 'graph-empty-not-exist.rq'
+            pending("Graphs with empty BGP")
+          when 'regex-no-metacharacters.rq', 'regex-no-metacharacters-case-insensitive.rq'
+            pending("REGEX flag q – no meta-characters")
+          when 'regex-ignore-whitespaces.rq', 'regex-ignore-whitespaces-class-expression.rq'
+            pending("REGEX flag x – remove whitespace")
           end
 
           skip 'Entailment Regimes' if t.entailment?
@@ -71,6 +77,7 @@
                                 base_uri: t.base_uri,
                                 form: t.form,
                                 all_vars: true,
+                                optimize: true,
                                 logger: t.logger)
 
           expect(result).to describe_csv_solutions(t.solutions)
@@ -110,6 +117,7 @@
                                 base_uri: t.base_uri,
                                 all_vars: true,
                                 form: t.form,
+                                optimize: true,
                                 logger: t.logger)
 
           expect(result).to describe_solutions(t.expected, t)