Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Fixed format string parsing #29

Merged
merged 9 commits into from
May 22, 2017
Merged

Fixed format string parsing #29

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a1fe7a
Added failing test to demonstrate flaw
lvsti Apr 30, 2017
411995e
Corrected format string regex to support placeholders that are direct…
lvsti Apr 30, 2017
cd08e91
Fixed https://github.com/SwiftGen/SwiftGenKit/pull/29#pullrequestrevi…
lvsti May 13, 2017
556a69e
Updated changelog
lvsti May 20, 2017
d86650d
Fixed https://github.com/SwiftGen/SwiftGenKit/pull/29#discussion_r117…
lvsti May 21, 2017
0768385
Merge branch 'master' into master
djbe May 21, 2017
45e2d01
Fix enum compilation error
djbe May 22, 2017
e023945
Merge branch 'master' of github.com:SwiftGen/SwiftGenKit
djbe May 22, 2017
0ba730f
fix whitespace
djbe May 22, 2017
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
2 changes: 1 addition & 1 deletion Sources/Parsers/StringsFileParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public final class StringsFileParser {

do {
return try NSRegularExpression(
pattern: "(?<!%)%\(position)\(precision)(@|\(pattern_int)|\(pattern_float)|[csp])",
pattern: "(?:^|[^%]|(?<!%)(?:%%)+)%\(position)\(precision)(@|\(pattern_int)|\(pattern_float)|[csp])",
options: [.caseInsensitive]
)
} catch {
Expand Down
8 changes: 7 additions & 1 deletion Tests/SwiftGenKitTests/StringsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,16 @@ class StringsTests: XCTestCase {
XCTAssertEqual(placeholders, [.Unknown, .Int, .Object, .Float, .Char])
}

func testParseEscapePercentSign() {
func testParseEvenEscapePercentSign() {
let placeholders = StringsFileParser.PlaceholderType.placeholders(fromFormat: "%%foo")
// Must NOT map to [.Float]
XCTAssertEqual(placeholders, [])
}

func testParseOddEscapePercentSign() {
let placeholders = StringsFileParser.PlaceholderType.placeholders(fromFormat: "%%%foo")
// Should map to [.Float]
XCTAssertEqual(placeholders, [.Float])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, so your branch was based on an older version of SwiftGenKit. This needs to be .float instead.

}

}