Merge pull request #15 from BenchR267/develop

Fixed precedence of operators

Author: BenchR267

.codecov.yml

@@ -1,3 +1,7 @@
 coverage:
   ignore:
    - "Tests/*"
+comment:
+  layout: "reach, diff"
+  behavior: once
+  require_changes: true

.travis.yml

@@ -15,9 +15,9 @@ matrix:
         - bundle exec danger
       before_install:
         - wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
-        - wget https://swift.org/builds/swift-4.0-branch/ubuntu1404/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-16-a/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-16-a-ubuntu14.04.tar.gz
-        - tar xzf swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-16-a-ubuntu14.04.tar.gz
-        - export PATH=${PWD}/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-16-a-ubuntu14.04/usr/bin:"${PATH}"
+        - wget -q https://swift.org/builds/swift-4.0-branch/ubuntu1404/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-21-a/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-21-a-ubuntu14.04.tar.gz
+        - tar xzf swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-21-a-ubuntu14.04.tar.gz
+        - export PATH=${PWD}/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-08-21-a-ubuntu14.04/usr/bin:"${PATH}"
       script:
         - make travis
     - os: osx

Dangerfile

@@ -1,7 +1,32 @@
-message("Hello, this worked")
-
-# including in a project's CHANGELOG for example
-declared_trivial = github.pr_title.include? "#trivial"
-
 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet
 warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
+
+fail "Please provide a summary in the Pull Request description" if github.pr_body.length < 5
+
+warn "#{github.html_link("Package.swift")} was edited." if git.modified_files.include? "Package.swift"
+warn "#{github.html_link("Makefile")} was edited." if git.modified_files.include? "Makefile"
+
+# Check if tests were written for swift files
+def isTest?(file)
+  file.start_with? "Tests/"
+end
+
+def isSwiftFile?(file)
+	file.end_with? ".swift"
+end
+
+(git.added_files + git.modified_files).each do |file|
+	next unless file.end_with? "Tests.swift"
+	warn "Test files should end with _TestCase.swift, not Tests.swift. Please rename #{github.html_link(file)}"
+end
+
+files = (git.added_files + git.modified_files).select{ |file| isSwiftFile?(file) && !isTest?(file) }
+tests = (git.added_files + git.modified_files).select{ |file| isSwiftFile?(file) && isTest?(file) }
+
+files.each do |file|
+	next if tests.any? { |e|
+		name = file.match(/\/([a-zA-Z_0-9]*)\.swift/).captures.first
+		e.include? name
+	}
+	fail("Please add a test case for #{file}.")
+end

Gemfile.lock

@@ -7,8 +7,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     claide (1.0.2)
     claide-plugins (0.9.2)
       cork
