back out use of .blockquote as a new lexer token type. Just a .string

Author: haikusw

Sources/GraphQL/Language/AST.swift

@@ -55,7 +55,6 @@ final public class Token {
         case int = "Int"
         case float = "Float"
         case string = "String"
-        case blockString = "BlockString"
         case comment = "Comment"
 
         public var description: String {

Sources/GraphQL/Language/Lexer.swift

@@ -547,9 +547,9 @@ func readDigits(source: Source, start: Int, firstCode: UInt8) throws -> Int {
  * augmented to support blockstrings """ """ and return `.blockString` token if found.
  */
 func readString(source: Source, start: Int, line: Int, col: Int, prev: Token) throws -> Token {
-    let token = try readRawString(source: source, start: start, line: line, col: col, prev: prev)
+    let (token, isBlockString) = try readRawString(source: source, start: start, line: line, col: col, prev: prev)
 
-    if token.kind == .blockString,
+    if isBlockString,
        let rawString = token.value {
         let valueString = blockStringValue(rawValue: rawString)
         return Token(kind: token.kind,
@@ -569,9 +569,9 @@ func readString(source: Source, start: Int, line: Int, col: Int, prev: Token) th
  * Doesn't do any clean up of leading indentations or trailing whitespace for blockstring lines;
  * so if `token.kind` == `.blockString`, call `blockStringValue` with `token.value` for that.
  *
- * returns: Token of kind `.string` or `.blockString`
+ * returns: tuple of Token of kind `.string and Bool of true if it was a block string or not
  */
-func readRawString(source: Source, start: Int, line: Int, col: Int, prev: Token) throws -> Token {
+func readRawString(source: Source, start: Int, line: Int, col: Int, prev: Token) throws -> (token: Token, isBlockString: Bool) {
     let body = source.body
     var positionIndex = body.utf8.index(body.utf8.startIndex, offsetBy: start + 1)
     var chunkStartIndex = positionIndex
@@ -586,7 +586,7 @@ func readRawString(source: Source, start: Int, line: Int, col: Int, prev: Token)
            body.charCode(at: body.utf8.index(after: positionIndex)) == 34 {
             blockString = true
             positionIndex = body.utf8.index(positionIndex, offsetBy: 2)
-
+            
             // if the first character after the """ is a newline, then it is not included in the value
             if let code = body.charCode(at: positionIndex),
                (code == 0x000A || code == 0x000D) {
@@ -705,14 +705,15 @@ func readRawString(source: Source, start: Int, line: Int, col: Int, prev: Token)
     } else {
         value += String(body.utf8[chunkStartIndex ..< positionIndex])!
     }
-
-    return Token(kind: blockString ? .blockString : .string,
-                 start: start,
-                 end: body.offset(of: positionIndex) + 1,
-                 line: line,
-                 column: col,
-                 value: value,
-                 prev: prev)
+    
+    return (token: Token(kind: .string,
+                         start: start,
+                         end: body.offset(of: positionIndex) + 1,
+                         line: line,
+                         column: col,
+                         value: value,
+                         prev: prev),
+            isBlockString: blockString)
 }
 
 /**

Tests/GraphQLTests/LanguageTests/LexerTests.swift

@@ -758,7 +758,7 @@ class LexerTests : XCTestCase {
             """
             """#
 
-        let expected = Token(kind: .blockString,
+        let expected = Token(kind: .string,
                              start: 0,
                              end: 66,
                              line: 1,
@@ -767,14 +767,13 @@ class LexerTests : XCTestCase {
                              prev: nil, next: nil)
 
         let source = Source(body: sourceStr, name: "TestSource")
-        let token = try readRawString(source: source,
-                                      start: 0,
-                                      line: 1,
-                                      col: 1,
-                                      prev: Token(kind: .sof, start: 0, end: 0, line: 1, column: 1))
-
+        let (token, isBlockString) = try readRawString(source: source,
+                                                       start: 0,
+                                                       line: 1,
+                                                       col: 1,
+                                                       prev: Token(kind: .sof, start: 0, end: 0, line: 1, column: 1))
+        XCTAssert(isBlockString)
         XCTAssertEqual(token, expected, "\n\(dump(expected))\n\(dump(token))\n")
-        print(String(describing: token.value))
     }
 
     func testBlockStringIndentationAndBlankLine() throws {
@@ -803,7 +802,7 @@ class LexerTests : XCTestCase {
     func testMultiLineStrings() throws {
         let token = try lexOne(#" """ Multi-line string\n With Inner "foo" \nshould be Valid """ "#)
         let expected = Token(
-            kind: .blockString,
+            kind: .string,
             start: 1,
             end: 63,
             line: 1,
@@ -817,7 +816,7 @@ class LexerTests : XCTestCase {
     func testMultiLineStringsSingleSpaceIndent() throws {
         let token = try lexOne(#" """ Multi-line string\n With Inner "foo" \n should be Valid """ "#)
         let expected = Token(
-            kind: .blockString,
+            kind: .string,
             start: 1,
             end: 64,
             line: 1,
@@ -838,7 +837,7 @@ class LexerTests : XCTestCase {
                 """#)
 
         let expected = Token(
-            kind: .blockString,
+            kind: .string,
             start: 0,
             end: 59,
             line: 1,
@@ -860,7 +859,7 @@ class LexerTests : XCTestCase {
                 """#)
 
         let expected = Token(
-            kind: .blockString,
+            kind: .string,
             start: 0,
             end: 79,
             line: 1,
@@ -881,7 +880,7 @@ class LexerTests : XCTestCase {
 
     func testEmptySimpleMultilineBlockQuote() throws {
         let token = try lexOne(#" """""" "#)
-        let expected = Token(kind: .blockString, start: 1, end: 7, line: 1, column: 2, value: "")
+        let expected = Token(kind: .string, start: 1, end: 7, line: 1, column: 2, value: "")
         XCTAssertEqual(token, expected, "\n\(dump(expected))\n\(dump(token))\n")
     }
 
@@ -890,7 +889,7 @@ class LexerTests : XCTestCase {
             """
             """
             """#)
-        let expected = Token(kind: .blockString, start: 0, end: 7, line: 1, column: 1, value: "")
+        let expected = Token(kind: .string, start: 0, end: 7, line: 1, column: 1, value: "")
         XCTAssertEqual(token, expected, "\n\(dump(expected))\n\(dump(token))\n")
     }
 }