Merge pull request #2806 from Ms2ger/tidy

Improve and extend tidy.py, and run it on Travis.

src/components/compositing/compositor_task.rs

@@ -47,7 +47,7 @@ impl ScriptListener for CompositorChan {
                              pipeline_id: PipelineId,
                              layer_id: LayerId,
                              point: Point2D<f32>) {
-	    self.chan.send(ScrollFragmentPoint(pipeline_id, layer_id, point));
+        self.chan.send(ScrollFragmentPoint(pipeline_id, layer_id, point));
     }
 
     fn close(&self) {

src/components/net/resource_task.rs

@@ -234,10 +234,10 @@ impl ResourceManager {
         for scheme_loader in self.loaders.iter() {
             match *scheme_loader {
                 (ref scheme, ref loader_factory) => {
-	            if (*scheme) == load_data.url.scheme {
+                    if (*scheme) == load_data.url.scheme {
                         return Some((*loader_factory)());
                     }
-	        }
+                }
             }
         }
         return None;

src/etc/licenseck.py

@@ -14,24 +14,18 @@ license0="""\
 """
 
 license1="""\
-/* This Source Code Form is subject to the terms of the Mozilla Public
+# This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# License, v. 2.0. If a copy of the MPL was not distributed with this
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """
 
 license2="""\
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-"""
-
-license3="""\
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """
 
-license4 = """\
+license3 = """\
 // Copyright 2013 The Servo Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution.
 //
@@ -42,7 +36,7 @@ license4 = """\
 // except according to those terms.
 """
 
-license5 = """\
+license4 = """\
 # Copyright 2013 The Servo Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution.
 #
@@ -53,7 +47,7 @@ license5 = """\
 # except according to those terms.
 """
 
-licenses = [license0, license1, license2, license3, license4, license5]
+licenses = [license0, license1, license2, license3, license4]
 
 exceptions = [
     "rust-http-client/http_parser.c", # BSD, Joyent

src/etc/servo_gdb.py

@@ -22,120 +22,120 @@ import gdb
 
 # Print Au in both raw value and CSS pixels
 class AuPrinter:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def to_string(self):
+    def to_string(self):
-		i32_type = gdb.lookup_type("i32")
+        i32_type = gdb.lookup_type("i32")
-		au = self.val.cast(i32_type);
+        au = self.val.cast(i32_type);
-		return "{0}px ({1} au)".format(au / 60.0, au)
+        return "{0}px ({1} au)".format(au / 60.0, au)
 
 # Print a U8 bitfield as binary
 class BitFieldU8Printer:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def to_string(self):
+    def to_string(self):
-		u8_type = gdb.lookup_type("u8")
+        u8_type = gdb.lookup_type("u8")
-		value = self.val.cast(u8_type);
+        value = self.val.cast(u8_type);
-		return "[{0:#010b}]".format(int(value))
+        return "[{0:#010b}]".format(int(value))
 
 # Print a struct with fields as children
 class ChildPrinter:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def children(self):
+    def children(self):
-		children = []
+        children = []
-		for f in self.val.type.fields():
+        for f in self.val.type.fields():
-			children.append( (f.name, self.val[f.name]) )
+            children.append( (f.name, self.val[f.name]) )
-		return children
+        return children
 
-	def to_string(self):
+    def to_string(self):
-		return None
+        return None
 
 # Allow a trusted node to be dereferenced in the debugger
 class TrustedNodeAddressPrinter:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def children(self):
+    def children(self):
-		node_type = gdb.lookup_type("struct script::dom::node::Node").pointer()
+        node_type = gdb.lookup_type("struct script::dom::node::Node").pointer()
-		value = self.val.cast(node_type)
+        value = self.val.cast(node_type)
-		return [('Node', value)]
+        return [('Node', value)]
 
-	def to_string(self):
+    def to_string(self):
-		return self.val.address
+        return self.val.address
 
 # Extract a node type ID from enum
 class NodeTypeIdPrinter:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def to_string(self):
+    def to_string(self):
-		u8_ptr_type = gdb.lookup_type("u8").pointer()
+        u8_ptr_type = gdb.lookup_type("u8").pointer()
-		enum_0 = self.val.address.cast(u8_ptr_type).dereference()
+        enum_0 = self.val.address.cast(u8_ptr_type).dereference()
-		enum_type = self.val.type.fields()[int(enum_0)].type;
+        enum_type = self.val.type.fields()[int(enum_0)].type;
-		return str(enum_type).lstrip('struct ')
+        return str(enum_type).lstrip('struct ')
 
 # Printer for std::Option<>
 class OptionPrinter:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def is_some(self):
+    def is_some(self):
-		# Get size of discriminator
+        # Get size of discriminator
-		d_size = self.val.type.fields()[0].type.sizeof
+        d_size = self.val.type.fields()[0].type.sizeof
 
-		if d_size > 0 and d_size <= 8:
+        if d_size > 0 and d_size <= 8:
-			# Read first byte to check if None or Some
+            # Read first byte to check if None or Some
-			ptr = self.val.address.cast(gdb.lookup_type("unsigned char").pointer())
+            ptr = self.val.address.cast(gdb.lookup_type("unsigned char").pointer())
-			discriminator = int(ptr.dereference())
+            discriminator = int(ptr.dereference())
-			return discriminator != 0
+            return discriminator != 0
 
-		raise "unhandled discriminator size"
+        raise "unhandled discriminator size"
 
-	def children(self):
+    def children(self):
-		if self.is_some():		
+        if self.is_some():
-			option_type = self.val.type
+            option_type = self.val.type
 
-			# Get total size and size of value
+            # Get total size and size of value
-			ptr = self.val.address.cast(gdb.lookup_type("unsigned char").pointer())
+            ptr = self.val.address.cast(gdb.lookup_type("unsigned char").pointer())
-			t_size = option_type.sizeof
+            t_size = option_type.sizeof
-			value_type = option_type.fields()[1].type.fields()[1].type
+            value_type = option_type.fields()[1].type.fields()[1].type
-			v_size = value_type.sizeof
+            v_size = value_type.sizeof
-			data_ptr = (ptr + t_size - v_size).cast(value_type.pointer()).dereference()
+            data_ptr = (ptr + t_size - v_size).cast(value_type.pointer()).dereference()
-			return [('Some', data_ptr)]
+            return [('Some', data_ptr)]
-		return [('None', None)]
+        return [('None', None)]
 
-	def to_string(self):
+    def to_string(self):
-		return None
+        return None
 
 # Useful for debugging when type is unknown
 class TestPrinter:
-	def __init__(self, val):
+    def __init__(self, val):
-		self.val = val
+        self.val = val
 
-	def to_string(self):
+    def to_string(self):
-		return "[UNKNOWN - type = {0}]".format(str(self.val.type))
+        return "[UNKNOWN - type = {0}]".format(str(self.val.type))
 
 type_map = [
-	('Au', AuPrinter),
+    ('Au', AuPrinter),
-	('FlowFlags', BitFieldU8Printer),
+    ('FlowFlags', BitFieldU8Printer),
-	('IntrinsicWidths', ChildPrinter),
+    ('IntrinsicWidths', ChildPrinter),
-	('PlacementInfo', ChildPrinter),
+    ('PlacementInfo', ChildPrinter),
-	('TrustedNodeAddress', TrustedNodeAddressPrinter),
+    ('TrustedNodeAddress', TrustedNodeAddressPrinter),
-	('NodeTypeId', NodeTypeIdPrinter),
+    ('NodeTypeId', NodeTypeIdPrinter),
-	('Option', OptionPrinter),
+    ('Option', OptionPrinter),
 ]
 
 def lookup_servo_type (val):
-	val_type = str(val.type)
+    val_type = str(val.type)
-	for (type_name, printer) in type_map:
+    for (type_name, printer) in type_map:
-		if val_type == type_name or val_type.endswith("::"+type_name):
+        if val_type == type_name or val_type.endswith("::"+type_name):
-			return printer(val)
+            return printer(val)
-	return None
+    return None
-	#return TestPrinter(val)
+    #return TestPrinter(val)
 
 def register_printers(obj):
-	gdb.pretty_printers.append(lookup_servo_type)
+    gdb.pretty_printers.append(lookup_servo_type)

src/etc/tidy.py

@@ -9,37 +9,54 @@
 
 #!/usr/bin/env python
 
-import fileinput, sys, os
+import os
-from licenseck import *
+import sys
+from licenseck import check_license
 
 err = 0
 
+
 def report_error_name_no(name, no, s):
     global err
     print("%s:%d: %s" % (name, no, s))
-    err=1
+    err = 1
 
-def report_err(s):
-    report_error_name_no(fileinput.filename(), fileinput.filelineno(), s)
-
-def report_warn(s):
-    print("%s:%d: %s" % (fileinput.filename(),
-                         fileinput.filelineno(),
-                         s))
 
 def do_license_check(name, contents):
     if not check_license(name, contents):
         report_error_name_no(name, 1, "incorrect license")
 
+
+def do_whitespace_check(name, contents):
+    for idx, line in enumerate(contents):
+        if line[-1] == "\n":
+            line = line[:-1]
+        else:
+            report_error_name_no(name, idx + 1, "No newline at EOF")
+
+        if line.endswith(' '):
+            report_error_name_no(name, idx + 1, "trailing whitespace")
+
+        if '\t' in line:
+            report_error_name_no(name, idx + 1, "tab on line")
+
+        if '\r' in line:
+            report_error_name_no(name, idx + 1, "CR on line")
+
+
 exceptions = [
-    "src/support", # Upstream
+    # Upstream
-    "src/platform", # Upstream
+    "src/support",
-    "src/compiler", # Upstream
+    "src/platform",
-    "src/components/main/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
+    "src/compiler",
-    "src/components/script/dom/bindings/codegen", # Generated and upstream code combined with our own. Could use cleanup
+    "src/test/wpt/web-platform-tests",
-    "src/test/wpt/web-platform-tests", # Upstream
+
+    # Generated and upstream code combined with our own. Could use cleanup
+    "src/components/script/dom/bindings/codegen",
+    "src/components/style/properties/mod.rs",
 ]
 
+
 def should_check(name):
     if ".#" in name:
         return False
@@ -55,6 +72,7 @@ def should_check(name):
             return False
     return True
 
+
 file_names = []
 for root, dirs, files in os.walk(sys.argv[1]):
     for myfile in files:
@@ -62,20 +80,10 @@ for root, dirs, files in os.walk(sys.argv[1]):
         if should_check(file_name):
             file_names.append(file_name)
 
-current_name = ""
+for path in file_names:
-current_contents = ""
+    with open(path, "r") as fp:
-
+        lines = fp.readlines()
-for line in fileinput.input(file_names):
+        do_license_check(path, "".join(lines))
-    if fileinput.isfirstline() and current_name != "":
+        do_whitespace_check(path, lines)
-        do_license_check(current_name, current_contents)
-
-    if fileinput.isfirstline():
-        current_name = fileinput.filename()
-        current_contents = ""
-
-    current_contents += line
-
-if current_name != "":
-    do_license_check(current_name, current_contents)
 
 sys.exit(err)

src/test/wpt/run.py

@@ -1,6 +1,6 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-# You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys, os, argparse
 

travis.linux.script.sh

@@ -1,3 +1,3 @@
 cd build
 ../configure
-make -j2 && make check-servo
+make tidy && make -j2 && make check-servo

travis.osx.script.sh

@@ -1,3 +1,3 @@
 cd build
 ../configure
-make -j2 && make check-servo && make check-content && make check-ref-cpu
+make tidy && make -j2 && make check-servo && make check-content && make check-ref-cpu