tyler.durden/test262
1
0
Fork 0
mirror of https://github.com/tc39/test262.git synced 2025-07-29 17:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make it possible to express test case values as a sequence of code points

Browse Source
This commit is contained in:
Richard Gibson 2021-07-14 22:53:07 -04:00 committed by Rick Waldron
parent 8faacdbaee
commit a7fed497c6
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/generation/lib/case.py
View File

@ -7,20 +7,21 @@ import re
from .util.find_comments import find_comments from .util.find_comments import find_comments
from .util.parse_yaml import parse_yaml from .util.parse_yaml import parse_yaml
regionStartPattern = re.compile(r'-\s+(\S+)') regionStartPattern = re.compile(r'-\s+(\S+)(?P<options>\s*.*)?')
metaPattern = r'\/\*---\n([\s]*)((?:\s|\S)*)[\n\s*]---\*\/' metaPattern = r'\/\*---\n([\s]*)((?:\s|\S)*)[\n\s*]---\*\/'
class Case: class Case:
def __init__(self, file_name, encoding): def __init__(self, file_name, encoding):
self.attribs = dict(meta=None, regions=dict()) self.attribs = dict(meta=None, regions=dict(), region_options=dict())
with codecs.open(file_name, 'r', encoding) as handle: with codecs.open(file_name, 'r', encoding) as handle:
self.attribs = self._parse(handle.read()) self.attribs = self._parse(handle.read())
def _parse(self, source): def _parse(self, source):
case = dict(meta=None, regions=dict()) case = dict(meta=None, regions=dict(), region_options=dict())
region_name = None region_name = None
region_start = 0 region_start = 0
region_options = None
lines = source.split('\n') lines = source.split('\n')
search = re.search(metaPattern, source, re.DOTALL|re.MULTILINE) search = re.search(metaPattern, source, re.DOTALL|re.MULTILINE)
@ -39,6 +40,9 @@ class Case:
region_name = match.group(1) region_name = match.group(1)
region_start = comment['lineno'] region_start = comment['lineno']
region_options = match.group('options').split()
if region_options:
case['region_options'][region_name] = set(region_options)
continue continue
if region_name: if region_name:

16
tools/generation/lib/template.py
View File

@ -103,8 +103,9 @@ class Template:
lines = source.split('\n') lines = source.split('\n')
for region in self.regions: for region in self.regions:
region_name = region['name']
whitespace = indentPattern.match(lines[region['lineno']]).group(1) whitespace = indentPattern.match(lines[region['lineno']]).group(1)
value = context['regions'].get(region['name'], '') value = context['regions'].get(region_name, '')
str_char = region.get('in_string') str_char = region.get('in_string')
if str_char: if str_char:
@ -112,8 +113,19 @@ class Template:
value = value.replace(str_char, safe_char) value = value.replace(str_char, safe_char)
value = value.replace('\n', '\\\n') value = value.replace('\n', '\\\n')
# TODO: document region_options and "codepoints" (`//- <region_name> codepoints`)
if "codepoints" in context['region_options'].get(region_name, set()):
str_from_cp = chr
try:
# In Python 2, explicitly work on code points
str_from_cp = unichr
except NameError: pass
value = "".join(str_from_cp(int(cp, 16)) for cp in value.split())
else:
value = indent(value, whitespace, True).lstrip()
source = source[:region['firstchar']] + \ source = source[:region['firstchar']] + \
indent(value, whitespace, True).lstrip() + \ value + \
source[region['lastchar']:] source[region['lastchar']:]
setup = context['regions'].get('setup') setup = context['regions'].get('setup')