Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Swift5] Fix closure_parameter rule, add optional UNDERSCORE #4388

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
+23 −10
Draft

[Swift5] Fix closure_parameter rule, add optional UNDERSCORE #4388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b96750b
add hashed labels to expression rule in JavaParser
Nov 7, 2024
4d16a1a
fix hashed labels names
Nov 7, 2024
6a4551d
add EOF to compilationUnit rule
Nov 8, 2024
93ad199
fix trees in tests
Nov 11, 2024
f0ff373
Merge branch 'antlr:master' into master
samatanna Jan 15, 2025
7784539
fix catch_pattern_list rule, add test
Jan 15, 2025
f3348cb
Merge branch 'antlr:master' into master
samatanna Jan 20, 2025
4b61256
add underscore to closure_parameter rule
Jan 20, 2025
f376d48
move UNDERSCORE in lexer to use UNDERSCORE token in grammar
Jan 21, 2025
0877cfb
minor spelling fix
Jan 23, 2025
464f891
spelling fix for SwiftSupport.cpp
Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions swift/swift5/Cpp/SwiftSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ SwiftSupport::OperatorCharacter::OperatorCharacter()
SwiftSupport::LeftWS::LeftWS() {
set(Swift5Parser::WS);
set(Swift5Parser::LPAREN);
set(Swift5Parser::Interpolataion_multi_line);
set(Swift5Parser::Interpolataion_single_line);
set(Swift5Parser::Interpolation_multi_line);
set(Swift5Parser::Interpolation_single_line);
set(Swift5Parser::LBRACK);
set(Swift5Parser::LCURLY);
set(Swift5Parser::COMMA);
Expand Down
4 changes: 2 additions & 2 deletions swift/swift5/Java/SwiftSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ To use it in the ternary conditional (? :) operator, it must have

leftWS.set(Swift5Parser.WS);
leftWS.set(Swift5Parser.LPAREN);
leftWS.set(Swift5Parser.Interpolataion_multi_line);
leftWS.set(Swift5Parser.Interpolataion_single_line);
leftWS.set(Swift5Parser.Interpolation_multi_line);
leftWS.set(Swift5Parser.Interpolation_single_line);
leftWS.set(Swift5Parser.LBRACK);
leftWS.set(Swift5Parser.LCURLY);
leftWS.set(Swift5Parser.COMMA);
Expand Down
7 changes: 4 additions & 3 deletions swift/swift5/Swift5Lexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ HASH_IMAGE_LITERAL : '#imageLiteral';
GETTER : 'getter';
SETTER : 'setter';

UNDERSCORE : '_';

Identifier:
Identifier_head Identifier_characters?
| Implicit_parameter_name
Expand Down Expand Up @@ -249,7 +251,6 @@ COLON : ':';
SEMI : ';';
LT : '<';
GT : '>';
UNDERSCORE : '_';
BANG : '!';
QUESTION : '?';
AT : '@';
Expand Down Expand Up @@ -346,15 +347,15 @@ Single_line_string_open: '"' -> pushMode(SingleLine);

mode SingleLine;

Interpolataion_single_line: '\\(' { parenthesis.push(1);} -> pushMode(DEFAULT_MODE);
Interpolation_single_line: '\\(' { parenthesis.push(1);} -> pushMode(DEFAULT_MODE);

Single_line_string_close: '"' -> popMode;

Quoted_single_line_text: Quoted_text;

mode MultiLine;

Interpolataion_multi_line: '\\(' {parenthesis.push(1); } -> pushMode(DEFAULT_MODE);
Interpolation_multi_line: '\\(' {parenthesis.push(1); } -> pushMode(DEFAULT_MODE);

Multi_line_string_close: '"""' -> popMode;

Expand Down
7 changes: 4 additions & 3 deletions swift/swift5/Swift5Parser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ closure_parameter_list
;

closure_parameter
: closure_parameter_name = identifier (type_annotation range_operator?)?
: UNDERSCORE? closure_parameter_name = identifier (type_annotation range_operator?)?
;

capture_list
Expand Down Expand Up @@ -1573,6 +1573,7 @@ identifier
)
| Identifier
| BACKTICK (keyword | Identifier | DOLLAR) BACKTICK
| UNDERSCORE
;

identifier_list
Expand Down Expand Up @@ -1810,10 +1811,10 @@ static_string_literal
interpolated_string_literal
: Single_line_string_open (
Quoted_single_line_text
| Interpolataion_single_line (expression | tuple_element COMMA tuple_element_list) RPAREN
| Interpolation_single_line (expression | tuple_element COMMA tuple_element_list) RPAREN
)* Single_line_string_close
| Multi_line_string_open (
Quoted_multi_line_text
| Interpolataion_multi_line (expression | tuple_element COMMA tuple_element_list) RPAREN
| Interpolation_multi_line (expression | tuple_element COMMA tuple_element_list) RPAREN
)* Multi_line_string_close
;
11 changes: 11 additions & 0 deletions swift/swift5/examples/Functions and Closures/Contents.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,17 @@ print(mappedNumbers)
let sortedNumbers = numbers.sorted { $0 > $1 }
print(sortedNumbers)

// : Accepts trailing closure with 2 string parameters and call it
func printTwoStrings(_ closure: (String, String) -> Void) {
closure("Hello", "World")
}

//: Closure parameter name with an underscore before (closures don't have external parameter names, but underscore is allowed)
printTwoStrings { (_ x: String, _ y: String) in
print(x, y)
}




//: [Previous](@previous) | [Next](@next)
Loading