Iterate over more documented operators, now that the documentation has improved; now 3460 tests.

Replace hard-coded lists of real-number types, and of arithmetic and logical operators I’m testing, with lists added to SwiftIntTypes.py, which becomes a bit of a misnomer.  
Separate them into ones which only work on integer types, and those which also allow reals.
Do a double loop, over just the integers and then the reals as well.
Change the run line to allow importing StdlibUnittest with help from Dmitri, which I won't actually need until I do result type checking.

Approved by Dmitri.

Swift SVN r24029

Author: FlashSheridan

utils/SwiftIntTypes.py

@@ -74,3 +74,29 @@ def should_define_truncating_bit_pattern_init(src_ty, dst_ty):
 
     return False
 
+def all_integer_type_names():
+    return [self_ty.stdlib_name for self_ty in all_integer_types(0)]
+
+def all_real_number_type_names():
+    return ['Float', 'Double']  #TODO Float80 for i386 & x86_64
+
+def all_numeric_type_names():
+    return all_integer_type_names() + all_real_number_type_names()
+
+# Swift_Programming_Language/Expressions.html
+
+def all_integer_binary_operator_names():
+    return ['<<', '>>', '&*', '&/', '&%', '&', '&+', '&-', '|', '^']
+    
+def all_integer_or_real_binary_operator_names():
+    return ['*', '/', '%', '+', '-', '..<', '...']
+    
+def all_arithmetic_comparison_operator_names():
+    return ['<', '<=', '>', '>=', '==', '!=']
+    
+def all_integer_assignment_operator_names():
+    return ['<<=', '>>=', '&=', '^=', '|=']
+    
+def all_integer_or_real_assignment_operator_names():
+    return ['=', '*=', '/=', '%=', '+=', '-=']
+    

validation-test/stdlib/NumericDiagnostics.swift.gyb

@@ -1,27 +1,34 @@
 // RUN: rm -rf %t && mkdir -p %t && %S/../../utils/gyb %s -o %t/main.swift
-// RUN: %S/../../utils/line-directive %t/main.swift -- %swift -verify -parse %t/main.swift
+// RUN: %S/../../utils/line-directive %t/main.swift -- %target-build-swift -parse -Xfrontend -verify %t/main.swift
 
-% from SwiftIntTypes import all_integer_types
-% integer_types_array = [self_ty.stdlib_name for self_ty in all_integer_types(0)]
-// integer_types_array: ${integer_types_array}
-% floating_types_array = ['Float', 'Double']
-% typesToTest = floating_types_array + integer_types_array
-// typesToTest: ${typesToTest}
+% from SwiftIntTypes import all_numeric_type_names, all_integer_type_names, \
+%   all_integer_binary_operator_names, all_integer_or_real_binary_operator_names, \
+%   all_arithmetic_comparison_operator_names, all_integer_assignment_operator_names, \
+%   all_integer_or_real_assignment_operator_names
 
-% operatorsToTest = ['=', '*', '/', '%', '==', '!=', '>', '<', '>=', '<=']  # TODO: Restore '+', '-', when rdar://18695154 is fixed.
-// operatorsToTest: ${operatorsToTest} _The Swift Programming Language_ "Basic Operators," binary non-logical ops
-    //TODO: Better error regex, verify the type of the result
+% int_ops = all_integer_binary_operator_names() + all_integer_assignment_operator_names()
+% arith_ops = all_integer_or_real_binary_operator_names() + \
+%   all_arithmetic_comparison_operator_names() + all_integer_or_real_assignment_operator_names()
+
+//TODO: Better error regex, verify the type of the result, Float80 for i386 & x86_64
 
 func testIteratedOperations() {
-% for T1 in typesToTest:
-  % for T2 in typesToTest:
-    % for op in operatorsToTest:
-  if true {
-    var x1_${T1}: ${T1} = 0
-    var x2_${T2}: ${T2} = 0
-    x1_${T1} ${op} x2_${T2}  ${ "// expected-error{{ }}" if T1 != T2 else "" }
-  }
+% for typesToTest, operatorsToTest in zip([all_integer_type_names(), all_numeric_type_names()], \
+%  [int_ops, arith_ops]):
+  % operatorsToTest = [x for x in operatorsToTest if not '+' in x and not '-' in x] 
+  %# TODO: rm when rdar://18695154 is fixed.
+// typesToTest: ${typesToTest}, operatorsToTest: ${operatorsToTest}
+  % for T1 in typesToTest:
+    % for T2 in typesToTest:
+      % for op in operatorsToTest:
+    if true {
+      var x1_${T1}: ${T1} = 0
+      var x2_${T2}: ${T2} = 0
+      x1_${T1} ${op} x2_${T2}  ${ "// expected-error{{ }}" if T1 != T2 else "" }
+    }
+      %end
     %end
   %end
 %end
+
 }