Commit d0fc467e authored by David Owens II's avatar David Owens II

Moved atkpkgparser into just atpkg to unify the codebase.

parent fc1f3879
Pipeline #678 passed with stage
......@@ -64,27 +64,19 @@ tasks:
name: "yaml"
outputType: "static-library"
atpkg-model:
dependency: ["atpkg-parser"]
atpkg:
tool: "atllbuild"
source: ["model/src/**.swift"]
name: "atpkgmodel"
outputType: "static-library"
linkWithProduct: ["atpkgparser.a"]
atpkg-parser:
tool: "atllbuild"
source: ["parsers/atpkg/src/**.swift"]
name: "atpkgparser"
source: ["atpkg/src/**.swift"]
name: "atpkg"
outputType: "static-library"
atpkg-tests:
dependency: ["atpkg-parser", "atpkg-model"]
dependency: ["atpkg"]
tool: "atllbuild"
source: ["parsers/atpkg/tests/**.swift"]
source: ["atpkg/tests/**.swift"]
name: "atpkgtests"
outputType: "executable"
linkWithProduct: ["atpkgparser.a", "atpkgmodel.a"]
linkWithProduct: ["atpkg.a"]
run-atpkg-tests:
dependency: ["atpkg-tests"]
......
......@@ -14,7 +14,7 @@
import Foundation
import atpkgparser
import atpkg
func outputBaseline(lexer: Lexer) {
print("--- baseline ---")
......@@ -43,7 +43,7 @@ class LexerTests: Test {
let filename = __FILE__
static func testBasic() throws {
let filepath = "./parsers/atpkg/tests/collateral/basic.atpkg"
let filepath = "./atpkg/tests/collateral/basic.atpkg"
let content: String = try NSString(contentsOfFile: filepath, encoding: NSUTF8StringEncoding) as String
let scanner = Scanner(content: content)
......
......@@ -14,7 +14,7 @@
import Foundation
import atpkgparser
import atpkg
extension ParseValue {
var stringLiteral: String? {
......@@ -42,7 +42,7 @@ class ParserTests: Test {
let filename = __FILE__
static func testBasic() throws {
let filepath = "./parsers/atpkg/tests/collateral/basic.atpkg"
let filepath = "./atpkg/tests/collateral/basic.atpkg"
guard let parser = Parser(filepath: filepath) else {
try test.assert(false); return
}
......
......@@ -14,7 +14,7 @@
import Foundation
import atpkgparser
import atpkg
func outputBaseline(scanner: Scanner) {
print("--- baseline ---")
......@@ -44,7 +44,7 @@ class ScannerTests: Test {
let filename = __FILE__
static func testBasicClj() throws {
let filepath = "./parsers/atpkg/tests/collateral/basic.atpkg"
let filepath = "./atpkg/tests/collateral/basic.atpkg"
let content: String = try NSString(contentsOfFile: filepath, encoding: NSUTF8StringEncoding) as String
let scanner = Scanner(content: content)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment