Introduce callables. by dan-zheng · Pull Request #23517 · swiftlang/swift

dan-zheng · 2019-03-23T10:08:23Z

Introduce callables: values that can be "called" like functions.
Add a new call declaration kind to represent callable methods.

"Introducing callables" pitch. Proposal coming soon.

Introduce callables: values that can be "called" like functions. Add a new `call` declaration kind to represent callable methods.

include/swift/AST/Decl.h

lib/Parse/ParseDecl.cpp

lib/Sema/CSSimplify.cpp

dan-zheng · 2019-03-23T10:15:57Z

lib/Demangling/Demangler.cpp

      Args = TypeAndMaybePrivateName; Kind = Node::Kind::Allocator; break;
    case 'c':
      Args = TypeAndMaybePrivateName; Kind = Node::Kind::Constructor; break;
+    case 'F':


TODO: Add mangling/demangling tests.
Currently, there are no SIL tests for call declarations.
I informally checked that demangling works via -emit-silgen.
The old remangler might not work - haven't look into how to invoke/test it yet.

lib/Serialization/Serialization.cpp

dan-zheng · 2019-03-23T10:17:49Z

test/Syntax/Parser/tree.swift.result

@@ -1,8 +1,8 @@
-<s118><s163><s92><s13><NULL/><NULL/><t6>// REQUIRES: syntax_parser_lib
+<s119><s164><s93><s13><NULL/><NULL/><t6>// REQUIRES: syntax_parser_lib


I’m not sure why changing this test to pass was necessary. I wonder if changing this test is breaking.

test/decl/call/protocol.swift

johnfairh · 2019-03-25T10:51:09Z

include/swift/IDE/SyntaxModel.h

  EnumElement,
  TypeAlias,
  Subscript,
+  Call,


fyi will need a simple change to ModelASTWalker::walkToDeclPre() to actually emit this, and I think a possibly less-simple change to SyntaxModelContext::SyntaxModelContext() to classify tok::kw_call as identifer/keyword depending on context (this affects syntax highlighting).

- Use uniform naming: either "`call` member" or "`call` declaration". - Fix `call` member resolution during type-checking. - Enable more `func` attributes on `call` declarations. - Add tests.

dan-zheng · 2019-03-27T05:32:15Z

The main callable functionality is done and tested: ready for review.
Code completion and editor features require some more work.

DougGregor · 2019-03-27T17:26:10Z

@swift-ci build toolchain

tkremenek · 2019-03-27T18:10:25Z

@swift-ci please build toolchain

clang requires minor changes to support `call` declarations in Swift. Note: the clang remote should be reverted back to "apple/swift-clang".

- Parse "call" as identifier in patterns and enum case names. Add tests. - Disallow `@warn_unqualified_access` on `call` declarations. - Update failing attribute tests.

dan-zheng · 2019-03-27T19:15:40Z

@DougGregor @tkremenek

Sorry, building failed because this PR depends on some minor changes to clang to support call declarations: apple/swift-clang#284

I temporarily updated the clang version in utils/update_checkout/update-checkout-config.json to branch callable of dan-zheng/swift-clang so that building will work. If there's a better way, please let me know.

I've verified that all swift tests pass locally. Retriggering toolchain build.

dan-zheng · 2019-03-27T19:16:22Z

@swift-ci Please build toolchain

dan-zheng · 2019-03-27T20:45:54Z

Investigating errors.

dan-zheng · 2019-03-27T21:00:00Z

@swift-ci Please build toolchain

dan-zheng · 2019-03-27T21:36:17Z

@swift-ci Please build toolchain macOS

swift-ci · 2019-03-27T21:56:31Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 8dff4cd

Install command
tar zxf swift-PR-23517-193-ubuntu16.04.tar.gz
More info

dan-zheng · 2019-03-27T22:37:26Z

@swift-ci Please build toolchain macOS

swift-ci · 2019-03-28T01:02:26Z