@@ -50,7 +50,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.3.4)
+    danger (5.3.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -59,6 +59,7 @@ GEM
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
+      no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     escape (0.0.4)
@@ -78,10 +79,11 @@ GEM
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
+    no_proxy_fix (0.1.1)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     ruby-macho (1.1.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)

Sources/Parsel/Core/Operators.swift

@@ -7,18 +7,25 @@
 
 // MARK: - Precendence groups and declaration
 
+// Check https://github.com/apple/swift-evolution/blob/master/proposals/0077-operator-precedence.md for reference
+
+/// ^^ and ^^^
+precedencegroup ParserMapPrecedenceGroup {
+    associativity: left
+    lowerThan: AdditionPrecedence, BitwiseShiftPrecedence, NilCoalescingPrecedence
+}
+
+/// ~ and >~
 precedencegroup ParserConjunctionGroup {
     associativity: left
-    higherThan: BitwiseShiftPrecedence
+    lowerThan: NilCoalescingPrecedence
+    higherThan: ParserMapPrecedenceGroup
 }
 
+/// <~
 precedencegroup ParserConjuctionRightGroup {
     associativity: right
-    higherThan: ParserConjunctionGroup
-}
-
-precedencegroup ParserMapPrecedenceGroup {
-    associativity: left
+    lowerThan: NilCoalescingPrecedence
     higherThan: ParserConjunctionGroup
 }
 

Sources/Parsel/RegexParser.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// A shortcut to RegexParser
-public typealias Regex = RegexParser
+public typealias R = RegexParser
 
 /// A parser that parses Strings with a given regular expression
 public final class RegexParser: Parser<String, String> {
@@ -58,9 +58,10 @@ public final class RegexParser: Parser<String, String> {
 ([a-z0-9_\\.-]+)@([\\da-z\\.-]+)\\.([a-z\\.]{2,6})
 """.r
 
+    // swiftlint:disable line_length
     /// Parses an http(s) address
     public static let httpAddress = """
-(https?:\\/\\/)?([\\da-z\\.-]+)\\.([a-z\\.]{2,6})([\\/\\w \\.-]*)*\\/?
+^(?i)(?:(?:https?|ftp):\\/\\/)?(?:\\S+(?::\\S*)?@)?(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))(?::\\d{2,5})?(?:\\/[^\\s]*)?$
 """.r
 
     /// Parses an IP address
@@ -69,9 +70,9 @@ public final class RegexParser: Parser<String, String> {
 """.r
 
     // swiftlint:disable line_length
-    /// Parses a semantic version number (1.0.0, 1.0, …) thanks to https://github.com/mojombo/semver/issues/232
+    /// Parses a semantic version number (1.0.0, 1.0, …) thanks to https://git.daplie.com/coolaj86/semver-utils
     public static let semver = """
-(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(-(0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(\\.(0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\\+[0-9a-zA-Z-]+(\\.[0-9a-zA-Z-]+)*)?
+v?((\\d+)\\.(\\d+)\\.(\\d+))(?:-([\\dA-Za-z\\-]+(?:\\.[\\dA-Za-z\\-]+)*))?(?:\\+([\\dA-Za-z\\-]+(?:\\.[\\dA-Za-z\\-]+)*))?
 """.r
 }
 

Tests/ParselTests/Helpers.swift

@@ -44,4 +44,4 @@ internal let digit = Parser<String, Int> { str in
     return .success(result: number, rest: String(str.dropFirst()))
 }
 
-internal let number = digit.rep.map { Int($0.map(String.init).joined()) ?? 0 }
+internal let number = digit.atLeastOnce.map { Int($0.map(String.init).joined()) ?? 0 }

Tests/ParselTests/Operators_TestCase.swift

@@ -90,16 +90,50 @@ class Operators_TestCase: XCTestCase {
         XCTAssertEqual(try res1.unwrap(), [])
     }
 
-    func test_fallback_operator() {
+    func test_fallback_operator() throws {
         let p1 = char("a") ?? "b"
         let p2 = char("a").fallback("b")
 
         let input = "cba"
         let res1 = p1.parse(input)
         let res2 = p2.parse(input)
         XCTAssertTrue(res1 == res2)
+        
+        let p3 = char("a").map({ $0.description }) ?? digit.map({ $0.description })
+        let res3 = p3.parse("1")
+        XCTAssertEqual(try res3.unwrap(), "1")
+        let res4 = p3.parse("a")
+        XCTAssertEqual(try res4.unwrap(), "a")
+        let res5 = p3.parse("b")
+        XCTAssertTrue(res5.isFailed())
     }
 
+    func test_precedence() throws {
+        // ~ has higher presedence than ^^
+        let p = char("a") >~ char("b") <~ char("c") ^^ { String($0) }
+        let res1 = p.parse("abcd")
+        XCTAssertEqual(try res1.unwrap(), "b")
+        XCTAssertEqual(try res1.rest(), "d")
+        
+        // >> has higher precedence than ^^
+        let p2 = char("a") >> char("b") ^^ { L.asciiValue(from: $0) }
+        XCTAssertEqual(try p2.parse("ab").unwrap(), L.asciiValue(from: "b"))
+        
+        // + and * have highest precedence
+        let p3 = char("a")* ~ char("b")+ ^^ { ($0.0.count, String($0.1)) }
+        let res2 = try p3.parse("aaaaaaaaabbb").unwrap()
+        XCTAssertEqual(res2.0, 9)
+        XCTAssertEqual(res2.1, "bbb")
+        
+        // ?? has highest priority
+        let p4 = char("a") ?? "a" ~ digit
+        let res3 = try p4.parse("a4").unwrap()
+        XCTAssertEqual(res3.0, "a")
+        XCTAssertEqual(res3.1, 4)
+        let res4 = try p4.parse("4").unwrap()
+        XCTAssertEqual(res4.0, "a")
+        XCTAssertEqual(res4.1, 4)
+    }
 }
 
 #if os(Linux)
@@ -114,7 +148,8 @@ class Operators_TestCase: XCTestCase {
             ("test_atLeastOnce_operator", test_atLeastOnce_operator),
             ("test_rep_operator", test_rep_operator),
             ("test_rep_fail_operator", test_rep_fail_operator),
-            ("test_fallback_operator", test_fallback_operator)
+            ("test_fallback_operator", test_fallback_operator),
+            ("test_precedence", test_precedence)
         ]
     }
 #endif

