This is an archive of the discontinued LLVM Phabricator instance.

Differential D139212

[Clang] make_cxx_dr_status download the issue list automatically
ClosedPublic

Authored by cor3ntin on Dec 2 2022, 10:36 AM.

Details

Reviewers
aaron.ballman
Commits
rG2fbe3f9e7941: [Clang] make_cxx_dr_status download the issue list automatically
Summary

if none is provided

Diff Detail

Event Timeline

cor3ntin created this revision.Dec 2 2022, 10:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 2 2022, 10:36 AM
cor3ntin requested review of this revision.Dec 2 2022, 10:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 2 2022, 10:36 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
cor3ntin added a reviewer: aaron.ballman.Dec 2 2022, 10:37 AM
Harbormaster completed remote builds in B200799: Diff 479673.Dec 2 2022, 11:24 AM
aaron.ballman accepted this revision.Dec 2 2022, 11:27 AM

LGTM, though my python skills are weak, so if someone else wants to give this a look that'd be great.

This revision is now accepted and ready to land.Dec 2 2022, 11:27 AM
h-vetinari added a subscriber: h-vetinari.Dec 4 2022, 3:10 AM

I've had a small nit/suggestion post-merge of https://reviews.llvm.org/D138901; in case you feel it's worth picking up if you're touching that file already.

cor3ntin updated this revision to Diff 479919.Dec 4 2022, 6:37 AM

Apply changes suggested in D138901

cor3ntin added a comment.Dec 4 2022, 6:37 AM
In D139212#3969179, @h-vetinari wrote:

I've had a small nit/suggestion post-merge of https://reviews.llvm.org/D138901; in case you feel it's worth picking up if you're touching that file already.

Nice simplification, thanks!

Harbormaster completed remote builds in B200972: Diff 479919.Dec 4 2022, 7:10 AM
Closed by commit rG2fbe3f9e7941: [Clang] make_cxx_dr_status download the issue list automatically (authored by cor3ntin). · Explain WhyDec 6 2022, 1:40 AM
This revision was automatically updated to reflect the committed changes.
cor3ntin added a commit: rG2fbe3f9e7941: [Clang] make_cxx_dr_status download the issue list automatically.

Revision Contents

PathSize
clang/
www/
5 lines
93 lines

Diff 480387

