Merge remote-tracking branch 'origin/master' into wip/no-extend-narrow-primop-names

Author: Ericson2314

.gitignore

@@ -8,3 +8,7 @@
 /GNUmakefile
 /.ghc.environment.*
 /cabal.project.local
+/cabal.test.project.local
+
+# Test data repo ignored. Please see instruction in tests-and-benchmarks.markdown
+/tests/text-test-data/

.travis.yml

@@ -0,0 +1 @@
+../LICENSE

benchmarks/LICENSE

@@ -0,0 +1 @@
+../cbits

benchmarks/cbits

@@ -0,0 +1 @@
+../include

benchmarks/cbits/time_iconv.c renamed to benchmarks/cbits-bench/time_iconv.c

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import utils, sys, codecs
 

benchmarks/include

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import math
 import sys
@@ -12,23 +12,22 @@ def timer(f, count=100):
     a = 1e300
     def g():
         return
-    for i in xrange(3):
+    for i in range(3):
         start = time.time()
-        for j in xrange(count):
+        for j in range(count):
             g()
         a = min(a, (time.time() - start) / count)
 
     b = 1e300
-    for i in xrange(3):
+    for i in range(3):
         start = time.time()
-        for j in xrange(count):
+        for j in range(count):
             f()
         b = min(b, (time.time() - start) / count)
 
     return round(b - a, int(round(math.log(count, 10) - math.log(b - a, 10))))
 
 contents = open('../../tests/text-test-data/yiwiki.xml', 'r').read()
-contents = contents.decode('utf-8')
 
 benchmarks = (
     find_first,
@@ -47,4 +46,4 @@ def g():
 for b in bms:
     sys.stdout.write(b.__name__ + ' ')
     sys.stdout.flush()
-    print b()
+    print(b())

benchmarks/python/cut.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import utils, sys, codecs
 

benchmarks/python/multilang.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import utils, sys