Tests/ParselTests/Parsel_TestCase.swift

@@ -12,7 +12,7 @@ class Parsel_TestCase: XCTestCase {
 
     func test_addition() {
 
-        let addition = (number ~ char("+") ~ number).map { a, _, b in
+        let addition = number ~ char("+") ~ number ^^ { a, _, b in
             return a + b
         }
 
@@ -38,7 +38,7 @@ class Parsel_TestCase: XCTestCase {
             }
         }
 
-        let addition1 = (digit ~ "\\+".r ~ digit).map { a, _, b in a + b } // "+".r is a RegexParser that parses the `+` sign
+        let addition1 = digit ~ "\\+".r ~ digit ^^ { a, _, b in a + b } // "+".r is a RegexParser that parses the `+` sign
         let result1 = addition1.parse("2+4")
 
         XCTAssertEqual(try result1.unwrap(), 6)

Tests/ParselTests/RegexParser_TestCase.swift

@@ -59,6 +59,62 @@ class RegexParser_TestCase: XCTestCase {
         XCTAssertEqual(regex, "[")
     }
 
+    func test_parse_mail() throws {
+        let p = R.mail
+        let res1 = p.parse("mail@benchr.de")
+        XCTAssertEqual(try res1.unwrap(), "mail@benchr.de")
+        
+        let res2 = p.parse("mail@mail@benchr.de")
+        XCTAssertTrue(res2.isFailed())
+    }
+    
+    func test_parse_httpAddress() throws {
+        let p = R.httpAddress
+        let res1 = p.parse("https://www.google.de")
+        XCTAssertEqual(try res1.unwrap(), "https://www.google.de")
+        
+        let res2 = p.parse("http://https://facebook.com")
+        XCTAssertTrue(res2.isFailed())
+    }
+    
+    func test_parse_ipAddress() throws {
+        let p = R.ipAddress
+        let res1 = p.parse("192.168.2.1")
+        XCTAssertEqual(try res1.unwrap(), "192.168.2.1")
+        
+        let res2 = p.parse("5454.242.545.1")
+        XCTAssertTrue(res2.isFailed())
+    }
+    
+    func test_parse_semver() throws {
+        let p = R.semver
+        
+        let tests = [
+            "1.0.0",
+            "1.0.0-alpha1",
+            "1.0.0+build-123",
+            "v1.0.0",
+            "1.0.0b",
+            "1.0.0+build-abc."
+        ]
+        
+        for test in tests {
+            let res1 = p.parse(test)
+            XCTAssertTrue(test.hasPrefix(try res1.unwrap()))
+        }
+        
+        let failTests = [
+            "a.b.c",
+            "1",
+            "1.0"
+        ]
+        
+        for test in failTests {
+            let res2 = p.parse(test)
+            XCTAssertTrue(res2.isFailed())
+        }
+    }
+    
 }
 
 #if os(Linux)
@@ -70,6 +126,10 @@ class RegexParser_TestCase: XCTestCase {
             ("test_parse_lowercasedLetters", test_parse_lowercasedLetters),
             ("test_parse_fail", test_parse_fail),
             ("test_parse_fail_invalidRegex", test_parse_fail_invalidRegex),
+            ("test_parse_mail", test_parse_mail),
+            ("test_parse_httpAddress", test_parse_httpAddress),
+            ("test_parse_ipAddress", test_parse_ipAddress),
+            ("test_parse_semver", test_parse_semver)
         ]
     }
 #endif