origen_testers 0.21.0 → 0.30.0

data/lib/origen_testers/atp/validators/jobs.rb

@@ -0,0 +1,55 @@
+module OrigenTesters::ATP
+  module Validators
+    class Jobs < Validator
+      def setup
+        @conflicting = []
+        @negative = []
+      end
+
+      def on_completion
+        failed = false
+        unless @conflicting.empty?
+          error 'if_job and unless_job conditions cannot both be applied to the same tests'
+          error "The following conflicts were found in flow #{flow.name}:"
+          @conflicting.each do |a, b|
+            a_condition = a.to_a[1] ? 'if_job:    ' : 'unless_job:'
+            b_condition = b.to_a[1] ? 'if_job:    ' : 'unless_job:'
+            error "  #{a_condition} #{a.source}"
+            error "  #{b_condition} #{b.source}"
+            error ''
+          end
+          failed = true
+        end
+
+        unless @negative.empty?
+          error 'Job names should not be negated, use unless_job if you want to specify !JOB'
+          error "The following negative job names were found in flow #{flow.name}:"
+          @negative.each do |node|
+            error "  #{node.to_a[0]} #{node.source}"
+          end
+          failed = true
+        end
+
+        failed
+      end
+
+      def on_if_job(node)
+        jobs, *nodes = *node
+        jobs = [jobs].flatten
+        state = node.type == :if_job
+        if jobs.any? { |j| j.to_s =~ /^(!|~)/ }
+          @negative << node
+        end
+        @stack ||= []
+        if !@stack.empty? && @stack.last[1] != state
+          @conflicting << [@stack.last[0], node]
+        else
+          @stack << [node, state]
+          process_all(node)
+          @stack.pop
+        end
+      end
+      alias_method :on_unless_job, :on_if_job
+    end
+  end
+end

data/lib/origen_testers/atp/validators/missing_ids.rb

@@ -0,0 +1,63 @@
+module OrigenTesters::ATP
+  module Validators
+    class MissingIDs < Validator
+      def setup
+        @referenced_ids = {}
+        @present_ids ||= {}.with_indifferent_access
+        @referenced_early = {}.with_indifferent_access
+      end
+
+      def on_completion
+        failed = false
+        @referenced_ids.each do |id, nodes|
+          unless @present_ids[id]
+            error "Test ID #{id} is referenced in flow #{flow.name} in the following lines, but it is never defined:"
+            nodes.each do |node|
+              error "  #{node.source}"
+            end
+            failed = true
+            @referenced_early.delete(id)
+          end
+        end
+        @referenced_early.each do |id, nodes|
+          error "Test ID #{id} is referenced in flow #{flow.name} in the following line(s):"
+          nodes.each do |node|
+            error "  #{node.source}"
+          end
+          error 'but it was not defined until later:'
+          error "  #{@present_ids[id].first.source}"
+          failed = true
+        end
+        failed
+      end
+
+      def on_id(node)
+        id = node.value
+        @present_ids[id] ||= []
+        @present_ids[id] << node
+      end
+
+      def on_if_failed(node)
+        ids = node.to_a[0]
+        [ids].flatten.each do |id|
+          unless id =~ /^extern/
+            @referenced_ids[id] ||= []
+            @referenced_ids[id] << node
+            unless @present_ids[id]
+              @referenced_early[id] ||= []
+              @referenced_early[id] << node
+            end
+          end
+        end
+        process_all(node)
+      end
+      alias_method :on_if_any_failed, :on_if_failed
+      alias_method :on_if_all_failed, :on_if_failed
+      alias_method :on_if_passed, :on_if_failed
+      alias_method :on_if_any_passed, :on_if_failed
+      alias_method :on_if_all_passed, :on_if_failed
+      alias_method :on_if_ran, :on_if_failed
+      alias_method :on_unless_ran, :on_if_failed
+    end
+  end
+end

data/lib/origen_testers/atp_deprecation.rb

@@ -0,0 +1,2 @@
+Origen.deprecate 'ATP has been referenced directly, this is now part of OrigenTesters, please update to be OrigenTesters::ATP'
+ATP = OrigenTesters::ATP

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -39,39 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: atp
+  name: origen_stil
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: ast
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: origen_stil
+  name: sexpistol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.0'
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -91,6 +99,45 @@ files:
 - lib/commands/run.rb
 - lib/origen_testers.rb
 - lib/origen_testers/api.rb
+- lib/origen_testers/atp.rb
+- lib/origen_testers/atp/ast/extractor.rb
+- lib/origen_testers/atp/ast/node.rb
+- lib/origen_testers/atp/flow.rb
+- lib/origen_testers/atp/flow_api.rb
+- lib/origen_testers/atp/formatter.rb
+- lib/origen_testers/atp/formatters/basic.rb
+- lib/origen_testers/atp/formatters/datalog.rb
+- lib/origen_testers/atp/parser.rb
+- lib/origen_testers/atp/processor.rb
+- lib/origen_testers/atp/processors/add_ids.rb
+- lib/origen_testers/atp/processors/add_set_result.rb
+- lib/origen_testers/atp/processors/adjacent_if_combiner.rb
+- lib/origen_testers/atp/processors/append_to.rb
+- lib/origen_testers/atp/processors/apply_post_group_actions.rb
+- lib/origen_testers/atp/processors/condition.rb
+- lib/origen_testers/atp/processors/continue_implementer.rb
+- lib/origen_testers/atp/processors/else_remover.rb
+- lib/origen_testers/atp/processors/empty_branch_remover.rb
+- lib/origen_testers/atp/processors/extract_set_flags.rb
+- lib/origen_testers/atp/processors/flag_optimizer.rb
+- lib/origen_testers/atp/processors/flattener.rb
+- lib/origen_testers/atp/processors/flow_id.rb
+- lib/origen_testers/atp/processors/marshal.rb
+- lib/origen_testers/atp/processors/on_pass_fail_remover.rb
+- lib/origen_testers/atp/processors/one_flag_per_test.rb
+- lib/origen_testers/atp/processors/pre_cleaner.rb
+- lib/origen_testers/atp/processors/redundant_condition_remover.rb
+- lib/origen_testers/atp/processors/relationship.rb
+- lib/origen_testers/atp/processors/sub_flow_remover.rb
+- lib/origen_testers/atp/program.rb
+- lib/origen_testers/atp/runner.rb
+- lib/origen_testers/atp/validator.rb
+- lib/origen_testers/atp/validators/condition.rb
+- lib/origen_testers/atp/validators/duplicate_ids.rb
+- lib/origen_testers/atp/validators/flags.rb
+- lib/origen_testers/atp/validators/jobs.rb
+- lib/origen_testers/atp/validators/missing_ids.rb
+- lib/origen_testers/atp_deprecation.rb
 - lib/origen_testers/basic_test_setups.rb
 - lib/origen_testers/callback_handlers.rb
 - lib/origen_testers/command_based_tester.rb