clang/www/cxx_dr_status.html

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" <!DOCTYPE html>
"http://www.w3.org/TR/html4/strict.dtd">
<!-- This file is auto-generated by make_cxx_dr_status. Do not modify. --> <!-- This file is auto-generated by make_cxx_dr_status. Do not modify. -->
<html> <html>
<head> <head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <META http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Clang - C++ Defect Report Status</title> <title>Clang - C++ Defect Report Status</title>
<link type="text/css" rel="stylesheet" href="menu.css"> <link type="text/css" rel="stylesheet" href="menu.css">
<link type="text/css" rel="stylesheet" href="content.css"> <link type="text/css" rel="stylesheet" href="content.css">
<style type="text/css"> <style type="text/css">
.none { background-color: #FFCCCC } .none { background-color: #FFCCCC }
.partial { background-color: #FFE0B0 } .partial { background-color: #FFE0B0 }
.unreleased { background-color: #FFFF99 } .unreleased { background-color: #FFFF99 }
.full { background-color: #CCFF99 } .full { background-color: #CCFF99 }
▲ Show 20 Lines • Show All 15,726 Lines • Show Last 20 Lines

clang/www/make_cxx_dr_status

#! /usr/bin/env python3 #! /usr/bin/env python3
import sys, os, re import sys, os, re, urllib.request
index = 'cwg_index.html'
default_issue_list_path = 'cwg_index.html'
issue_list_url = "https://www.open-std.org/jtc1/sc22/wg21/docs/cwg_index.html"
output = 'cxx_dr_status.html' output = 'cxx_dr_status.html'
dr_test_dir = '../test/CXX/drs' dr_test_dir = '../test/CXX/drs'
if len(sys.argv) == 1:
pass
elif len(sys.argv) == 2:
index = sys.argv[1]
else:
print('Usage: make_drs [<path to cwg_index.html>]', file=sys.stderr)
sys.exit(1)
class DR: class DR:
def __init__(self, section, issue, url, status, title): def __init__(self, section, issue, url, status, title):
self.section, self.issue, self.url, self.status, self.title = \ self.section, self.issue, self.url, self.status, self.title = \
section, issue, url, status, title section, issue, url, status, title
def __repr__(self): def __repr__(self):
return '%s (%s): %s' % (self.issue, self.status, self.title) return '%s (%s): %s' % (self.issue, self.status, self.title)
def parse(dr): def parse(dr):
section, issue_link, status, liaison, title = [ section, issue_link, status, liaison, title = [
col.split('>', 1)[1].split('</TD>')[0] col.split('>', 1)[1].split('</TD>')[0]
for col in dr.split('</TR>', 1)[0].split('<TD')[1:] for col in dr.split('</TR>', 1)[0].split('<TD')[1:]
] ]
_, url, issue = issue_link.split('"', 2) _, url, issue = issue_link.split('"', 2)
url = url.strip() url = url.strip()
issue = int(issue.split('>', 1)[1].split('<', 1)[0]) issue = int(issue.split('>', 1)[1].split('<', 1)[0])
title = title.replace('<issue_title>', '').replace('</issue_title>', '').replace('\r\n', '\n').strip() title = title.replace('<issue_title>', '').replace('</issue_title>', '').replace('\r\n', '\n').strip()
return DR(section, issue, url, status, title) return DR(section, issue, url, status, title)
def collect_tests():
status_re = re.compile(r'\bdr([0-9]+): (.*)') status_re = re.compile(r'\bdr([0-9]+): (.*)')
status_map = {} status_map = {}
for test_cpp in os.listdir(dr_test_dir): for test_cpp in os.listdir(dr_test_dir):
if not test_cpp.endswith('.cpp'): if not test_cpp.endswith('.cpp'):
continue continue
test_cpp = os.path.join(dr_test_dir, test_cpp) test_cpp = os.path.join(dr_test_dir, test_cpp)
found_any = False; found_any = False;
for match in re.finditer(status_re, open(test_cpp, 'r').read()): for match in re.finditer(status_re, open(test_cpp, 'r').read()):
status_map[int(match.group(1))] = match.group(2) status_map[int(match.group(1))] = match.group(2)
found_any = True found_any = True
if not found_any: if not found_any:
print("warning:%s: no '// dr123: foo' comments in this file" % test_cpp, file=sys.stderr) print("warning:%s: no '// dr123: foo' comments in this file" % test_cpp, file=sys.stderr)
return status_map
def get_issues(path):
buffer = None
if not path and os.path.exists(default_issue_list_path):
path = default_issue_list_path
try:
if path is None:
print('Fetching issue list from {}'.format(issue_list_url))
with urllib.request.urlopen(issue_list_url) as f:
buffer = f.read().decode('utf-8')
else:
print('Opening issue list from file {}'.format(path))
with open(path, 'r') as f:
buffer = f.read()
except Exception as ex:
print('Unable to read the core issue list', file=sys.stderr)
print(ex, file=sys.stderr)
sys.exit(1)
drs = sorted((parse(dr) for dr in open(index, 'r').read().split('<TR>')[2:]), return sorted((parse(dr) for dr in buffer.split('<TR>')[2:]),
key = lambda dr: dr.issue) key = lambda dr: dr.issue)
issue_list_path = None
if len(sys.argv) == 1:
pass
elif len(sys.argv) == 2:
issue_list_path = sys.argv[1]
else:
print('Usage: {} [<path to cwg_index.html>]'.format(sys.argv[0]), file=sys.stderr)
sys.exit(1)
status_map = collect_tests()
drs = get_issues(issue_list_path)
out_file = open(output, 'w') out_file = open(output, 'w')
out_file.write('''\ out_file.write('''\
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" <!DOCTYPE html>
"http://www.w3.org/TR/html4/strict.dtd">
<!-- This file is auto-generated by make_cxx_dr_status. Do not modify. --> <!-- This file is auto-generated by make_cxx_dr_status. Do not modify. -->
<html> <html>
<head> <head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <META http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Clang - C++ Defect Report Status</title> <title>Clang - C++ Defect Report Status</title>
<link type="text/css" rel="stylesheet" href="menu.css"> <link type="text/css" rel="stylesheet" href="menu.css">
<link type="text/css" rel="stylesheet" href="content.css"> <link type="text/css" rel="stylesheet" href="content.css">
<style type="text/css"> <style type="text/css">
.none { background-color: #FFCCCC } .none { background-color: #FFCCCC }
.partial { background-color: #FFE0B0 } .partial { background-color: #FFE0B0 }
.unreleased { background-color: #FFFF99 } .unreleased { background-color: #FFFF99 }
.full { background-color: #CCFF99 } .full { background-color: #CCFF99 }
Show All 25 Lines <tr>
<th>Issue title</th> <th>Issue title</th>
<th>Available in Clang?</th> <th>Available in Clang?</th>
</tr>''') </tr>''')
latest_release = 15 latest_release = 15
def availability(issue): def availability(issue):
status = status_map.get(issue, 'unknown') status = status_map.get(issue, 'unknown')
unresolved_status = '' unresolved_status = ''
if status.endswith(' open'): if status.endswith(' open'):
status = status[:-5] status = status[:-5]
unresolved_status = 'open' unresolved_status = 'open'
elif status.endswith(' drafting'): elif status.endswith(' drafting'):
status = status[:-9] status = status[:-9]
unresolved_status = 'drafting' unresolved_status = 'drafting'
elif status.endswith(' review'): elif status.endswith(' review'):
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Linesdef availability(issue):
return (avail + avail_suffix, avail_style, unresolved_status) return (avail + avail_suffix, avail_style, unresolved_status)
count = {} count = {}
for dr in drs: for dr in drs:
if dr.status in ('concepts',): if dr.status in ('concepts',):
# This refers to the old ("C++0x") concepts feature, which was not part # This refers to the old ("C++0x") concepts feature, which was not part
# of any C++ International Standard or Technical Specification. # of any C++ International Standard or Technical Specification.
continue continue
elif dr.status == 'extension': elif dr.status == 'extension':
row_style = ' class="open"' row_style = ' class="open"'
avail = 'Extension' avail = 'Extension'
avail_style = '' avail_style = ''
elif dr.status in ('open', 'drafting', 'review'): elif dr.status in ('open', 'drafting', 'review'):
row_style = ' class="open"' row_style = ' class="open"'
avail, avail_style, unresolved_status = availability(dr.issue) avail, avail_style, unresolved_status = availability(dr.issue)
if avail == 'Unknown': if avail == 'Unknown':
avail = 'Not resolved' avail = 'Not resolved'
avail_style = '' avail_style = ''
else: else:
assert unresolved_status == dr.status, \ assert unresolved_status == dr.status, \
"Issue %s is marked '%s', which differs from CWG index status '%s'" \ "Issue %s is marked '%s', which differs from CWG index status '%s'" \
% (dr.issue, unresolved_status, dr.status) % (dr.issue, unresolved_status, dr.status)
if not avail.startswith('Sup') and not avail.startswith('Dup'):
count[avail] = count.get(avail, 0) + 1
else: else:
row_style = '' row_style = ''
avail, avail_style, unresolved_status = availability(dr.issue) avail, avail_style, unresolved_status = availability(dr.issue)
assert not unresolved_status, \ assert not unresolved_status, \
"Issue %s is marked '%s', even though it is resolved in CWG index" \ "Issue %s is marked '%s', even though it is resolved in CWG index" \
% (dr.issue, unresolved_status) % (dr.issue, unresolved_status)
if not avail.startswith('Sup') and not avail.startswith('Dup'): if not avail.startswith('Sup') and not avail.startswith('Dup'):
count[avail] = count.get(avail, 0) + 1 count[avail] = count.get(avail, 0) + 1
out_file.write(''' out_file.write('''
<tr%s id="%s"> <tr%s id="%s">
<td><a href="https://wg21.link/cwg%s">%s</a></td> <td><a href="https://wg21.link/cwg%s">%s</a></td>
<td>%s</td> <td>%s</td>
<td>%s</td> <td>%s</td>
<td%s align="center">%s</td> <td%s align="center">%s</td>
</tr>''' % (row_style, dr.issue, dr.issue, dr.issue, dr.status, dr.title, avail_style, avail)) </tr>''' % (row_style, dr.issue, dr.issue, dr.issue, dr.status, dr.title, avail_style, avail))
Show All 13 Lines