2018-04-16 09:24:22 +00:00
|
|
|
|
#!/usr/bin/env python
|
2019-05-16 08:00:13 +00:00
|
|
|
|
# -*- coding: utf-8 -*-
|
2018-04-16 09:24:22 +00:00
|
|
|
|
# Copyright 2014 the V8 project authors. All rights reserved.
|
|
|
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
|
|
|
# found in the LICENSE file.
|
|
|
|
|
|
|
|
|
|
"""This program either generates the parser files for Torque, generating
|
|
|
|
|
the source and header files directly in V8's src directory."""
|
|
|
|
|
|
2019-02-19 08:28:26 +00:00
|
|
|
|
# for py2/py3 compatibility
|
|
|
|
|
from __future__ import print_function
|
|
|
|
|
|
2018-04-16 09:24:22 +00:00
|
|
|
|
import subprocess
|
|
|
|
|
import sys
|
|
|
|
|
import re
|
|
|
|
|
from subprocess import Popen, PIPE
|
|
|
|
|
|
2019-05-16 08:00:13 +00:00
|
|
|
|
kPercentEscape = r'α'; # Unicode alpha
|
2020-07-16 09:35:18 +00:00
|
|
|
|
kDerefEscape = r'☆'; # Unicode star
|
|
|
|
|
kAddressofEscape = r'⌂'; # Unicode house
|
2019-05-16 08:00:13 +00:00
|
|
|
|
|
2018-09-24 09:28:48 +00:00
|
|
|
|
def preprocess(input):
|
2020-07-16 09:35:18 +00:00
|
|
|
|
# Special handing of '%' for intrinsics, turn the percent
|
|
|
|
|
# into a unicode character so that it gets treated as part of the
|
|
|
|
|
# intrinsic's name if it's already adjacent to it.
|
|
|
|
|
input = re.sub(r'%([A-Za-z])', kPercentEscape + r'\1', input)
|
|
|
|
|
# Similarly, avoid treating * and & as binary operators when they're
|
|
|
|
|
# probably used as address operators.
|
|
|
|
|
input = re.sub(r'([^/])\*([a-zA-Z(])', r'\1' + kDerefEscape + r'\2', input)
|
|
|
|
|
input = re.sub(r'&([a-zA-Z(])', kAddressofEscape + r'\1', input)
|
|
|
|
|
|
|
|
|
|
|
2018-09-24 09:28:48 +00:00
|
|
|
|
input = re.sub(r'(if\s+)constexpr(\s*\()', r'\1/*COxp*/\2', input)
|
|
|
|
|
input = re.sub(r'(\s+)operator\s*(\'[^\']+\')', r'\1/*_OPE \2*/', input)
|
Reland "[torque] introduce JSAny type for user-accessible JavaScript values"
Changes in the reland: Rebased and added a check that JavaScript-linkage
builtins use JSAny in parameters and return type, plus the necessary
cleanups for this test to pass.
Design Doc: https://docs.google.com/document/d/1z6j0pWHnNIfId0v00uWN2HBrGRDJxJfYuCr5K7Kr1xA
This reverts commit 4418a7b96afdf8278577211ab0ed555c41ee269e.
Original change's description:
> Revert "[torque] introduce JSAny type for user-accessible JavaScript values"
>
> This reverts commit 79b00555eac939bf4a00177ec59e21b856d7301c.
>
> Reason for revert: needs more discussion
>
> Original change's description:
> > [torque] introduce JSAny type for user-accessible JavaScript values
> >
> > This CL introduces a JSAny type for user-exposed JavaScript values and
> > a few new types to define it. Especially, it splits Symbol into
> > PrivateSymbol (not exposed) and PublicSymbol (JavaScript exposed
> > symbols).
> >
> > The change is mostly mechanical, but a few things are interesting:
> > - PropertyKey and JSPrimitive were designed to coincide with the spec
> > notions of IsPropertyKey() and primitive value, respectively.
> > - Since Name is an open type, we define AnyName to be the known
> > subtypes of Name. This is not too elegant, but by using AnyName
> > instead of Name, typeswitch can properly conclude something if a
> > subtype of Name is excluded.
> >
> > Small drive-by changes, which were necessary:
> > - Allow subtyping on label parameters.
> > - Fix the formatting of typeswitch, it was broken with union types
> > in case types.
> >
> > Bug: v8:7793
> > Change-Id: I14b10507f8cf316ad85e048fe8d53d1df5e0bb13
> > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1735322
> > Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> > Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#63114}
>
> TBR=neis@chromium.org,jgruber@chromium.org,tebbi@chromium.org
>
> Change-Id: Ifde7881d74afe407628f40047997339d54cb2424
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: v8:7793
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1741652
> Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
> Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#63115}
TBR=neis@chromium.org,jgruber@chromium.org,tebbi@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: v8:7793
Change-Id: Icca34e3824f55009b984d9348fd21884400f0081
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1769316
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63395}
2019-08-26 12:07:01 +00:00
|
|
|
|
input = re.sub(r'\btypeswitch\s*(\([^{]*\))\s{', r' if /*tPsW*/ \1 {', input)
|
|
|
|
|
input = re.sub(r'\bcase\s*(\([^{]*\))\s*:\s*deferred\s*{', r' if /*cAsEdEfF*/ \1 {', input)
|
|
|
|
|
input = re.sub(r'\bcase\s*(\([^{]*\))\s*:\s*{', r' if /*cA*/ \1 {', input)
|
2018-10-11 08:52:36 +00:00
|
|
|
|
|
[torque] enable multiple inheritance from Torque-generated assemblers
This enables more seamless interop between Torque and CSA:
Since CodeStubAssembler can now inherit from the Torque base namespace,
macros defined in the base namespace can be used in CodeStubAssembler
macros, even without qualification.
At the same time, macros in the base namespace can refer to
CodeStubAssembler macros. The only new limitation is that types defined
in code-stub-assembler.h cannot be referenced in the signature of macros
defined in the base namespace, since this would produce a cyclic header
dependency. A work-around for this woud be to put such types (like int31
in this CL) into a separate header included by both. I (mis-)used
code-assembler.h for that.
Another side-effec is that types and enums defined in CodeStubAssembler
have to be accessed in a qualified way from Torque.
Other assemblers can now inherit from their Torque equivalent, so
porting macros into the corresponding Torque namespace doesn't require
any change to the existing use-sites.
To avoid C++ ambiguities, the Torque-generated assemblers must not define
anything also defined in Code(Stub)Assembler. This includes the type
aliases for TNode, PLabel, ...
My workaround is to qualify everything in the generated C++.
As a drive-by fix, I had to change the formatter to avoid a situation
where it doesn't compute a fixed point: putting a keyword at the
beginning of a line removes the '\s' in front of it, so I replaced that
with '\b'.
Bug: v8:7793
Change-Id: If3b9e9ad967a181b380a10d5673615606abd1041
Reviewed-on: https://chromium-review.googlesource.com/c/1341955
Reviewed-by: Daniel Clifford <danno@chromium.org>
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57645}
2018-11-20 10:17:24 +00:00
|
|
|
|
input = re.sub(r'\bgenerates\s+\'([^\']+)\'\s*',
|
2019-10-11 21:52:06 +00:00
|
|
|
|
r'_GeNeRaTeS00_/*\1@*/', input)
|
[torque] enable multiple inheritance from Torque-generated assemblers
This enables more seamless interop between Torque and CSA:
Since CodeStubAssembler can now inherit from the Torque base namespace,
macros defined in the base namespace can be used in CodeStubAssembler
macros, even without qualification.
At the same time, macros in the base namespace can refer to
CodeStubAssembler macros. The only new limitation is that types defined
in code-stub-assembler.h cannot be referenced in the signature of macros
defined in the base namespace, since this would produce a cyclic header
dependency. A work-around for this woud be to put such types (like int31
in this CL) into a separate header included by both. I (mis-)used
code-assembler.h for that.
Another side-effec is that types and enums defined in CodeStubAssembler
have to be accessed in a qualified way from Torque.
Other assemblers can now inherit from their Torque equivalent, so
porting macros into the corresponding Torque namespace doesn't require
any change to the existing use-sites.
To avoid C++ ambiguities, the Torque-generated assemblers must not define
anything also defined in Code(Stub)Assembler. This includes the type
aliases for TNode, PLabel, ...
My workaround is to qualify everything in the generated C++.
As a drive-by fix, I had to change the formatter to avoid a situation
where it doesn't compute a fixed point: putting a keyword at the
beginning of a line removes the '\s' in front of it, so I replaced that
with '\b'.
Bug: v8:7793
Change-Id: If3b9e9ad967a181b380a10d5673615606abd1041
Reviewed-on: https://chromium-review.googlesource.com/c/1341955
Reviewed-by: Daniel Clifford <danno@chromium.org>
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57645}
2018-11-20 10:17:24 +00:00
|
|
|
|
input = re.sub(r'\bconstexpr\s+\'([^\']+)\'\s*',
|
2018-09-24 09:28:48 +00:00
|
|
|
|
r' _CoNsExP_/*\1@*/', input)
|
2018-09-25 15:02:46 +00:00
|
|
|
|
input = re.sub(r'\notherwise',
|
|
|
|
|
r'\n otherwise', input)
|
|
|
|
|
input = re.sub(r'(\n\s*\S[^\n]*\s)otherwise',
|
|
|
|
|
r'\1_OtheSaLi', input)
|
2019-05-16 18:56:56 +00:00
|
|
|
|
input = re.sub(r'@if\(', r'@iF(', input)
|
2019-05-20 22:14:46 +00:00
|
|
|
|
input = re.sub(r'@export', r'@eXpOrT', input)
|
2019-06-14 12:23:22 +00:00
|
|
|
|
input = re.sub(r'js-implicit[ \n]+', r'jS_iMpLiCiT_', input)
|
2020-07-16 09:35:18 +00:00
|
|
|
|
input = re.sub(r'^(\s*namespace\s+[a-zA-Z_0-9]+\s*{)(\s*)$', r'\1}\2', input, flags = re.MULTILINE)
|
2019-05-16 08:00:13 +00:00
|
|
|
|
|
2020-05-01 00:07:31 +00:00
|
|
|
|
# includes are not recognized, change them into comments so that the
|
|
|
|
|
# formatter ignores them first, until we can figure out a way to format cpp
|
|
|
|
|
# includes within a JS file.
|
|
|
|
|
input = re.sub(r'^#include', r'// InClUdE', input, flags=re.MULTILINE)
|
|
|
|
|
|
2018-09-24 09:28:48 +00:00
|
|
|
|
return input
|
|
|
|
|
|
|
|
|
|
def postprocess(output):
|
|
|
|
|
output = re.sub(r'\/\*COxp\*\/', r'constexpr', output)
|
|
|
|
|
output = re.sub(r'(\S+)\s*: type([,>])', r'\1: type\2', output)
|
2018-11-13 13:00:34 +00:00
|
|
|
|
output = re.sub(r'(\n\s*)labels( [A-Z])', r'\1 labels\2', output)
|
2018-09-24 09:28:48 +00:00
|
|
|
|
output = re.sub(r'\/\*_OPE \'([^\']+)\'\*\/', r"operator '\1'", output)
|
Reland "[torque] introduce JSAny type for user-accessible JavaScript values"
Changes in the reland: Rebased and added a check that JavaScript-linkage
builtins use JSAny in parameters and return type, plus the necessary
cleanups for this test to pass.
Design Doc: https://docs.google.com/document/d/1z6j0pWHnNIfId0v00uWN2HBrGRDJxJfYuCr5K7Kr1xA
This reverts commit 4418a7b96afdf8278577211ab0ed555c41ee269e.
Original change's description:
> Revert "[torque] introduce JSAny type for user-accessible JavaScript values"
>
> This reverts commit 79b00555eac939bf4a00177ec59e21b856d7301c.
>
> Reason for revert: needs more discussion
>
> Original change's description:
> > [torque] introduce JSAny type for user-accessible JavaScript values
> >
> > This CL introduces a JSAny type for user-exposed JavaScript values and
> > a few new types to define it. Especially, it splits Symbol into
> > PrivateSymbol (not exposed) and PublicSymbol (JavaScript exposed
> > symbols).
> >
> > The change is mostly mechanical, but a few things are interesting:
> > - PropertyKey and JSPrimitive were designed to coincide with the spec
> > notions of IsPropertyKey() and primitive value, respectively.
> > - Since Name is an open type, we define AnyName to be the known
> > subtypes of Name. This is not too elegant, but by using AnyName
> > instead of Name, typeswitch can properly conclude something if a
> > subtype of Name is excluded.
> >
> > Small drive-by changes, which were necessary:
> > - Allow subtyping on label parameters.
> > - Fix the formatting of typeswitch, it was broken with union types
> > in case types.
> >
> > Bug: v8:7793
> > Change-Id: I14b10507f8cf316ad85e048fe8d53d1df5e0bb13
> > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1735322
> > Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> > Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#63114}
>
> TBR=neis@chromium.org,jgruber@chromium.org,tebbi@chromium.org
>
> Change-Id: Ifde7881d74afe407628f40047997339d54cb2424
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: v8:7793
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1741652
> Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
> Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#63115}
TBR=neis@chromium.org,jgruber@chromium.org,tebbi@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: v8:7793
Change-Id: Icca34e3824f55009b984d9348fd21884400f0081
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1769316
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63395}
2019-08-26 12:07:01 +00:00
|
|
|
|
output = re.sub(r'\bif\s*\/\*tPsW\*\/', r'typeswitch', output)
|
|
|
|
|
output = re.sub(r'\bif\s*\/\*cA\*\/\s*(\([^{]*\))\s*{', r'case \1: {', output)
|
|
|
|
|
output = re.sub(r'\bif\s*\/\*cAsEdEfF\*\/\s*(\([^{]*\))\s*{', r'case \1: deferred {', output)
|
2018-09-25 10:59:03 +00:00
|
|
|
|
output = re.sub(r'\n_GeNeRaTeS00_\s*\/\*([^@]+)@\*\/',
|
|
|
|
|
r"\n generates '\1'", output)
|
|
|
|
|
output = re.sub(r'_GeNeRaTeS00_\s*\/\*([^@]+)@\*\/',
|
2018-09-24 09:28:48 +00:00
|
|
|
|
r"generates '\1'", output)
|
|
|
|
|
output = re.sub(r'_CoNsExP_\s*\/\*([^@]+)@\*\/',
|
|
|
|
|
r"constexpr '\1'", output)
|
2018-09-25 15:02:46 +00:00
|
|
|
|
output = re.sub(r'\n(\s+)otherwise',
|
|
|
|
|
r"\n\1 otherwise", output)
|
|
|
|
|
output = re.sub(r'\n(\s+)_OtheSaLi',
|
|
|
|
|
r"\n\1otherwise", output)
|
|
|
|
|
output = re.sub(r'_OtheSaLi',
|
|
|
|
|
r"otherwise", output)
|
2019-05-16 18:56:56 +00:00
|
|
|
|
output = re.sub(r'@iF\(', r'@if(', output)
|
2019-05-20 22:14:46 +00:00
|
|
|
|
output = re.sub(r'@eXpOrT',
|
|
|
|
|
r"@export", output)
|
2019-06-14 12:23:22 +00:00
|
|
|
|
output = re.sub(r'jS_iMpLiCiT_',
|
|
|
|
|
r"js-implicit ", output)
|
2020-05-06 09:00:37 +00:00
|
|
|
|
output = re.sub(r'}\n *label ', r'} label ', output);
|
2020-05-12 13:28:29 +00:00
|
|
|
|
output = re.sub(r'^(\s*namespace\s+[a-zA-Z_0-9]+\s*{)}(\s*)$', r'\1\2', output, flags = re.MULTILINE);
|
2018-10-24 11:28:28 +00:00
|
|
|
|
|
2019-05-16 08:00:13 +00:00
|
|
|
|
output = re.sub(kPercentEscape, r'%', output)
|
2020-07-16 09:35:18 +00:00
|
|
|
|
output = re.sub(kDerefEscape, r'*', output)
|
|
|
|
|
output = re.sub(kAddressofEscape, r'&', output)
|
|
|
|
|
|
2019-05-16 08:00:13 +00:00
|
|
|
|
|
2020-05-01 00:07:31 +00:00
|
|
|
|
output = re.sub( r'^// InClUdE',r'#include', output, flags=re.MULTILINE)
|
|
|
|
|
|
2018-09-24 09:28:48 +00:00
|
|
|
|
return output
|
|
|
|
|
|
2019-02-07 14:48:53 +00:00
|
|
|
|
def process(filename, lint, should_format):
|
2018-11-21 18:06:17 +00:00
|
|
|
|
with open(filename, 'r') as content_file:
|
2018-11-13 16:18:03 +00:00
|
|
|
|
content = content_file.read()
|
|
|
|
|
|
|
|
|
|
original_input = content
|
|
|
|
|
|
2019-02-20 06:53:38 +00:00
|
|
|
|
if sys.platform.startswith('win'):
|
|
|
|
|
p = Popen(['clang-format', '-assume-filename=.ts'], stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True)
|
|
|
|
|
else:
|
|
|
|
|
p = Popen(['clang-format', '-assume-filename=.ts'], stdin=PIPE, stdout=PIPE, stderr=PIPE)
|
2018-11-21 18:06:17 +00:00
|
|
|
|
output, err = p.communicate(preprocess(content))
|
2018-11-13 16:18:03 +00:00
|
|
|
|
output = postprocess(output)
|
|
|
|
|
rc = p.returncode
|
2019-02-19 08:28:26 +00:00
|
|
|
|
if (rc != 0):
|
|
|
|
|
print("error code " + str(rc) + " running clang-format. Exiting...")
|
2018-11-13 16:18:03 +00:00
|
|
|
|
sys.exit(rc);
|
|
|
|
|
|
2019-06-24 15:30:19 +00:00
|
|
|
|
if (output != original_input):
|
|
|
|
|
if lint:
|
2019-02-19 08:28:26 +00:00
|
|
|
|
print(filename + ' requires formatting', file=sys.stderr)
|
2019-02-07 14:48:53 +00:00
|
|
|
|
|
2019-06-24 15:30:19 +00:00
|
|
|
|
if should_format:
|
2021-07-20 15:32:43 +00:00
|
|
|
|
output_file = open(filename, 'wb')
|
2019-06-24 15:30:19 +00:00
|
|
|
|
output_file.write(output);
|
|
|
|
|
output_file.close()
|
2018-11-13 16:18:03 +00:00
|
|
|
|
|
|
|
|
|
def print_usage():
|
2019-02-19 08:28:26 +00:00
|
|
|
|
print('format-torque -i file1[, file2[, ...]]')
|
|
|
|
|
print(' format and overwrite input files')
|
|
|
|
|
print('format-torque -l file1[, file2[, ...]]')
|
|
|
|
|
print(' merely indicate which files need formatting')
|
2018-11-13 16:18:03 +00:00
|
|
|
|
|
|
|
|
|
def Main():
|
|
|
|
|
if len(sys.argv) < 3:
|
2019-02-19 08:28:26 +00:00
|
|
|
|
print("error: at least 2 arguments required")
|
2018-11-13 16:18:03 +00:00
|
|
|
|
print_usage();
|
|
|
|
|
sys.exit(-1)
|
|
|
|
|
|
2019-02-07 14:48:53 +00:00
|
|
|
|
def is_option(arg):
|
|
|
|
|
return arg in ['-i', '-l', '-il']
|
|
|
|
|
|
|
|
|
|
should_format = lint = False
|
2018-11-13 16:18:03 +00:00
|
|
|
|
use_stdout = True
|
2018-04-16 09:24:22 +00:00
|
|
|
|
|
2019-02-07 14:48:53 +00:00
|
|
|
|
flag, files = sys.argv[1], sys.argv[2:]
|
|
|
|
|
if is_option(flag):
|
|
|
|
|
if '-i' == flag:
|
|
|
|
|
should_format = True
|
|
|
|
|
elif '-l' == flag:
|
|
|
|
|
lint = True
|
|
|
|
|
else:
|
|
|
|
|
lint = True
|
|
|
|
|
should_format = True
|
2018-11-13 16:18:03 +00:00
|
|
|
|
else:
|
2019-02-19 08:28:26 +00:00
|
|
|
|
print("error: -i and/or -l flags must be specified")
|
2018-11-13 16:18:03 +00:00
|
|
|
|
print_usage();
|
|
|
|
|
sys.exit(-1);
|
|
|
|
|
|
2019-02-07 14:48:53 +00:00
|
|
|
|
for filename in files:
|
|
|
|
|
process(filename, lint, should_format)
|
2018-11-13 16:18:03 +00:00
|
|
|
|
|
|
|
|
|
return 0
|
2018-04-16 09:24:22 +00:00
|
|
|
|
|
2018-11-13 16:18:03 +00:00
|
|
|
|
if __name__ == '__main__':
|
|
|
|
|
sys.exit(Main());
|