swiftstencil/swiftpm-stencil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Result] Remove labels from enum

Browse Source
This commit is contained in:
Kyle Fuller
2014-10-26 17:59:03 +00:00
parent fb30915c6a
commit 771236953f
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Stencil/Node.swift
View File

@@ -45,11 +45,11 @@ public func renderNodes(nodes:[Node], context:Context) -> Result {
case .Success(let string): case .Success(let string):
result += string result += string
case .Error(let error): case .Error(let error):
return .Error(error:error) return .Error(error)
} }
} }
return .Success(string:result) return .Success(result)
} }
public class TextNode : Node { public class TextNode : Node {
@@ -60,7 +60,7 @@ public class TextNode : Node {
} }
public func render(context:Context) -> Result { public func render(context:Context) -> Result {
return .Success(string:self.text) return .Success(self.text)
} }
} }
@@ -79,12 +79,12 @@ public class VariableNode : Node {
let result:AnyObject? = variable.resolve(context) let result:AnyObject? = variable.resolve(context)
if let result = result as? String { if let result = result as? String {
return .Success(string:result) return .Success(result)
} else if let result = result as? NSObject { } else if let result = result as? NSObject {
return .Success(string:result.description) return .Success(result.description)
} }
return .Success(string:"") return .Success("")
} }
} }
@@ -121,10 +121,10 @@ public class NowNode : Node {
formatter = NSDateFormatter() formatter = NSDateFormatter()
formatter!.dateFormat = format formatter!.dateFormat = format
} else { } else {
return .Success(string:"") return .Success("")
} }
return .Success(string:formatter!.stringFromDate(date)) return .Success(formatter!.stringFromDate(date))
} }
} }
@@ -193,12 +193,12 @@ public class ForNode : Node {
case .Success(let string): case .Success(let string):
output += string output += string
case .Error(let error): case .Error(let error):
return .Error(error:error) return .Error(error)
} }
} }
} }
return .Success(string:output) return .Success(output)
} }
} }

4
Stencil/Result.swift
View File

@@ -9,8 +9,8 @@ public func ==(lhs:Error, rhs:Error) -> Bool {
} }
public enum Result : Equatable { public enum Result : Equatable {
case Success(string: String) case Success(String)
case Error(error: Stencil.Error) case Error(Stencil.Error)
} }
public func ==(lhs:Result, rhs:Result) -> Bool { public func ==(lhs:Result, rhs:Result) -> Bool {

2
Stencil/Template.swift
View File

@@ -42,7 +42,7 @@ public class Template {
return renderNodes(nodes, context) return renderNodes(nodes, context)
case .Error(let error): case .Error(let error):
return .Error(error:error) return .Error(error)
} }
} }

2
StencilTests/NodeTests.swift
View File

@@ -11,7 +11,7 @@ class ErrorNodeError : Error {
class ErrorNode : Node { class ErrorNode : Node {
func render(context: Context) -> Result { func render(context: Context) -> Result {
return .Error(error:ErrorNodeError()) return .Error(ErrorNodeError())
} }
} }

6
StencilTests/StencilTests.swift
View File

@@ -22,7 +22,7 @@ func assertFailure(result:TokenParser.Results, description:String) {
class CustomNode : Node { class CustomNode : Node {
func render(context:Context) -> Result { func render(context:Context) -> Result {
return .Success(string:"Hello World") return .Success("Hello World")
} }
} }
@@ -50,7 +50,7 @@ class StencilTests: XCTestCase {
" - Memory Management with ARC by Kyle Fuller.\n" + " - Memory Management with ARC by Kyle Fuller.\n" +
"\n" "\n"
XCTAssertEqual(result, Result.Success(string: fixture)) XCTAssertEqual(result, Result.Success(fixture))
} }
func testCustomTag() { func testCustomTag() {
@@ -62,6 +62,6 @@ class StencilTests: XCTestCase {
} }
let result = template.render() let result = template.render()
XCTAssertEqual(result, Result.Success(string: "Hello World")) XCTAssertEqual(result, Result.Success("Hello World"))
} }
} }

2
StencilTests/TemplateTests.swift
View File

@@ -8,7 +8,7 @@ class TemplateTests: XCTestCase {
let context = Context(dictionary: [ "name": "Kyle" ]) let context = Context(dictionary: [ "name": "Kyle" ])
let template = Template(templateString: "Hello World") let template = Template(templateString: "Hello World")
let result = template.render(context) let result = template.render(context)
XCTAssertEqual(result, Result.Success(string: "Hello World")) XCTAssertEqual(result, Result.Success("Hello World"))
} }
} }