Fix tests

valdirunars · valdirunars · commit 57c17a9d7dec · 2018-09-26T08:10:14.000Z
diff --git a/Sources/ZolangCore/Frontend/Models/Nodes/DescriptionList.swift b/Sources/ZolangCore/Frontend/Models/Nodes/DescriptionList.swift
@@ -15,13 +15,7 @@ public struct DescriptionList: Node {
     public init(tokens: [Token], context: inout ParserContext) throws {
         var tokens = tokens
         context.line += tokens.trimLeadingNewlines()
-        
-        guard tokens.first?.type == .identifier else {
-            throw ZolangError(type: .missingIdentifier,
-                              file: context.file,
-                              line: context.line)
-        }
-        
+
         var properties: [(Bool, String, String?, Type)] = []
         var functions: [(Bool, String, String?, Function)] = []
 
@@ -35,7 +29,7 @@ public struct DescriptionList: Node {
                                      skipping: [ .newline ],
                                      startingAt: i) {
                 isStatic = true
-                tokens.removeFirst()
+                i = tokens.index(of: [ .static ], startingAt: i)! + 1
             }
             
             context.line += tokens.trimLeadingNewlines()
diff --git a/Sources/ZolangCore/Frontend/TokenExtensions/Token+Convenience.swift b/Sources/ZolangCore/Frontend/TokenExtensions/Token+Convenience.swift
@@ -32,6 +32,8 @@ extension Token {
             return Token(type: .return)
         case Token.make.type.rawValue:
             return Token(type: .make)
+        case Token.static.type.rawValue:
+            return Token(type: .static)
         default:
             return nil
         }
@@ -133,6 +135,10 @@ extension Token {
         return Token(type: .make)
     }
     
+    public static var `static`: Token {
+        return Token(type: .`static`)
+    }
+    
     public static var from: Token {
         return Token(type: .from)
     }
diff --git a/Tests/ZolangTests/DescriptionListTests.swift b/Tests/ZolangTests/DescriptionListTests.swift
@@ -39,9 +39,9 @@ class DescriptionListTests: XCTestCase {
     name as text
     friends as list of Person
     street as text
-    house_number as number
+    static house_number privately as number
     
-    address return text from () {
+    address privately return text from () {
         return "${street} ${house_number}"
     }
 
diff --git a/Tests/ZolangTests/StringLexerTests.swift b/Tests/ZolangTests/StringLexerTests.swift
@@ -178,7 +178,8 @@ class StringLexerTests: XCTestCase {
             "be",
             "of",
             "if",
-            "else"
+            "else",
+            "static"
         ]
         
         XCTAssert(validStrings.joined(separator: "|").sorted() == regex.sorted())

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ extension Token {`
`32`	`32`	`return Token(type: .return)`
`33`	`33`	`case Token.make.type.rawValue:`
`34`	`34`	`return Token(type: .make)`
	`35`	`+ case Token.static.type.rawValue:`
	`36`	`+ return Token(type: .static)`
`35`	`37`	`default:`
`36`	`38`	`return nil`
`37`	`39`	`}`
`@@ -133,6 +135,10 @@ extension Token {`
`133`	`135`	`return Token(type: .make)`
`134`	`136`	`}`
`135`	`137`
	`138`	+ public static var `static`: Token {
	`139`	+ return Token(type: .`static`)
	`140`	`+ }`
	`141`	`+`
`136`	`142`	`public static var from: Token {`
`137`	`143`	`return Token(type: .from)`
`138`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,8 @@ class StringLexerTests: XCTestCase {`
`178`	`178`	`"be",`
`179`	`179`	`"of",`
`180`	`180`	`"if",`
`181`		`- "else"`
	`181`	`+ "else",`
	`182`	`+ "static"`
`182`	`183`	`]`
`183`	`184`
`184`	`185`	`XCTAssert(validStrings.joined(separator: "\|").sorted() == regex.sorted())`