dnrops
/
SwiftSoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests 

Fix travis tests.

Resolve compiler warnings
This commit is contained in:
Yaroslav 2020-03-22 15:43:43 +03:00
parent 7f187fd880
commit 719b06761a
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -22,12 +22,12 @@ matrix:
dist: xenial dist: xenial
sudo: required sudo: required
services: docker services: docker
env: DOCKER_IMAGE=swift:5.0.2-xenial SWIFT_TEST_ARGS="--parallel" env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3 SWIFT_TEST_ARGS="--parallel"
- os: linux - os: linux
dist: xenial dist: xenial
sudo: required sudo: required
services: docker services: docker
env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel" env: DOCKER_IMAGE=swift:5.1.5-xenial SWIFT_SNAPSHOT=5.1.5 SWIFT_TEST_ARGS="--parallel"
- os: osx - os: osx
osx_image: xcode10.1 osx_image: xcode10.1
sudo: required sudo: required
@ -37,13 +37,9 @@ matrix:
sudo: required sudo: required
env: SWIFT_SNAPSHOT=5.0.1 SWIFT_TEST_ARGS="--parallel" env: SWIFT_SNAPSHOT=5.0.1 SWIFT_TEST_ARGS="--parallel"
- os: osx - os: osx
osx_image: xcode11 osx_image: xcode11.3
sudo: required sudo: required
env: SWIFT_SNAPSHOT=5.1 SWIFT_TEST_ARGS="--parallel" env: SWIFT_SNAPSHOT=5.1.3 SWIFT_TEST_ARGS="--parallel"
- os: osx
osx_image: xcode11
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel"
before_install: before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git - git clone https://github.com/IBM-Swift/Package-Builder.git

10
Sources/HtmlTreeBuilderState.swift
View File

@ -162,7 +162,7 @@ enum HtmlTreeBuilderState: String, HtmlTreeBuilderStateProtocol {
return false return false
case .StartTag: case .StartTag:
let start: Token.StartTag = t.asStartTag() let start: Token.StartTag = t.asStartTag()
var name: String = start.normalName()! let name: String = start.normalName()!
if (name.equals("html")) { if (name.equals("html")) {
return try HtmlTreeBuilderState.InBody.process(t, tb) return try HtmlTreeBuilderState.InBody.process(t, tb)
} else if TagSets.baseEtc.contains(name) { } else if TagSets.baseEtc.contains(name) {
@ -172,7 +172,7 @@ enum HtmlTreeBuilderState: String, HtmlTreeBuilderStateProtocol {
try tb.maybeSetBaseUri(el) try tb.maybeSetBaseUri(el)
} }
} else if (name.equals("meta")) { } else if (name.equals("meta")) {
let meta: Element = try tb.insertEmpty(start) let _: Element = try tb.insertEmpty(start)
// todo: charset switches // todo: charset switches
} else if (name.equals("title")) { } else if (name.equals("title")) {
try HtmlTreeBuilderState.handleRcData(start, tb) try HtmlTreeBuilderState.handleRcData(start, tb)
@ -638,7 +638,7 @@ enum HtmlTreeBuilderState: String, HtmlTreeBuilderStateProtocol {
if let name = endTag.normalName() { if let name = endTag.normalName() {
if Constants.InBodyEndAdoptionFormatters.contains(name) { if Constants.InBodyEndAdoptionFormatters.contains(name) {
// Adoption Agency Algorithm. // Adoption Agency Algorithm.
for i in 0..<8 { for _ in 0..<8 {
let formatEl: Element? = tb.getActiveFormattingElement(name) let formatEl: Element? = tb.getActiveFormattingElement(name)
if (formatEl == nil) { if (formatEl == nil) {
return anyOtherEndTag(t, tb) return anyOtherEndTag(t, tb)
@ -681,7 +681,7 @@ enum HtmlTreeBuilderState: String, HtmlTreeBuilderStateProtocol {
// does that mean: int pos of format el in list? // does that mean: int pos of format el in list?
var node: Element? = furthestBlock var node: Element? = furthestBlock
var lastNode: Element? = furthestBlock var lastNode: Element? = furthestBlock
for j in 0..<3 { for _ in 0..<3 {
if (node != nil && tb.onStack(node!)) { if (node != nil && tb.onStack(node!)) {
node = tb.aboveOnStack(node!) node = tb.aboveOnStack(node!)
} }
@ -725,7 +725,7 @@ enum HtmlTreeBuilderState: String, HtmlTreeBuilderStateProtocol {
let adopter: Element = Element(formatEl!.tag(), tb.getBaseUri()) let adopter: Element = Element(formatEl!.tag(), tb.getBaseUri())
adopter.getAttributes()?.addAll(incoming: formatEl!.getAttributes()) adopter.getAttributes()?.addAll(incoming: formatEl!.getAttributes())
var childNodes: [Node] = furthestBlock!.getChildNodes() let childNodes: [Node] = furthestBlock!.getChildNodes()
for childNode: Node in childNodes { for childNode: Node in childNodes {
try adopter.appendChild(childNode) // append will reparent. thus the clone to avoid concurrent mod. try adopter.appendChild(childNode) // append will reparent. thus the clone to avoid concurrent mod.
} }