macOS Toolchain
Download Toolchain
Git Sha - 8dff4cd

Install command
tar -zxf swift-PR-23517-251-osx.tar.gz --directory ~/

dan-zheng · 2019-04-01T21:46:57Z

@swift-ci Please benchmark

swift-ci · 2019-04-01T21:49:02Z

!!! Couldn't read commit file !!!

DougGregor · 2019-04-05T19:30:09Z

@swift-ci please test source compatibility

DougGregor · 2019-04-05T19:30:33Z

@swift-ci please test source compatibility

DougGregor · 2019-04-05T22:23:16Z

FWIW, SwiftLint (from the source compatibility suite) is failing with this error:

/Users/buildnode/jenkins/workspace-private/swift-PR-source-compat-suite-debug/project_cache/SwiftLint/Source/SwiftLintFramework/Rules/Style/MultilineFunctionChainsRule.swift:178:52: error: consecutive statements on a line must be separated by ';'
        return subcalls.flatMap { call -> [NSRange] in
                                                   ^
                                                   ;

dan-zheng · 2019-04-26T00:12:10Z

Closing, as SE-0253 was returned for revision.
Redesign using func call as the name for call-syntax delegate methods: #24299

Introduce callables.

61ee914

Introduce callables: values that can be "called" like functions. Add a new `call` declaration kind to represent callable methods.

dan-zheng force-pushed the callable branch from fdec3ab to 61ee914 Compare March 23, 2019 10:11

dan-zheng commented Mar 23, 2019

View reviewed changes

dan-zheng mentioned this pull request Mar 23, 2019

[Swift] Add support for call declarations. apple/swift-clang#284

Open

johnfairh reviewed Mar 25, 2019

View reviewed changes

Finish main callable functionality.

2456a6e

- Use uniform naming: either "`call` member" or "`call` declaration". - Fix `call` member resolution during type-checking. - Enable more `func` attributes on `call` declarations. - Add tests.

dan-zheng force-pushed the callable branch from 94a384f to 2456a6e Compare March 27, 2019 05:06

dan-zheng marked this pull request as ready for review March 27, 2019 05:23

dan-zheng added 2 commits March 27, 2019 11:35

Update clang version in update-checkout-config.json.

efc864d

clang requires minor changes to support `call` declarations in Swift. Note: the clang remote should be reverted back to "apple/swift-clang".

Minor edits.

3687d07

- Parse "call" as identifier in patterns and enum case names. Add tests. - Disallow `@warn_unqualified_access` on `call` declarations. - Update failing attribute tests.

Merge branch 'master' into callable

8dff4cd

rxwei mentioned this pull request Mar 28, 2019

Fix typos in SE-0253. swiftlang/swift-evolution#1010

Merged

dan-zheng closed this Apr 26, 2019

		@@ -1,8 +1,8 @@
		<s118><s163><s92><s13><NULL/><NULL/><t6>// REQUIRES: syntax_parser_lib
		<s119><s164><s93><s13><NULL/><NULL/><t6>// REQUIRES: syntax_parser_lib

Conversation

dan-zheng commented Mar 23, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dan-zheng Mar 23, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dan-zheng Mar 23, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

johnfairh Mar 25, 2019

Choose a reason for hiding this comment

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

DougGregor commented Mar 27, 2019

Uh oh!

tkremenek commented Mar 27, 2019

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

swift-ci commented Mar 27, 2019

Uh oh!

dan-zheng commented Mar 27, 2019

Uh oh!

swift-ci commented Mar 28, 2019

Uh oh!

dan-zheng commented Apr 1, 2019

Uh oh!

swift-ci commented Apr 1, 2019

Uh oh!

DougGregor commented Apr 5, 2019

Uh oh!

DougGregor commented Apr 5, 2019

Uh oh!

DougGregor commented Apr 5, 2019

Uh oh!

dan-zheng commented Apr 26, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants