Change table data_processing_immediate to use the new notation. Also

src/trusted/validator_arm/dgen_test_output.py

 #!/usr/bin/python
 #
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 """
 Responsible for generating the testing decoders based on
 parsed table representations.
@@ skipping 165 matching lines @@
 # Note: DECODER will be replaced by 'actual' and 'baseline', defining
 # how both types of symbols are generated.
 
 CLASS = '%(DECODER)s_%(rule)s'
 NAMED_CLASS = 'Named%(DECODER)s_%(rule)s'
 INSTANCE = '%(DECODER_class)s_instance_'
 BASE_TESTER='%(decoder_base)sTester%(base_test_case)s'
 BASE_BASE_TESTER='%(decoder_base)sTester%(qualifier)s'
 DECODER_TESTER='%(baseline)sTester_%(test_case)s'
 
-def _negated_constraint(constraint):
-  """Returns the negated pattern for the pattern text passed in."""
-  if constraint[0] == '~':
-    return constraint[1:]
-  else:
-    return '~' + constraint
-
 def _safety_to_check(safety):
   return [s for s in safety if not isinstance(s, str)]
 
 def _interesting_patterns(patterns):
   """ Filters out non-interesting patterns."""
   # Only include rows not corresponding to rule pattern,
   # and not always true.
   return [ p for p in patterns if (
       (not p.column or p.column.name() != '$pattern')
       and not p.matches_any())]
@@ skipping 621 matching lines @@
   return row.copy_with_action(
       _filter_test_action(row.action, with_patterns, with_rules))
 
 def _install_row_cases(row, values):
   """Installs row case names, based on values entries."""
 
   # First define base testers that add row constraints and safety checks.
   constraint_rows_map = values.get('constraint_rows')
   if constraint_rows_map:
     base_row = _filter_test_row(row, with_rules=False)
-    base_index = constraint_rows_map[dgen_core.neutral_repr(base_row)]
     values['base_test_case'] = (
         'Case%s' % constraint_rows_map[dgen_core.neutral_repr(base_row)])
   else:
     values['base_test_case'] = ''
 
   # Add test decoders associated with the row in the table.
   decoder_rows_map = values.get('decoder_rows')
   if decoder_rows_map:
     decoder_row = _filter_test_row(row)
     values['test_case'] = (
@@ skipping 69 matching lines @@
     if row.patterns or action.constraints().restrictions:
       out.write(CONSTRAINT_TESTER_PARSE_HEADER % values)
       if row.patterns:
         out.write(ROW_CONSTRAINTS_HEADER % values);
         for p in row.patterns:
           out.write(CONSTRAINT_CHECK % p.negate().to_commented_bool())
       if action.constraints().restrictions:
         out.write(PATTERN_CONSTRAINT_RESTRICTIONS_HEADER)
         for c in action.constraints().restrictions:
           out.write(CONSTRAINT_CHECK %
-                    dgen_core.BitPattern.parse(
-                        _negated_constraint(c),
-                        dgen_core.BitField('constraint', 31, 0))
-                    .to_commented_bool())
+                    c.negate().to_commented_bool())
       out.write(CONSTRAINT_TESTER_CLASS_FOOTER % values)
     if safety_to_check:
       out.write(SAFETY_TESTER_HEADER % values)
       for check in safety_to_check:
         out.write(SAFETY_TESTER_CHECK %
                   check.to_commented_bool());
       out.write(SAFETY_TESTER_FOOTER % values)
 
 def _generate_rule_testers(decoder, values, out):
   """Generates the testers that tests the rule associated with
@@ skipping 34 matching lines @@
       out.write(TEST_FUNCTION_BASELINE % values)
     else:
       out.write(TEST_FUNCTION_ACTUAL_VS_BASELINE % values)
 
 def _index_neutral_map(values):
   """Returns a dictionary from each neutral_repr(value) in list
      values, to its corresponding index. This is done to reduce the
      number of compares to find the index, speeding up code
      generation.
      """
-  map = {}
+  lookup_map = {}
   index = 0
   for v in values:
-    map[dgen_core.neutral_repr(v)] = index
+    lookup_map[dgen_core.neutral_repr(v)] = index
     index += 1
   return map