|
Lucio Andrés Illanes Albornoz |
2e1d38 |
From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
From: Thomas Klausner <wiz@NetBSD.org>
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Date: Thu, 19 May 2016 17:30:04 +0200
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Subject: Make whitespace use consistent.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
At least python-3.5.x complains about this forcefully.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
diff
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
index 5e31838..d4c12ee 100644
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -16,12 +16,12 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return self.align == other.align and self.offset == other.offset
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def __str__(self):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- return "(align=%d, offset=%d)" % (self.align, self.offset)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ return "(align=%d, offset=%d)" % (self.align, self.offset)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@staticmethod
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def for_primitive_type(size):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
-
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if size % 8 == 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if size % 8 == 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
# do 8-byte primitives require 8-byte alignment in X11?
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return Alignment(8,0)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
elif size % 4 == 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -33,7 +33,7 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def align_after_fixed_size(self, size):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- new_offset = (self.offset + size) % self.align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ new_offset = (self.offset + size) % self.align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return Alignment(self.align, new_offset)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -41,7 +41,7 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
'''
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Assuming the given external_align, checks whether
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
self is fulfilled for all cases.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- Returns True if yes, False otherwise.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ Returns True if yes, False otherwise.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
'''
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if self.align == 1 and self.offset == 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -55,9 +55,9 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return False
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if external_align.align % self.align != 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if external_align.align % self.align != 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
-
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
# safe and check for it)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -72,7 +72,7 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def combine_with(self, other):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
-
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
new_align = gcd(self.align, other.align)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
new_offset_candidate1 = self.offset % new_align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
new_offset_candidate2 = other.offset % new_align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -83,8 +83,8 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
new_align = gcd(new_align, offset_diff)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
new_offset_candidate1 = self.offset % new_align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
new_offset_candidate2 = other.offset % new_align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- assert new_offset_candidate1 == new_offset_candidate2
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- new_offset = new_offset_candidate1
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ assert new_offset_candidate1 == new_offset_candidate2
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ new_offset = new_offset_candidate1
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return Alignment(new_align, new_offset)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -92,44 +92,44 @@ class Alignment(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
class AlignmentLog(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def __init__(self):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.ok_list = []
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.fail_list = []
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.verbosity = 1
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.ok_list = []
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.fail_list = []
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.verbosity = 1
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def __str__(self):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result = ""
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result = ""
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
-
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- stacksize = len(callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ stacksize = len(callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
indent = ' ' * stacksize
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if self.ok_callstack_is_relevant(callstack):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if self.ok_callstack_is_relevant(callstack):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if field_name is None or field_name == "":
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- % (indent, str(type_obj), indent, str(align_before), str(align_after)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- else:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- % (indent, str(field_name), str(type_obj),
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- indent, str(align_before), str(align_after)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ % (indent, str(type_obj), indent, str(align_before), str(align_after)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ else:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ % (indent, str(field_name), str(type_obj),
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ indent, str(align_before), str(align_after)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if self.verbosity >= 1:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result += self.callstack_to_str(indent, callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result += self.callstack_to_str(indent, callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
-
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- for (align_before, field_name, type_obj, callstack, reason) in self.fail_list:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- stacksize = len(callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ for (align_before, field_name, type_obj, callstack, reason) in self.fail_list:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ stacksize = len(callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
indent = ' ' * stacksize
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if field_name is None or field_name == "":
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- % (indent, str(align_before), indent, str(type_obj), indent, reason))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- else:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if field_name is None or field_name == "":
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ % (indent, str(align_before), indent, str(type_obj), indent, reason))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ else:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if self.verbosity >= 1:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- result += self.callstack_to_str(indent, callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ result += self.callstack_to_str(indent, callstack)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- return result
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ return result
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def callstack_to_str(self, indent, callstack):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -137,41 +137,41 @@ class AlignmentLog(object):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
for stack_elem in callstack:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
result += "\t %s%s\n" % (indent, str(stack_elem))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
result += "\t%s]\n" % indent
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- return result
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ return result
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def ok_callstack_is_relevant(self, ok_callstack):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if self.verbosity >= 2:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- return True
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if self.verbosity >= 2:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ return True
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if len(ok_callstack) == 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if len(ok_callstack) == 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return True
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
-
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
for (align_before, field_name, type_obj, fail_callstack, reason) in self.fail_list:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if len(ok_callstack) <= len(fail_callstack):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
zipped = zip(ok_callstack, fail_callstack[:len(ok_callstack)])
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- is_subset = all([i == j for i, j in zipped])
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- if is_subset:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ is_subset = all([i == j for i, j in zipped])
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ if is_subset:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return True
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return False
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def ok(self, align_before, field_name, type_obj, callstack, align_after):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.ok_list.append((align_before, field_name, type_obj, callstack, align_after))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.ok_list.append((align_before, field_name, type_obj, callstack, align_after))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def fail(self, align_before, field_name, type_obj, callstack, reason):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.fail_list.append((align_before, field_name, type_obj, callstack, reason))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.fail_list.append((align_before, field_name, type_obj, callstack, reason))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def append(self, other):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.ok_list.extend(other.ok_list)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- self.fail_list.extend(other.fail_list)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.ok_list.extend(other.ok_list)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ self.fail_list.extend(other.fail_list)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def ok_count(self):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- return len(self.ok_list)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ return len(self.ok_list)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
--
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
cgit v0.10.2
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
From: Thomas Klausner <wiz@NetBSD.org>
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Date: Thu, 19 May 2016 17:30:05 +0200
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Subject: print() is a function and needs parentheses.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Fixes build with python-3.x.
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
diff
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
index c3b5758..b83b119 100644
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -501,7 +501,7 @@ class ComplexType(Type):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
int(required_start_align_element.get('align', "4"), 0),
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
int(required_start_align_element.get('offset', "0"), 0))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if verbose_align_log:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- print "Explicit start-align for %s: %s\n" % (self, self.required_start_align)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def resolve(self, module):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if self.resolved:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -592,7 +592,7 @@ class ComplexType(Type):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if verbose_align_log:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
print ("calc_required_start_align: %s has start-align %s"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
% (str(self), str(self.required_start_align)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- print "Details:\n" + str(log)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ print ("Details:\n" + str(log))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if self.required_start_align.offset != 0:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
print (("WARNING: %s\n\thas start-align with non-zero offset: %s"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ "\n\tsuggest to add explicit definition with:"
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -619,12 +619,12 @@ class ComplexType(Type):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
for offset in range(0,align):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
align_candidate = Alignment(align, offset)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if verbose_align_log:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- print "trying %s for %s" % (str(align_candidate), str(self))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ print ("trying %s for %s" % (str(align_candidate), str(self)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
my_log = AlignmentLog()
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if self.is_possible_start_align(align_candidate, callstack, my_log):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
log.append(my_log)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if verbose_align_log:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- print "found start-align %s for %s" % (str(align_candidate), str(self))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ print ("found start-align %s for %s" % (str(align_candidate), str(self)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return align_candidate
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
else:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
my_ok_count = my_log.ok_count()
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -641,7 +641,7 @@ class ComplexType(Type):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
# this type has illegal internal aligns for all possible start_aligns
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if verbose_align_log:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- print "didn't find start-align for %s" % str(self)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ print ("didn't find start-align for %s" % str(self))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
log.append(best_log)
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
return None
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
@@ -900,7 +900,7 @@ class SwitchType(ComplexType):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
def get_align_for_selected_case_field(self, case_field, start_align, callstack, log):
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
if verbose_align_log:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
- print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
+ print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)))
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
total_align = start_align
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
for field in self.bitcases:
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
my_callstack = callstack[:]
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
--
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
cgit v0.10.2
|
|
Lucio Andrés Illanes Albornoz |
2e1d38 |
|